Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.32 -r1.33
--- lams_common/build.xml	27 Sep 2005 05:25:35 -0000	1.32
+++ lams_common/build.xml	6 Oct 2005 06:33:01 -0000	1.33
@@ -244,36 +244,6 @@
 			</fileset>
 		</copy>
 	</target>
-
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<!-- Make the war archive  for deployment             -->
-	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="lams-war" depends="lams-jar" description="creates war file">
-		<delete file="${build.lib}/${product}.war"/>
-		<war warfile="${build.lib}/${product}.war" 
-  				webxml="${webinf}/web.xml">
-			<webinf dir="${webinf}">
-				<include name="*.xml"/>
-				<!--include name="*.properties"/-->
-				<include name="struts/*"/>
-				<include name="jstl/*"/>
-				<include name="tiles/*"/>
-				<exclude name="web.xml"/>
-			</webinf>
-			<lib dir="${build.lib}">
-				<include name="${product}.jar"/>
-			</lib>
-			<fileset dir="${web}">
-				<include name="*"/>
-				<include name="doc/*"/>
-				<include name="admin/*"/>
-				<include name="images/*"/>
-				<include name="admin/file/*"/>
-			</fileset>
-		</war>
-	</target>
-
-
 	<!-- =================================================================== -->
 	<!-- Deploy the project on windows                                       -->
 	<!-- =================================================================== -->
@@ -284,8 +254,6 @@
 		</delete>
 		<copy file="${build.lib}/${product}.jar"
 				todir="${jboss.deploy}"/>
-		<copy file="${build.lib}/${product}.war"
-				todir="${jboss.deploy}"/>
 	</target>
 
 	<!-- =================================================================== -->
Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.9 -r1.10
--- lams_learning/build.xml	7 Sep 2005 01:35:34 -0000	1.9
+++ lams_learning/build.xml	6 Oct 2005 06:40:35 -0000	1.10
@@ -206,7 +206,7 @@
 			<fileset dir="${src.dir.java}">
 				<include name="${survey.path}/*.java" />
 			</fileset>
-			<hibernate version="2.0" />
+			<hibernate version="3.0" />
 
 		</hibernatedoclet>
 	</target-->
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyAnsContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyQueContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyQueType.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyQueUsr.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveySession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/Attic/SurveyUsrResp.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml	23 Feb 2005 04:34:06 -0000	1.1
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_learning/conf/xdoclet/filters.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/filters.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/filters.xml	21 Feb 2005 05:31:39 -0000	1.2
+++ lams_learning/conf/xdoclet/filters.xml	6 Oct 2005 06:40:18 -0000	1.3
@@ -21,7 +21,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.30 -r1.31
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	6 Jul 2005 02:08:04 -0000	1.30
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	6 Oct 2005 06:40:18 -0000	1.31
@@ -391,7 +391,7 @@
         Activity nextActivity = learnerProgress.getNextActivity();
         try
         {
-            for(Iterator i = nextActivity.getAllToolActivitiesFrom(nextActivity).iterator();i.hasNext();)
+            for(Iterator i = nextActivity.getAllToolActivities().iterator();i.hasNext();)
             {
                 ToolActivity toolActivity = (ToolActivity)i.next();
                 if(shouldCreateToolSession(learnerProgress,toolActivity))
Index: lams_learning/test/java/log4j.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/Attic/log4j.properties,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/log4j.properties	22 Feb 2005 06:50:01 -0000	1.1
+++ lams_learning/test/java/log4j.properties	6 Oct 2005 06:40:18 -0000	1.2
@@ -1,4 +1,4 @@
-log4j.rootLogger=INFO,stdout
+log4j.rootLogger=ERROR,stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n
\ No newline at end of file
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/Attic/TestExportPortfolioService.java,v
diff -u -r1.1 -r1.2
--- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	14 Sep 2005 01:01:20 -0000	1.1
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	6 Oct 2005 06:40:18 -0000	1.2
@@ -6,39 +6,25 @@
  */
 package org.lamsfoundation.lams.learning.export.service;
 
+import java.util.Iterator;
+import java.util.Vector;
+
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
-import org.lamsfoundation.lams.learning.export.Portfolio;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO;
-
-import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.test.AbstractLamsTestCase;
 import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Vector;
-import java.util.SortedSet;
-import org.lamsfoundation.lams.learningdesign.ComplexActivity;
-import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator;
-import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO;
-import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
-import org.lamsfoundation.lams.learningdesign.SimpleActivity;
-import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
 
 
 /**
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/test/web/WEB-INF/web.xml	8 Mar 2005 07:06:40 -0000	1.1
+++ lams_learning/test/web/WEB-INF/web.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -59,7 +59,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
Index: lams_learning/test/web/WEB-INF/spring/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/spring/Attic/applicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/test/web/WEB-INF/spring/applicationContext.xml	4 Apr 2005 13:25:55 -0000	1.4
+++ lams_learning/test/web/WEB-INF/spring/applicationContext.xml	6 Oct 2005 06:40:18 -0000	1.5
@@ -34,7 +34,7 @@
 
 
 	<!-- Hibernate SessionFactory -->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>
Index: lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/spring/Attic/dataAccessContext.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml	8 Mar 2005 07:06:39 -0000	1.1
+++ lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml	6 Oct 2005 06:40:18 -0000	1.2
@@ -35,7 +35,7 @@
 	</bean>
 
 	<!-- Hibernate SessionFactory -->
-	<!-- bean id="sessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<!-- bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>