Index: lams_monitoring/.classpath
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/.classpath	(.../.classpath)	(revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962)
+++ lams_monitoring/.classpath	(.../.classpath)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -4,38 +4,15 @@
 	<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="web/WEB-INF/lib/jstl.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/standard.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-lang.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/commons-validator.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/jakarta-oro.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/struts-legacy.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/struts.jar"/>
-	<classpathentry sourcepath="/lams_common/src" kind="lib" path="lib/lams/lams.jar"/>
-	<classpathentry sourcepath="lib/lams/src/lams_authoring_src.zip" kind="lib" path="lib/lams/lams-authoring.jar"/>
-	<classpathentry kind="lib" path="lib/spring/spring.jar"/>
-	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
-	<classpathentry sourcepath="lib/lams/src/lams_tool_survey_src.zip" kind="lib" path="lib/lams/lams-tool-survey.jar"/>
-	<classpathentry kind="lib" path="lib/hibernate/hibernate2.jar"/>
-	<classpathentry kind="lib" path="lib/aopalliance/aopalliance.jar"/>
-	<classpathentry kind="lib" path="lib/odmg/odmg-3.0.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-digester.jar"/>
-	<classpathentry kind="lib" path="lib/log4j/log4j-1.2.9.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j/dom4j-1.5.2.jar"/>
-	<classpathentry kind="lib" path="lib/cglib/cglib-full-2.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/jfreechart/jfreechart-0.9.21.jar"/>
-	<classpathentry kind="lib" path="lib/jfreechart/jcommon-0.9.6.jar"/>
-	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-3.1.7-bin.jar"/>
 	<classpathentry kind="lib" path="lib/quartz/quartz.jar"/>
-	<classpathentry kind="lib" path="lib/wddx/wddx-1.0a-lfl-0.2.jar"/>
-	<classpathentry kind="lib" path="lib/strutstestcase/strutstest-2.1.3.jar"/>
-	<classpathentry kind="lib" path="web/WEB-INF/lib/quartz.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
+	<classpathentry kind="lib" path="D:/eclipse/workspace/lams_build/lib/lams/lams-learning.jar"/>
+	<classpathentry kind="lib" path="lib/lams/lams-tool-survey.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/gnujaxp.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/jcommon-0.9.6.jar"/>
 	<classpathentry kind="lib" path="web/WEB-INF/lib/jfreechart-0.9.21.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-authoring.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-workspace.jar"/>
 	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_monitoring/build.properties
===================================================================
diff -u -re5c5837df6794819de332957f68c115476631807 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/build.properties	(.../build.properties)	(revision e5c5837df6794819de332957f68c115476631807)
+++ lams_monitoring/build.properties	(.../build.properties)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -2,12 +2,15 @@
 
 #name of this project
 name=monitoring
-product=lams_monitoring
+product=lams-monitoring
 version=1.1
 
 # Library directory within project. Where third party jars reside.
 lib.dir=${basedir}/lib
 
+sharedlib=../lams_build/lib
+j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
+
 # Source directory under the current root
 src.dir=${basedir}/src
 src.dir.java=${src.dir}/java
Index: lams_monitoring/build.xml
===================================================================
diff -u -r3b0bc22e75b15e3d673075041cd713b4bb78f789 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/build.xml	(.../build.xml)	(revision 3b0bc22e75b15e3d673075041cd713b4bb78f789)
+++ lams_monitoring/build.xml	(.../build.xml)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -15,8 +15,13 @@
 	<path id="all-libs">
 		<fileset dir="${lib.dir}">
 			<include name="**/*.jar"/>
-			<exclude name="**/gnujaxp.jar"/>
 		</fileset>
+		<fileset dir="${sharedlib}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${j2eelibs}">
+				<include name="**/*.jar"/>
+		</fileset>
 	</path>
 	
 	<path id="project.classpath">
@@ -33,9 +38,9 @@
 		<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="test-report  --> run tests" />
 		<echo message=""/>
 
 	</target>
@@ -71,13 +76,14 @@
 			</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.java}/${monitoring.path}">
-			<fileset dir="${src.dir.test}/${monitoring.path}">
-				<include name="*.xml"/>
+		<copy overwrite="yes" todir="${build.classes.java}">
+			<fileset dir="${src.dir.java}">
+  				<include name="**/*.properties"/>
+				<include name="**/*.xml"/>
 			</fileset>
 		</copy>
 	</target>
