Index: lams_learning/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/.classpath,v
diff -u -r1.1 -r1.2
--- lams_learning/.classpath	18 Mar 2005 03:23:37 -0000	1.1
+++ lams_learning/.classpath	3 Jun 2005 03:35:08 -0000	1.2
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="test/web"/>
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/struts/struts.jar"/>
-	<classpathentry kind="lib" path="lib/log4j/log4j-1.2.9.jar"/>
 	<classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-collections-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-digester.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j/dom4j-1.5.2.jar"/>
-	<classpathentry kind="lib" path="lib/odmg/odmg-3.0.jar"/>
-	<classpathentry sourcepath="/lams_tool_survey/src/java" kind="lib" path="lib/lams/lams-tool-survey.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/ehcache-1.0.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/mysql-connector-java-3.1.7-bin.jar"/>
-	<classpathentry sourcepath="lib/lams/src/lams-src.zip" kind="lib" path="lib/lams/lams.jar"/>
-	<classpathentry sourcepath="lib/hibernate/src/hibernate2-src.zip" kind="lib" path="lib/hibernate/hibernate2.jar"/>
-	<classpathentry kind="lib" path="lib/aopalliance/aopalliance.jar"/>
-	<classpathentry kind="lib" path="lib/spring/spring.jar"/>
-	<classpathentry kind="lib" path="lib/cglib/cglib-nodep-2.1-dev.jar"/>
-	<classpathentry kind="lib" path="lib/strutstestcase/strutstest-2.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/wddx/wddx-1.0a-lfl-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-beanutils.jar"/>
-	<classpathentry kind="src" path="/lams_tool_survey"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry sourcepath="/lams_common" kind="lib" path="D:/eclipse/workspace/lams_build/lib/lams/lams.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-workspace.jar"/>
 	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_learning/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.properties,v
diff -u -r1.4 -r1.5
--- lams_learning/build.properties	26 Apr 2005 09:31:36 -0000	1.4
+++ lams_learning/build.properties	3 Jun 2005 03:35:08 -0000	1.5
@@ -2,7 +2,7 @@
 
 #name of this project
 name=lams_learning
-product=lams_learning
+product=lams-learning
 version=1.1
 
 # Library directory within project. Where third party jars reside.
@@ -21,6 +21,8 @@
 build.lib=${build}/lib
 build.report=${build}/report
 
+sharedlib=../lams_build/lib
+j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
 
 #configuration files
 conf.dir=${basedir}/conf
Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.6 -r1.7
--- lams_learning/build.xml	26 Apr 2005 09:31:36 -0000	1.6
+++ lams_learning/build.xml	3 Jun 2005 03:35:08 -0000	1.7
@@ -29,11 +29,12 @@
 	<property file="build.properties" />
 
 	<path id="all-libs">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-			<exclude name="**/gnujaxp.jar" />
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar"/>
 		</fileset>
-		<pathelement location="../lams_common/build/classes" />
+		<fileset dir="${j2eelibs}">
+				<include name="**/*.jar"/>
+		</fileset>
 	</path>
 
 	<path id="project.classpath">
@@ -51,9 +52,10 @@
 		<echo message="" />
 		<echo message="Among the available targets are:" />
 		<echo message="" />
-		<echo message="build    --> build all; don't create JARs" />
-		<echo message="alljars  --> create all JAR files" />
-		<echo message="tests    --> run tests" />
+		<echo message="build-jar    --> create jar" />
+		<echo message="build-war    --> create jar and war" />
+		<echo message="update-lams-build --> copy jar file to lams_build/lib/lams" />
+		<echo message="test-report  --> run tests" />
 		<echo message="" />
 	</target>
 
@@ -91,19 +93,20 @@
 			</classpath>
 		</javac>
   		<copy overwrite="yes" todir="${build.classes.java}">
-  			<fileset dir="${src.dir.test}">
+  			<fileset dir="${src.dir.java}">
   				<include name="*.hbm.xml"/>
   			</fileset>
   		</copy>	
 		<copy overwrite="yes"
 			todir="${build.classes.test}/${learning.path}">
