Index: lams_learning/.classpath
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/.classpath	(.../.classpath)	(revision 7213f7efef305780b43d6d8f8c3f0616237ba8ec)
+++ lams_learning/.classpath	(.../.classpath)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/build.properties	(.../build.properties)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
+++ lams_learning/build.properties	(.../build.properties)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/build.xml	(.../build.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
+++ lams_learning/build.xml	(.../build.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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
===================================================================
diff -u -r6e6012e68d036f1f92b51051c1d84754ec677efc -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 6e6012e68d036f1f92b51051c1d84754ec677efc)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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/lib/aopalliance/aopalliance.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/cglib/cglib-nodep-2.1-dev.jar
===================================================================
diff -u -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/dom4j/dom4j-1.5.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/ehcache/ehcache-1.0.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/hibernate/hibernate-tools.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/hibernate/hibernate2.jar
===================================================================
diff -u -r0e9942a1cb3517b16f9cf75267fbea94371b621f -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/hibernate/odmg-3.0.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/hibernate/src/hibernate2-src.zip
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/j2ee/j2ee.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-beanutils.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-collections-2.1.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-digester.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-fileupload.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-lang-2.0.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-lang.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-logging.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jakarta-commons/commons-validator.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jdom/jdom.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jfreechart/gnujaxp.jar
===================================================================
diff -u -r4f710e6ac89f1c83cb7e8ec48b9bfadfa451157f -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jfreechart/jcommon-0.9.6.jar
===================================================================
diff -u -r4f710e6ac89f1c83cb7e8ec48b9bfadfa451157f -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/jfreechart/jfreechart-0.9.21.jar
===================================================================
diff -u -r4f710e6ac89f1c83cb7e8ec48b9bfadfa451157f -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/junit/junit.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/lams/lams-tool-survey.jar
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/lams/lams.jar
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/lams/src/lams-src.zip
===================================================================
diff -u -r0f3282629e7e668f49f50452d50baaddf4df7170 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/log4j/log4j-1.2.9.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/middlegen/middlegen-2.1.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/middlegen/middlegen-hibernate-plugin-2.1.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/middlegen/middlegen-html-plugin-2.1.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/middlegen/velocity-1.4-dev.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/middlegen/village-2.0-dev-20030825.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/mysql/mysql-connector-java-3.1.7-bin.jar
===================================================================
diff -u -r85080adbc6614f6c010113e1e462a96a818ec2c2 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/odmg/odmg-3.0.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/oro/jakarta-oro.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/spring/spring.jar
===================================================================
diff -u -re53f17a8a0854584aaad014b311df1f8c6e48f0c -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/spring/src/spring_src.zip
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/struts/src/jakarta-struts-1.2.4-src.zip
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/struts/struts-el.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/strutstestcase/src/strutstest-213-src.zip
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/strutstestcase/strutstest-2.1.3.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/wddx/wddx-1.0a-lfl-0.2.jar
===================================================================
diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/maven-xdoclet-plugin-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-apache-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-bea-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-borland-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-caucho-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-de-locale-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-ejb-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-exolab-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-fr_FR-locale-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-hibernate-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-hp-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-ibm-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-java-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-jboss-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-jdo-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-jmx-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-jsf-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-libelis-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-macromedia-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-mockobjects-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-mvcsoft-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-mx4j-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-objectweb-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-openejb-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-oracle-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-orion-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-portlet-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-pramati-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-pt_BR-locale-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-solarmetric-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-spring-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-sun-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-sybase-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-tjdo-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-web-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-webwork-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-wsee-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xdoclet-xdoclet-module-1.2.2.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/lib/xdoclet/xjavadoc-1.1.jar
===================================================================
diff -u -r29932d4b94bba030634340a4e4548626d1a694f7 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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
===================================================================
diff -u -r455d2b55eaef30c9e68a0fb6bdef036320ec54bd -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision 455d2b55eaef30c9e68a0fb6bdef036320ec54bd)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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/lib/antlr.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/aopalliance.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/cglib-nodep-2.1-dev.jar
===================================================================
diff -u -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-beanutils.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-collections.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-digester.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-fileupload.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-lang-2.0.jar
===================================================================
diff -u -rfbdb2da2ab69a24876c89c0f37ca8eb30df40990 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-logging.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/commons-validator.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/ehcache-1.0.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/gnujaxp.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/jakarta-oro.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/jcommon-0.9.6.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/jfreechart-0.9.21.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/jstl.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/lams-tool-survey.jar
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/lams.jar
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/mysql-connector-java-3.1.7-bin.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/spring.jar
===================================================================
diff -u -r2fdb7451020ddd62508b7c7916d6fb72fed67b57 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/standard.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/struts-el.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/struts-legacy.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/struts.jar
===================================================================
diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Index: lams_learning/web/WEB-INF/lib/wddx-1.0a-lfl-0.2.jar
===================================================================
diff -u -rfbdb2da2ab69a24876c89c0f37ca8eb30df40990 -rab7ecf3891aec5852576ebf42c663b7414b1041f
Binary files differ
Fisheye: Tag ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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 ab7ecf3891aec5852576ebf42c663b7414b1041f 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
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision 7213f7efef305780b43d6d8f8c3f0616237ba8ec)
+++ lams_learning/web/WEB-INF/struts/.struts-config.mex	(.../.struts-config.mex)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -1 +1 @@
-<FlowViewLayout Version="1.2"><StrutsActivity path="/DisplayOptionsActivity.do" location="105,15" dimension="368,75" /><StrutsActivity path="/LoadToolActivity.do" location="1850,50" dimension="370,75" /><StrutsActivity path="/test/DummyTool.do" location="540,105" dimension="346,75" /><StrutsActivity path="/learner.do" location="1550,250" dimension="328,75" /><StrutsActivity path="/CompleteActivity.do" location="-45,420" dimension="342,75" /><StrutsActivity path="/DisplayToolActivity.do" location="645,300" dimension="351,75" /><StrutsActivity path="/DisplayActivity.do" location="1170,15" dimension="331,75" /><StrutsActivity path="/test/DblSubmit.do" location="-45,330" dimension="359,75" /><StrutsActivity path="/DisplayParallelActivity.do" location="-45,600" dimension="365,75" /><StrutsActivity path="/ChooseActivity.do" location="645,390" dimension="333,75" /><StrutsActivity path="/test/DummyLesson.do" location="705,0" dimension="359,75" /><StrutsActivity path="/index.do" location="150,705" dimension="239,75" /><StrutsActivity path="/requestDisplay.do" location="645,570" dimension="239,75" /><StrutsActivity path="/parallelWait.do" location="645,675" dimension="239,75" /><StrutsActivity path="/lessonComplete.do" location="1035,195" dimension="239,75" /><StrutsActivity path="error;6" location="-300,690" dimension="150,75" /><StrutsActivity path="noSessionError;6" location="-300,795" dimension="150,75" /><StrutsActivity path=".optionsActivity" location="555,30" dimension="105,49" /><StrutsActivity path="/Activity.do.do" location="1250,350" dimension="96,75" /><StrutsActivity path=".loadToolActivity" location="390,120" dimension="110,49" /><StrutsActivity path="/test/dummyTool.jsp" location="630,225" dimension="129,49" /><StrutsActivity path=".requestDisplay" location="1005,105" dimension="105,49" /><StrutsActivity path=".welcome" location="1250,650" dimension="75,49" /><StrutsActivity path="/test/dblSubmitTest.jsp" location="420,345" dimension="142,49" /><StrutsActivity path=".parallelActivity" location="480,615" dimension="104,49" /><StrutsActivity path="/error.jsp" location="-105,705" dimension="150,49" /><StrutsActivity path="/noSessionError.jsp" location="-120,810" dimension="150,49" /><StrutsActivity path="/content.do.do" location="645,480" dimension="239,75" /><StrutsActivity path="/Activity.do.do.do" location="950,550" dimension="96,75" /><StrutsActivity path="/notebook/DisplayEntry.do.do.do" location="-60,510" dimension="367,75" /><StrutsActivity path="/DisplayLoadToolActivity.do.do.do" location="-105,120" dimension="374,75" /><StrutsActivity path=".journalDetail" location="450,525" dimension="94,49" /><StrutsActivity path="/Activity.do.do.do.do" location="-90,30" dimension="150,62" /><StrutsActivity path="/partialCompleted.jsp" location="-300,960" dimension="150,49" /><StrutsActivity path="/lessonComplete.jsp" location="405,885" dimension="150,49" /><StrutsActivity path="/requestDisplayActivity.jsp" location="615,885" dimension="150,62" /><StrutsActivity path="/parallelActivity.jsp" location="45,885" dimension="150,49" /><StrutsActivity path=".toolActivity" location="900,855" dimension="150,49" /><StrutsActivity path="/optionsActivity.jsp" location="210,960" dimension="150,49" /><StrutsActivity path="/toolActivity" location="360,195" dimension="150,49" /><StrutsActivity path="/MultiPartialCompleted.jsp" location="-300,885" dimension="150,62" /><StrutsActivity path="/SequenceCompleted.jsp" location="-270,435" dimension="150,49" /><StrutsActivity path="/RequestDisplayActivity.jsp" location="225,885" dimension="150,62" /><StrutsActivity path="/ParallelActivity.jsp" location="-270,285" dimension="150,49" /><StrutsActivity path="/ToolActivity.jsp" location="-135,960" dimension="150,49" /><StrutsActivity path="/OptionsActivity.jsp" location="-270,165" dimension="150,49" /><StrutsActivity path="/Error.jsp" location="390,960" dimension="150,49" /><StrutsActivity path="/NoSessionError.jsp" location="600,960" dimension="150,49" /><StrutsActivity path="/clientRequestDisplay.jsp" location="-135,885" dimension="150,62" /><StrutsActivity path="/Wait.jsp" location="900,780" dimension="150,49" /><StrutsActivity path="/SyncWait.jsp" location="-270,570" dimension="150,49" /><StrutsActivity path="/ParallelActivityCompleted.jsp" location="-270,345" dimension="150,62" /><StrutsActivity path="/SingleActivity.jsp" location="-270,495" dimension="150,49" /><StrutsActivity path="/DisplaySingleActivity.jsp" location="-270,15" dimension="150,49" /><StrutsActivity path="/DisplayMultiActivity.jsp" location="45,960" dimension="150,49" /><StrutsActivity path="/ActivityCompleted.jsp" location="-270,90" dimension="150,49" /><StrutsActivity path="/MultiActivity.jsp" location="-270,225" dimension="150,49" /><StrutsTransition id="/DisplayActivity.do,displayParallelActivity,/DisplayParallelActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1335,15" /><AbsolutePoint location="1335,-45" /><AbsolutePoint location="-375,-45" /><AbsolutePoint location="-375,637" /><AbsolutePoint location="-45,637" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,displayOptionsActivity,/DisplayOptionsActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1365,15" /><AbsolutePoint location="1365,-75" /><AbsolutePoint location="319,-75" /><AbsolutePoint location="319,15" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/learner.do,displayActivity,/DisplayActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1714,250" /><AbsolutePoint location="1714,35" /><AbsolutePoint location="1501,35" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyTool.do,next,.requestDisplay,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="886,139" /><AbsolutePoint location="1005,139" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,lessonComplete,/lessonComplete.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1259,90" /><AbsolutePoint location="1259,195" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DblSubmit.do,display,/test/dblSubmitTest.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="314,367" /><AbsolutePoint location="420,367" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/LoadToolActivity.do,displayTool,.loadToolActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="2035,50" /><AbsolutePoint location="2035,-15" /><AbsolutePoint location="488,-15" /><AbsolutePoint location="488,120" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyTool.do,display,/test/dummyTool.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="713,180" /><AbsolutePoint location="713,225" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayParallelActivity.do,displayParallel,.parallelActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="320,637" /><AbsolutePoint location="480,637" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,parallelWait,/parallelWait.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1340,90" /><AbsolutePoint location="1340,714" /><AbsolutePoint location="884,714" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="noSessionError;6,null,/noSessionError.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="-150,832" /><AbsolutePoint location="-120,832" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/learner.do,welcome,.welcome,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1714,325" /><AbsolutePoint location="1714,674" /><AbsolutePoint location="1325,674" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/test/DummyLesson.do,displayLesson,/DisplayActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1064,37" /><AbsolutePoint location="1170,37" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayOptionsActivity.do,displayOptions,.optionsActivity,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="473,52" /><AbsolutePoint location="555,52" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="error;6,null,/error.jsp,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="-150,727" /><AbsolutePoint location="-105,727" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/DisplayActivity.do,loadToolActivity,/LoadToolActivity.do,1" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1501,65" /><AbsolutePoint location="1850,65" /></AutomaticBendpoints></StrutsTransition><StrutsTransition id="/Activity.do.do,null,/DisplayOptionsActivity.do,2" routingType="0"><AutomaticBendpoints><AbsolutePoint location="1046,587" /><AbsolutePoint location="1516,587" /><AbsolutePoint location="1516,-135" /><AbsolutePoint location="289,-135" /><AbsolutePoint location="289,15" /></AutomaticBendpoints></StrutsTransition></FlowViewLayout>
\ No newline at end of file
+<FlowViewLayout Version="1.1"><StrutsActivity path="/DisplayOptionsActivity.do" location="105,15" dimension="368,75" /><StrutsActivity path="/gate.do" location="84,708" dimension="150,114" /><StrutsActivity path="/grouping.do" location="84,2983" dimension="150,114" /><StrutsActivity path="/LoadToolActivity.do" location="1850,50" dimension="370,75" /><StrutsActivity path="/learner.do" location="1550,250" dimension="328,75" /><StrutsActivity path="/test/DummyTool.do" location="540,105" dimension="346,75" /><StrutsActivity path="/CompleteActivity.do" location="-45,420" dimension="342,75" /><StrutsActivity path="/DisplayToolActivity.do" location="645,300" dimension="351,75" /><StrutsActivity path="/DisplayActivity.do" location="1170,15" dimension="331,75" /><StrutsActivity path="/test/DblSubmit.do" location="-45,330" dimension="359,75" /><StrutsActivity path="/DisplayParallelActivity.do" location="-45,600" dimension="365,75" /><StrutsActivity path="/ChooseActivity.do" location="645,390" dimension="333,75" /><StrutsActivity path="/test/DummyLesson.do" location="705,0" dimension="359,75" /><StrutsActivity path="/index.do" location="150,705" dimension="239,75" /><StrutsActivity path="/content.do" location="84,1073" dimension="150,101" /><StrutsActivity path="/requestDisplay.do" location="645,570" dimension="239,75" /><StrutsActivity path="/parallelWait.do" location="645,675" dimension="239,75" /><StrutsActivity path="/lessonComplete.do" location="1035,195" dimension="239,75" /><StrutsActivity path="error;6" location="-300,690" dimension="150,75" /><StrutsActivity path="noSessionError;6" location="-300,795" dimension="150,75" /><StrutsActivity path=".optionsActivity" location="555,30" dimension="105,49" /><StrutsActivity path="/Activity.do.do" location="384,872" dimension="150,88" /><StrutsActivity path=".gateWaiting" location="384,1035" dimension="150,62" /><StrutsActivity path=".grouping" location="384,2983" dimension="150,62" /><StrutsActivity path=".loadToolActivity" location="390,120" dimension="110,49" /><StrutsActivity path=".welcome" location="1250,650" dimension="75,49" /><StrutsActivity path="/test/dummyTool.jsp" location="630,225" dimension="129,49" /><StrutsActivity path=".requestDisplay" location="1005,105" dimension="105,49" /><StrutsActivity path="/test/dblSubmitTest.jsp" location="420,345" dimension="142,49" /><StrutsActivity path=".parallelActivity" location="480,615" dimension="104,49" /><StrutsActivity path="/error.jsp" location="-105,705" dimension="150,49" /><StrutsActivity path="/noSessionError.jsp" location="-120,810" dimension="150,49" /><StrutsActivity path="/Activity.do.do.do" location="1250,350" dimension="96,75" /><StrutsActivity path="/content.do.do.do" location="645,480" dimension="239,75" /><StrutsActivity path="/Activity.do.do.do.do" location="950,550" dimension="96,75" /><StrutsActivity path="/notebook/DisplayEntry.do.do.do.do" location="-60,510" dimension="367,75" /><StrutsActivity path="/DisplayLoadToolActivity.do.do.do.do" location="-105,120" dimension="374,75" /><StrutsActivity path=".journalDetail" location="450,525" dimension="94,49" /><StrutsActivity path="/Activity.do.do.do.do.do" location="-90,30" dimension="150,62" /><StrutsActivity path="/partialCompleted.jsp" location="-300,960" dimension="150,49" /><StrutsActivity path="/lessonComplete.jsp" location="405,885" dimension="150,49" /><StrutsActivity path="/requestDisplayActivity.jsp" location="615,885" dimension="150,62" /><StrutsActivity path="/parallelActivity.jsp" location="45,885" dimension="150,49" /><StrutsActivity path=".toolActivity" location="900,855" dimension="150,49" /><StrutsActivity path="/optionsActivity.jsp" location="210,960" dimension="150,49" /><StrutsActivity path="/toolActivity" location="360,195" dimension="150,49" /><StrutsActivity path="/MultiPartialCompleted.jsp" location="-300,885" dimension="150,62" /><StrutsActivity path="/SequenceCompleted.jsp" location="-270,435" dimension="150,49" /><StrutsActivity path="/RequestDisplayActivity.jsp" location="225,885" dimension="150,62" /><StrutsActivity path="/ParallelActivity.jsp" location="-270,285" dimension="150,49" /><StrutsActivity path="/ToolActivity.jsp" location="-135,960" dimension="150,49" /><StrutsActivity path="/OptionsActivity.jsp" location="-270,165" dimension="150,49" /><StrutsActivity path="/Error.jsp" location="390,960" dimension="150,49" /><StrutsActivity path="/NoSessionError.jsp" location="600,960" dimension="150,49" /><StrutsActivity path="/clientRequestDisplay.jsp" location="-135,885" dimension="150,62" /><StrutsActivity path="/Wait.jsp" location="900,780" dimension="150,49" /><StrutsActivity path="/SyncWait.jsp" location="-270,570" dimension="150,49" /><StrutsActivity path="/ParallelActivityCompleted.jsp" location="-270,345" dimension="150,62" /><StrutsActivity path="/SingleActivity.jsp" location="-270,495" dimension="150,49" /><StrutsActivity path="/DisplaySingleActivity.jsp" location="-270,15" dimension="150,49" /><StrutsActivity path="/DisplayMultiActivity.jsp" location="45,960" dimension="150,49" /><StrutsActivity path="/ActivityCompleted.jsp" location="-270,90" dimension="150,49" /><StrutsActivity path="/MultiActivity.jsp" location="-270,225" dimension="150,49" /><StrutsTransition id="/DisplayActivity.do,displayParallelActivity,/DisplayParallelActivity.do,1" routingType="0" /><StrutsTransition id="/gate.do,waiting,.gateWaiting,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,displayOptionsActivity,/DisplayOptionsActivity.do,1" routingType="0" /><StrutsTransition id="/learner.do,displayActivity,/DisplayActivity.do,1" routingType="0" /><StrutsTransition id="/test/DblSubmit.do,display,/test/dblSubmitTest.jsp,1" routingType="0" /><StrutsTransition id="/test/DummyTool.do,next,.requestDisplay,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,lessonComplete,/lessonComplete.do,1" routingType="0" /><StrutsTransition id="/LoadToolActivity.do,displayTool,.loadToolActivity,1" routingType="0" /><StrutsTransition id="/test/DummyTool.do,display,/test/dummyTool.jsp,1" routingType="0" /><StrutsTransition id="/DisplayParallelActivity.do,displayParallel,.parallelActivity,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,parallelWait,/parallelWait.do,1" routingType="0" /><StrutsTransition id="noSessionError;6,null,/noSessionError.jsp,1" routingType="0" /><StrutsTransition id="/grouping.do,showGroup,.grouping,1" routingType="0" /><StrutsTransition id="/learner.do,welcome,.welcome,1" routingType="0" /><StrutsTransition id="/test/DummyLesson.do,displayLesson,/DisplayActivity.do,1" routingType="0" /><StrutsTransition id="/DisplayOptionsActivity.do,displayOptions,.optionsActivity,1" routingType="0" /><StrutsTransition id="error;6,null,/error.jsp,1" routingType="0" /><StrutsTransition id="/DisplayActivity.do,loadToolActivity,/LoadToolActivity.do,1" routingType="0" /><StrutsTransition id="/grouping.do,viewGrouping,/grouping.do,1" routingType="0" /><StrutsTransition id="/Activity.do.do,null,/DisplayOptionsActivity.do,2" routingType="0" /></FlowViewLayout>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r715f8fde307b93cafb4b879577610d159684aaf6 -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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)
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -rcc986867ccf2cb62e83508696af85b0f3f65a0ff -rab7ecf3891aec5852576ebf42c663b7414b1041f
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision ab7ecf3891aec5852576ebf42c663b7414b1041f)
@@ -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)