@@ -90,14 +96,32 @@
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
+		<copy overwrite="yes" todir="${build.classes.java}">
+			<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" manifest="${conf.dir}/jar/META-INF/MANIFEST.MF">
+			<fileset dir="${build.classes.java}">
+			</fileset>
+			<fileset dir="${build.classes.test}">
+			</fileset>			
+		</jar>
+	</target>
+
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="build-war" depends="compile.java,webdoclet" description="creates war file">
+	<target name="build-war" depends="build-jar,webdoclet" 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"/>
@@ -181,6 +205,40 @@
 				mergedir="${conf.xdoclet.dir}" version="1.2" />	
        </webdoclet>
    </target>
-
 	
+	   <!-- =================================================================== -->
+	   <!-- Run junit tests														-->
+	   <!-- =================================================================== -->
+	<target name="test" depends="compile.test">
+		<mkdir dir="${build.report}" />
+		<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="**/*Action.java" />
+				</fileset>
+			</batchtest>
+			<classpath>
+				<pathelement location="${build.classes.java}" />
+				<pathelement location="${build.classes.test}" />
+				<pathelement location="${conf.hibernate.mapping.dir}" />
+				<pathelement location="${conf.web.dir}" />
+				<path refid="project.classpath" />
+			</classpath>
+		</junit>
+	</target>
+
+	<target name="test-report" depends="test">
+		<mkdir dir="${build.report}/html" />
+		<junitreport todir="${build.report}">
+			<fileset dir="${build.report}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report todir="${build.report}/html" />
+		</junitreport>
+	</target>
+
 </project>
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/conf/jar/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_monitoring/conf/jar/META-INF/MANIFEST.MF	(revision 0)
+++ lams_monitoring/conf/jar/META-INF/MANIFEST.MF	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -0,0 +1,3 @@
+Implementation-Title: LAMS - Monitoring
+Implementation-Version: 1.1
+Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
Index: lams_monitoring/conf/war/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_monitoring/conf/war/META-INF/MANIFEST.MF	(revision 0)
+++ lams_monitoring/conf/war/META-INF/MANIFEST.MF	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -0,0 +1,2 @@
+Class-Path: ./lams.jar ./lams_monitoring.jar ./lams_learning.jar ./lams_authoring.jar ./lams_workspace.jar
+
Index: lams_monitoring/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rdc3ace7961973e93b262349670d69142149be245 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision dc3ace7961973e93b262349670d69142149be245)
+++ lams_monitoring/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -26,14 +26,12 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		classpath*:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
-  		classpath*:/WEB-INF/authoringApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
-  		classpath*:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/learning/learningApplicationContext.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:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
 		classpath*:applicationContext.xml
 	</param-value>
 </context-param>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(revision 0)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+-->
+<!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 ======================== -->
+
+
+	<!--
+	  - Lams monitoring primary business object (default implementation), as an inner bean wrapped
+		- by an outer transactional proxy. The two bean definitions could have been separate,
+		- but this is cleaner as there is no need to ever access the unwrapped object.
+	-->   
+	<bean id="monitoringServiceTarget" class="org.lamsfoundation.lams.monitoring.service.MonitoringService"
+		singleton="false"
+	>
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>	
+		<property name="authoringService"><ref bean="authoringService"/></property>	
+		<property name="transitionDAO"><ref bean="transitionDAO"/></property>	
+		<property name="activityDAO"><ref bean="activityDAO"/></property>	
+		<property name="userDAO"><ref bean="userDAO"/></property>
+		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>			
+		<property name="userManagementService"><ref bean="userManagementService"/></property>			
+		<property name="scheduler"><ref bean="scheduler"/></property>
+	</bean>	
+	
+	<bean id="monitoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="monitoringServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="initializeLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="createLessonClassForLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="startLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="openGate">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="closeGate">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+			</props>
+		</property>
+	</bean>    
+
+    <bean id="openScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean">
+        <property name="jobClass">
+            <value>org.lamsfoundation.lams.monitoring.service.OpenScheduleGateJob</value>
+        </property>
+        <property name="jobDataAsMap">
+            <map>
+                <entry key="monitoringService">
+                    <ref bean="monitoringService"/>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="closeScheduleGateJob" class="org.springframework.scheduling.quartz.JobDetailBean">
+        <property name="jobClass">
+            <value>org.lamsfoundation.lams.monitoring.service.CloseScheduleGateJob</value>
+        </property>
+        <property name="jobDataAsMap">
+            <map>
+                <entry key="monitoringService">
+                    <ref bean="monitoringService"/>
+                </entry>
+            </map>
+        </property>
+    </bean>
+    
+    <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+    </bean>
+</beans>
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyAnsContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyQueType.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyQueUsr.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveySession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/SurveyUsrResp.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java
===================================================================
diff -u -r3fb957fc8c6b4b5b821d25ade819dca8da526d4a -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 3fb957fc8c6b4b5b821d25ade819dca8da526d4a)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(.../TestMonitoringService.java)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -59,11 +59,11 @@
     private final Integer TEST_LEARNER_ID = new Integer(2);
     private final Integer TEST_STAFF_ID = new Integer(3);
     // values when demo'ing the progress engine