-			<fileset dir="${src.dir.test}/${learning.path}">
+			<fileset dir="${src.dir.java}/${learning.path}">
 				<include name="*.xml" />
 			</fileset>
 		</copy>
   		<copy overwrite="yes" todir="${build.classes.java}/${learning.path}">
   			<fileset dir="${src.dir.java}/${learning.path}">
   				<include name="**/*.properties"/>
+				<include name="**/*.xml"/>
   			</fileset>
   		</copy>	
 	</target>
@@ -116,13 +119,18 @@
 				<path refid="project.classpath" />
 			</classpath>
 		</javac>
+		<copy overwrite="yes" todir="${build.classes.test}">
+			<fileset dir="${src.dir.test}">
+				<include name="**/*.xml"/>
+			</fileset>
+		</copy>
 	</target>
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
 	<target name="build-jar" depends="compile.java" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
-		<jar jarfile="${build.lib}/${product}.jar">
+		<jar jarfile="${build.lib}/${product}.jar" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${build.classes.test}">
@@ -223,15 +231,14 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="compile.java, webdoclet" description="creates war file">
+	<target name="build-war" depends="webdoclet, build-jar" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
-		<war warfile="${build.lib}/${product}.war" 
+		<war warfile="${build.lib}/${product}.war"   manifest="${conf.dir}/war/META-INF/MANIFEST.MF" 
   				webxml="${conf.webinf.dir}/web.xml">
 			<webinf dir="${conf.webinf.dir}">
 				<include name="*.xml"/>
 				<include name="struts/*"/>
 				<include name="jstl/*"/>
-				<include name="spring/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
 			<classes dir="${build.classes.java}"/>
@@ -248,19 +255,28 @@
 	</target>
 
 	<!-- =================================================================== -->
+	<!-- Copy the jar file to the shared lams_build area					 -->
+	<!-- =================================================================== -->
+	<target name="update-lams-build" depends="build-jar" description="Copies the jar file to lams_build/lib/lams">
+  		<copy overwrite="yes" todir="${sharedlib}/lams/">
+  			<fileset dir="${build.lib}">
+  				<include name="${product}.jar"/>
+  			</fileset>
+  		</copy>	
+	</target>
+
+	<!-- =================================================================== -->
 	<!-- Run JUnit Tests                                                     -->
 	<!-- =================================================================== -->
-	<!-- target name="test" depends="compile.test,build-db">
+	<target name="test" depends="compile.test">
 		<mkdir dir="${build.report}" />
-		<junit printsummary="yes" haltonerror="no" haltonfailure="no"
+		<junit printsummary="yes" haltonerror="no" haltonfailure="yes"
 			fork="yes">
 			<formatter type="plain" usefile="false" />
 			<formatter type="xml" />
 			<batchtest todir="${build.report}">
 				<fileset dir="${src.dir.test}">
 					<include name="**/Test*.java" />
-					<exclude name="**/Test*All.java" />
-					<exclude name="**/TestInitSurveySession.java" />
 					<exclude name="**/*Action.java" />
 				</fileset>
 			</batchtest>
@@ -282,6 +298,6 @@
 			</fileset>
 			<report todir="${build.report}/html" />
 		</junitreport>
