Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -re2e7f1e58513cc95691a63b5783785f585c0614c -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
Binary files differ
Index: lams_build/lib/lams/lams-monitoring.jar
===================================================================
diff -u -r5bf44e1400d159728aaca1a264469dc01a3f1a3c -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
Binary files differ
Index: lams_learning/build.xml
===================================================================
diff -u -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/build.xml	(.../build.xml)	(revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b)
+++ lams_learning/build.xml	(.../build.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -246,7 +246,6 @@
 				<include name="jstl/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>
 			<lib dir="${conf.webinf.dir}/lib"/>
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
Index: lams_learning/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -rf08a6a82c79afa3dbeb38f59cdd74d5538f503e7 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision f08a6a82c79afa3dbeb38f59cdd74d5538f503e7)
+++ lams_learning/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -1,2 +1 @@
-Class-Path: ./lams.jar ./lams_learning.jar ./lams-tool-laicp10.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar
-
+Class-Path: ./lams.jar ./lams-learning.jar ./lams-tool-laicp10.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar
\ No newline at end of file
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r25b79f296e76adef934f31bf3ba1deabd789efc6 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 25b79f296e76adef934f31bf3ba1deabd789efc6)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -30,10 +30,12 @@
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-		 classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
 		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
 <listener>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
===================================================================
diff -u -rcc15a77c21052b23c041a98ae2be51b7c7c77bd3 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(.../ExportPortfolioService.java)	(revision cc15a77c21052b23c041a98ae2be51b7c7c77bd3)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(.../ExportPortfolioService.java)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Vector;
+
 import javax.servlet.http.Cookie;
 
 import org.apache.log4j.Logger;
@@ -60,12 +61,13 @@
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
-import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
+import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtil;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 
@@ -293,13 +295,13 @@
 					    log.error(error);
 					    throw new ExportPortfolioException(error);
 					}
-					mapOfValuesToAppend.put(WebUtil.PARAM_MODE, ToolAccessMode.LEARNER.toString());
-					mapOfValuesToAppend.put(WebUtil.PARAM_USER_ID_NEW, user.getUserId().toString());
+					mapOfValuesToAppend.put(AttributeNames.PARAM_MODE, ToolAccessMode.LEARNER.toString());
+					mapOfValuesToAppend.put(AttributeNames.PARAM_USER_ID, user.getUserId().toString());
 					mapOfValuesToAppend.put("toolSessionId", toolSession.getToolSessionId().toString());
 				}
 				else if (accessMode == ToolAccessMode.TEACHER)
 				{
-					mapOfValuesToAppend.put(WebUtil.PARAM_MODE, ToolAccessMode.TEACHER.toString());
+					mapOfValuesToAppend.put(AttributeNames.PARAM_MODE, ToolAccessMode.TEACHER.toString());
 					mapOfValuesToAppend.put("toolContentId", toolActivity.getToolContentId().toString());
 				}
 				
@@ -441,7 +443,7 @@
 		
 			//for security reasons, append the relative directory name to the end of the export url instead of the whole path
 			String relativePath = activitySubDirectory.substring(ExportPortfolioConstants.TEMP_DIRECTORY.length()+1, activitySubDirectory.length());
-			exportURL = WebUtil.appendParameterToURL(portfolio.getExportUrl(), WebUtil.PARAM_DIRECTORY_NAME, relativePath);
+			exportURL = WebUtil.appendParameterToURL(portfolio.getExportUrl(), AttributeNames.PARAM_DIRECTORY_NAME, relativePath);
 			
 			String absoluteExportURL = ExportPortfolioConstants.HOST + exportURL;		
 					
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java
===================================================================
diff -u -r330693c4af4c8cdb029c6e4c85f91007c81bdc7c -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	(.../ExportPortfolioAction.java)	(revision 330693c4af4c8cdb029c6e4c85f91007c81bdc7c)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	(.../ExportPortfolioAction.java)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -77,7 +77,7 @@
 						            HttpServletResponse response) throws ExportPortfolioException
 	{
 		Portfolio[] portfolios = null;
-		String mode = WebUtil.readStrParam(request, WebUtil.PARAM_MODE);
+		String mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE);
 		IExportPortfolioService exportService = ExportPortfolioServiceProxy.getExportPortfolioService(getServlet().getServletContext());
 		
 		//get the cookies that came along with the request and pass it onto export service method
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
===================================================================
diff -u -r9a11e7fa1304d4d335abb8fca778c5e62b2c0fef -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision 9a11e7fa1304d4d335abb8fca778c5e62b2c0fef)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -109,7 +109,7 @@
 		String htmlOutput=null;
 	
 		Portfolio[] portfolios = null;