-    private final long TEST_LEARNING_DESIGN_ID = 2;
-    private final long TEST_COPIED_LEARNING_DESIGN_ID = 3;
+    //private final long TEST_LEARNING_DESIGN_ID = 2;
+    //private final long TEST_COPIED_LEARNING_DESIGN_ID = 3;
     // values when testing the progress engine
-//  private final long TEST_LEARNING_DESIGN_ID = 1;
-//  private final long TEST_COPIED_LEARNING_DESIGN_ID = 2;
+    private final long TEST_LEARNING_DESIGN_ID = 1;
+    private final long TEST_COPIED_LEARNING_DESIGN_ID = 2;
     private final Integer TEST_ORGANIZATION_ID = new Integer(1);
     private final Long TEST_SCHEDULE_GATE_ID = new Long(27);
     
@@ -112,14 +112,21 @@
      */
     protected String[] getContextConfigLocation()
     {
-        return new String[] { "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+        return new String[] { 
+                  "classpath:/org/lamsfoundation/lams/applicationContext.xml",
+                  "classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+  				  "classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml",
+  				  "classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+  				  "classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml",    
+    			  "classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml"};    
+/*        return new String[] { "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
   			  				  "/WEB-INF/authoringApplicationContext.xml",
   			  				  "/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml",
   			  				  "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml",        					  
-				  			  "applicationContext.xml"};    
+				  			  "applicationContext.xml"}; */    
     }
     /**
      * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
Index: lams_monitoring/web/WEB-INF/lib/antlr.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/aopalliance.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/cglib-full-2.0.2.jar
===================================================================
diff -u -r10633e08e807f93747ef4a324937a2a1cc5991aa -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-beanutils.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-collections.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-digester.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-fileupload.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-lang-2.0.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-lang.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-logging.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/commons-validator.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/ehcache-1.0.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/hibernate2.jar
===================================================================
diff -u -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/jakarta-oro.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/jstl.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/lams-authoring.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/lams-tool-survey.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/lams.jar
===================================================================
diff -u -r83751ccbd9c0d7db4e1c2f3e027646c41de5c29a -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/lams_learning.jar
===================================================================
diff -u -rdc3ace7961973e93b262349670d69142149be245 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/log4j-1.2.9.jar
===================================================================
diff -u -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/mysql-connector-java-3.1.7-bin.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/spring.jar
===================================================================
diff -u -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Index: lams_monitoring/web/WEB-INF/lib/standard.jar
===================================================================
diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
Binary files differ
Fisheye: Tag 2fb270efd025291a9a2d45b04ad1b13aad40f170 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/spring/monitoringApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/WEB-INF/web.xml
===================================================================
diff -u -rdc3ace7961973e93b262349670d69142149be245 -r2fb270efd025291a9a2d45b04ad1b13aad40f170
--- lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision dc3ace7961973e93b262349670d69142149be245)
+++ lams_monitoring/web/WEB-INF/web.xml	(.../web.xml)	(revision 2fb270efd025291a9a2d45b04ad1b13aad40f170)
@@ -31,14 +31,12 @@
 <context-param>
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
-		classpath*:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
-  		classpath*:/WEB-INF/authoringApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
-  		classpath*:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
-  		classpath*:/org/lamsfoundation/lams/learning/learningApplicationContext.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:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
+  		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
 		classpath*:applicationContext.xml
 	</param-value>
 </context-param>