-	</target-->
+	</target>
 
 </project>
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.7 -r1.8
--- lams_learning/conf/xdoclet/web-settings.xml	26 Apr 2005 04:09:55 -0000	1.7
+++ lams_learning/conf/xdoclet/web-settings.xml	3 Jun 2005 03:35:03 -0000	1.8
@@ -26,10 +26,15 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
-		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml	
-		/WEB-INF/spring/learningDesignApplicationContext.xml		
-		classpath:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	  
+		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*:applicationContext.xml
 	</param-value>
 </context-param>
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	3 Jun 2005 03:35:11 -0000	1.1
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+	<bean id="learnerServiceTarget" class="org.lamsfoundation.lams.learning.service.LearnerService" singleton="false">
+		<constructor-arg>
+			<ref bean="progressEngine"/>
+		</constructor-arg>
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
+		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
+		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="activityMapping"><ref bean="activityMapping"/></property>
+	</bean>
+	
+	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="learnerServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="joinLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="calculateProgress">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="completeToolSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="completelActivity">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="exitLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="performGrouping">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="knockGate">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+   			</props>
+		</property>
+	</bean> 
+	
+	<!-- bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
+	</bean-->
+
+	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="false">
+	</bean>
+	
+	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
+		<property name="toolService"><ref bean="lamsCoreToolService"/></property>
+		<property name="baseURL"><value>http://localhost:8080/lams_learning</value></property>
+	</bean>
+	
+	<!-- bean id="dummyLearnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
+		<constructor-arg>
+			<ref bean="progressEngine"/>
+		</constructor-arg>
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+	</bean-->	
+</beans>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyAnsContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyQueType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyQueUsr.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveySession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/SurveyUsrResp.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/BaseTestCase.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v
diff -u -r1.19 -r1.20
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	12 Apr 2005 08:05:59 -0000	1.19
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	3 Jun 2005 03:35:10 -0000	1.20
@@ -138,13 +138,19 @@
     }
     protected String[] getContextConfigLocation()
     {
-        return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+        return new String[] { "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:*/applicationContext.xml"};
+
+/*        return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
   			  				"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
                               "/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml",
                               "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml",          					  
         					  "applicationContext.xml",
-    			  			  "/WEB-INF/spring/learningApplicationContext.xml"};
+    			  			  "/WEB-INF/spring/learningApplicationContext.xml"}; */
     }
     
     public void testJoinLesson() throws ProgressException,LamsToolServiceException
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/learning/web/form/DummyToolForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.12 -r1.13
--- lams_learning/web/WEB-INF/web.xml	26 Apr 2005 09:33:09 -0000	1.12
+++ lams_learning/web/WEB-INF/web.xml	3 Jun 2005 03:35:11 -0000	1.13
@@ -31,13 +31,18 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
-		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml	
-		/WEB-INF/spring/learningDesignApplicationContext.xml		
-		classpath:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
-  		classpath:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	  
+		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*:applicationContext.xml
 	</param-value>
 </context-param>
+<listener>
+	<listener-class>
+		org.springframework.web.context.ContextLoaderListener
+	</listener-class>
+</listener>	
 
   <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/dataAccessContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/dbConnection.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.17 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/learningApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/learningDesignApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/spring/surveyApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/WEB-INF/struts/.struts-config.mex
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/.struts-config.mex,v
diff -u -r1.4 -r1.5
Binary files differ
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.15 -r1.16
--- lams_learning/web/WEB-INF/struts/struts-config.xml	7 Apr 2005 07:11:07 -0000	1.15
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	3 Jun 2005 03:35:07 -0000	1.16
@@ -18,10 +18,6 @@
       type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
     />
     <form-bean
-      name="dummyToolForm"
-      type="org.lamsfoundation.lams.learning.web.form.DummyToolForm"
-    />
-    <form-bean
       name="testDblSubmitForm"
       type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
     />
@@ -191,26 +187,6 @@
       />
     </action>
     <action
-      path="/test/DummyTool"
-      type="org.lamsfoundation.lams.learning.web.action.DummyToolAction"
-      name="dummyToolForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="display"
-        path="/test/dummyTool.jsp"
-        redirect="false"
-      />
-      <forward
-        name="next"
-        path=".requestDisplay"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/CompleteActivity"
       type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       name="activityForm"
@@ -299,20 +275,6 @@
       validate="false"
     >
     </action>
-    <action
-      path="/test/DummyLesson"
-      type="org.lamsfoundation.lams.learning.web.action.DummyLessonAction"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayLesson"
-        path="/DisplayActivity.do"
-        redirect="true"
-      />
-    </action>
 
    <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)