-		String mode = WebUtil.readStrParam(request, WebUtil.PARAM_MODE);
+		String mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE);
 		
 			if (mode.equals(ToolAccessMode.LEARNER.toString()))
 			{
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r8823e60698e6fd2968077c46540d6cd9453d4666 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 8823e60698e6fd2968077c46540d6cd9453d4666)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -86,21 +86,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
-      name="optionsActivityForm"
-      scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayOptions"
-        path=".optionsActivity"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/gate"
       type="org.lamsfoundation.lams.learning.web.action.GateAction"
       parameter="method"
@@ -121,6 +106,21 @@
       />
     </action>
     <action
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/grouping"
       type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
       name="GroupingForm"
@@ -269,8 +269,6 @@
     <action
       path="/exportPortfolio"
       type="org.lamsfoundation.lams.learning.export.web.action.ExportPortfolioAction"
-      name="activityForm"
-      scope="request"
       unknown="false"
       validate="false"
     >
@@ -282,10 +280,20 @@
         scope="request"
       />
       <forward
+        name="displayPrintVersion"
+        path="/exportPortfolioPrintVersion.jsp"
+        redirect="false"
+      />
+      <forward
         name="displayPortfolio"
         path="/exportPortfolio.jsp"
         redirect="false"
       />
+      <forward
+        name="loadExportPage"
+        path="/exportWaitingPage.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/ChooseActivity"
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -rab7ecf3891aec5852576ebf42c663b7414b1041f -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -35,7 +35,12 @@
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
 <listener>
@@ -67,7 +72,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
@@ -78,6 +83,13 @@
 	</init-param>
 </filter>
 
+<filter>
+       <filter-name>SystemSessionFilter</filter-name>
+         <filter-class>
+		   org.lamsfoundation.lams.web.session.SystemSessionFilter
+         </filter-class>
+</filter>
+
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -107,6 +119,11 @@
 	<url-pattern>*.jsp</url-pattern>
 </filter-mapping>
 
+<filter-mapping>
+    <filter-name>SystemSessionFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+</filter-mapping>
+
     <!--
     To use non XDoclet listeners, create a listeners.xml file that
     contains the additional listeners and place it in your
@@ -161,6 +178,19 @@
     <load-on-startup>2</load-on-startup>
 </servlet>
 
+<servlet>
+		<servlet-name>exportPortfolio</servlet-name>
+		<display-name>Export Portfolio</display-name>
+		<description>Export Portfolio</description>		
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.MainExportServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>exportDownload</servlet-name>
+		<display-name>Export Portfolio Download</display-name>
+		<description>Export Portfolio Download Page</description>		
+		<servlet-class>org.lamsfoundation.lams.learning.export.web.action.ExportDownloadServlet</servlet-class>
+	</servlet>
+
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -187,6 +217,16 @@
     <url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+		<servlet-name>exportPortfolio</servlet-name>
+		<url-pattern>/portfolioExport</url-pattern>
+</servlet-mapping>
+
+<servlet-mapping>
+		<servlet-name>exportDownload</servlet-name>
+		<url-pattern>/exportDownload</url-pattern>
+</servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
@@ -198,13 +238,11 @@
    <!ELEMENT mime-mapping (extension, mime-type)>
    -->
 
-   <!--
-   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-   Organize error-pages.xml following this DTD slice:
+  <error-page>
+	<error-code>403</error-code>
+	<location>/403.html</location>
+</error-page>  
 
-   <!ELEMENT error-page ((error-code | exception-type), location)>
-   -->
-
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
@@ -285,24 +323,40 @@
 	<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
 </taglib>
 
-   <!--
-   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
-   Organize web-security.xml following this DTD slice:
+  	<!--  Security Constraint -->
+	<security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
+			<url-pattern>/*</url-pattern>
+    	</web-resource-collection>
+    	<auth-constraint>
+    		<role-name>LEARNER</role-name>
+    		<role-name>TEACHER</role-name>
+    		<role-name>STAFF</role-name>
+    		<role-name>AUTHOR</role-name>
+    		<role-name>ADMIN</role-name>
+    		<role-name>SYSADMIN</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
-   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
-   <!ELEMENT web-resource-name (#PCDATA)>
-   <!ELEMENT url-pattern (#PCDATA)>
-   <!ELEMENT http-method (#PCDATA)>
-   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
-   <!ELEMENT transport-guarantee (#PCDATA)>
+    <security-constraint>
+	   	<web-resource-collection>
+	    	<web-resource-name>Export</web-resource-name>
+		    <url-pattern>/portfolioExport</url-pattern>
+		 </web-resource-collection>
+    	<auth-constraint>
+    		<role-name>AUTHOR</role-name> <!-- have to change this to TEACHER have it as AUTHOR so that I can test it with user mmm -->
+			<role-name>LEARNER</role-name>
+    	</auth-constraint>
+    </security-constraint>
 
-   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-   <!ELEMENT auth-method (#PCDATA)>
-   <!ELEMENT realm-name (#PCDATA)>
-   <!ELEMENT form-login-config (form-login-page, form-error-page)>
-   <!ELEMENT form-login-page (#PCDATA)>
-   <!ELEMENT form-error-page (#PCDATA)>
-   -->
+	<!--  Login Configuration -->
+  	<login-config>
+   		<auth-method>FORM</auth-method>
+		<realm-name>LAMS</realm-name>
+   		<form-login-config>
+    		<form-login-page>/login.jsp</form-login-page>
+   		</form-login-config>
+   	</login-config>
 
 </web-app>
Index: lams_monitoring/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u -r71d386f7a3afbbeeaeb73e2ef16c06eb3d2c5556 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision 71d386f7a3afbbeeaeb73e2ef16c06eb3d2c5556)
+++ lams_monitoring/conf/war/META-INF/MANIFEST.MF	(.../MANIFEST.MF)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -1,2 +1,2 @@
-Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-learning.jar ./lams-central.jar
+Class-Path: ./lams.jar ./lams-monitoring.jar ./lams-central.jar ./lams-learning.jar ./lams-tool-laicp10.jar ./lams-tool-lanb11.jar ./lams-tool-laqa11.jar ./lams-tool-lasbmt11.jar ./lams-tool-lasr10.jar
 
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r2fb270efd025291a9a2d45b04ad1b13aad40f170 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -29,9 +29,14 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml        					  
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r374085d62f6975a2b7e03f2419e2475f67757138 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 374085d62f6975a2b7e03f2419e2475f67757138)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -328,11 +328,9 @@
         {
             Activity activity = (Activity) i.next();
             System.out.println(activity);
-            //TODO this is for testing purpose as survey is the only tool available
-            //so far.
             if ( activity.getActivityTypeId().intValue() == Activity.TOOL_ACTIVITY_TYPE ) {
             	ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(activity.getActivityId()); 
-				if (shouldInitToolSessionFor(toolActivity)&&this.isSurvey(toolActivity))
+				if (shouldInitToolSessionFor(toolActivity))
 					initToolSessionFor((ToolActivity) activity,
                                    requestedLesson.getAllLearners(),
                                    requestedLesson);
@@ -565,7 +563,7 @@
 				Long toolContentId = toolActivity.getToolContentId();
 				if ( url !=null &&  toolContentId != null ) {
 					url = WebUtil.appendParameterToURL(url,
-								AttributeNames.TOOL_CONTENT_ID,
+								AttributeNames.PARAM_TOOL_CONTENT_ID,
 								toolActivity.getToolContentId().toString());
 					flashMessage = new FlashMessage("getActivityDefineLaterURL",new ProgressActivityDTO(activityID, url));
 				} else {
@@ -591,7 +589,7 @@
 				Long toolContentId = toolActivity.getToolContentId();
 				if ( url !=null &&  toolContentId != null ) {
 					url = WebUtil.appendParameterToURL(url,
-								AttributeNames.TOOL_CONTENT_ID,
+								AttributeNames.PARAM_TOOL_CONTENT_ID,
 								toolActivity.getToolContentId().toString());
 					flashMessage = new FlashMessage("getActivityMonitorURL",new ProgressActivityDTO(activityID, url));
 				} else {
@@ -791,16 +789,6 @@
         return newLessonClass;
     }
 
-    /**
-     * This is more for testing purpose. 
-     * @param toolActivity the tool activity defined in the design.
-     * @return
-     */
-    private boolean isSurvey(ToolActivity toolActivity)
-    {
-        return toolActivity.getTool().getServiceName().equals("surveyService");
-    }
-    
     //---------------------------------------------------------------------
     // Helper Methods - start lesson
     //---------------------------------------------------------------------
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java
===================================================================
diff -u -r374085d62f6975a2b7e03f2419e2475f67757138 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(.../DummyMonitoringAction.java)	(revision 374085d62f6975a2b7e03f2419e2475f67757138)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(.../DummyMonitoringAction.java)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -188,8 +188,8 @@
             HttpServletRequest request,
             HttpServletResponse response)throws IOException,LamsToolServiceException{
     	this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
-    	Integer userID = new Integer(WebUtil.readIntParam(request,AttributeNames.USER_ID));
-    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.ACTIVITY_ID));
+    	Integer userID = new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID));
+    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID));
     	String wddxPacket = monitoringService.getLearnerActivityURL(activityID,userID);
     	String url = extractURL(wddxPacket);
     	response.sendRedirect(response.encodeRedirectURL(url));
@@ -201,7 +201,7 @@
             HttpServletRequest request,
             HttpServletResponse response)throws IOException,LamsToolServiceException{
     	this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
-    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.ACTIVITY_ID));
+    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID));
     	String wddxPacket = monitoringService.getActivityMonitorURL(activityID);
     	String url = extractURL(wddxPacket);
     	response.sendRedirect(response.encodeRedirectURL(url));
@@ -212,7 +212,7 @@
             HttpServletRequest request,
             HttpServletResponse response)throws IOException,LamsToolServiceException{
     	this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
-    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.ACTIVITY_ID));
+    	Long activityID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_ACTIVITY_ID));
     	String wddxPacket = monitoringService.getActivityDefineLaterURL(activityID);
     	String url = extractURL(wddxPacket);
     	response.sendRedirect(response.encodeRedirectURL(url));
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -34,10 +34,15 @@
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml        					  
+		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-		classpath*:applicationContext.xml
+		classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/imscp/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 
+		classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml
 	</param-value>
 </context-param>
 
Index: lams_monitoring/web/dummy.jsp
===================================================================
diff -u -rab2f371009a37474fb0c3cc2b0efff3678c07355 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_monitoring/web/dummy.jsp	(.../dummy.jsp)	(revision ab2f371009a37474fb0c3cc2b0efff3678c07355)
+++ lams_monitoring/web/dummy.jsp	(.../dummy.jsp)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -133,7 +133,7 @@
 				</c:if><BR>
 			Completed Activities:<BR>
 			<c:forEach var="completed" items="${progress.completedActivities}">
-				<A HREF="javascript:launchPopup('/lams/monitoring/dummy.do?method=gotoLearnerActivityURL&userID=<c:out value="${progress.user.userId}"/>&activityID=<c:out value="${progress.completed.activityId}"/>');">View</A> <c:out value="${progress.completed.title}"/><BR>
+				<A HREF="javascript:launchPopup('/lams/monitoring/dummy.do?method=gotoLearnerActivityURL&userID=<c:out value="${progress.user.userId}"/>&activityID=<c:out value="${completed.activityId}"/>');">View</A> <c:out value="${completed.title}"/><BR>
 			</c:forEach>
 			</TD>
 		</TR>