Index: lams_learning/build.xml
===================================================================
diff -u -r9aa9eb822fb75b149b6fb61efd65560352551283 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/build.xml	(.../build.xml)	(revision 9aa9eb822fb75b149b6fb61efd65560352551283)
+++ lams_learning/build.xml	(.../build.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml	(.../SurveyAnsContent.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyAnsContent.hbm.xml	(.../SurveyAnsContent.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml	(.../SurveyContent.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyContent.hbm.xml	(.../SurveyContent.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml	(.../SurveyQueContent.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueContent.hbm.xml	(.../SurveyQueContent.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml	(.../SurveyQueType.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueType.hbm.xml	(.../SurveyQueType.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml	(.../SurveyQueUsr.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyQueUsr.hbm.xml	(.../SurveyQueUsr.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveySession.hbm.xml	(.../SurveySession.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml	(.../SurveyUsrResp.hbm.xml)	(revision f73c3d7878d6f6c013a43da96353e4e0983e1a61)
+++ lams_learning/conf/hibernate/mapping/org/lamsfoundation/lams/tool/survey/SurveyUsrResp.hbm.xml	(.../SurveyUsrResp.hbm.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -r2be42c6e48f5cdb13f0e6634b52d36ac732eca09 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 2be42c6e48f5cdb13f0e6634b52d36ac732eca09)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -r0e9942a1cb3517b16f9cf75267fbea94371b621f -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/test/java/log4j.properties	(.../log4j.properties)	(revision 0e9942a1cb3517b16f9cf75267fbea94371b621f)
+++ lams_learning/test/java/log4j.properties	(.../log4j.properties)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -r061c77c2133855802b7f3f8ca7b0b53b51d898c2 -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision 061c77c2133855802b7f3f8ca7b0b53b51d898c2)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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/spring/applicationContext.xml
===================================================================
diff -u -r1ac030743cfd5c1a1479311197a02821dbc85cbc -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/test/web/WEB-INF/spring/applicationContext.xml	(.../applicationContext.xml)	(revision 1ac030743cfd5c1a1479311197a02821dbc85cbc)
+++ lams_learning/test/web/WEB-INF/spring/applicationContext.xml	(.../applicationContext.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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
===================================================================
diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml	(.../dataAccessContext.xml)	(revision 47a0b22c0f3ff85ed2d419ad50912025d55c9cfa)
+++ lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml	(.../dataAccessContext.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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>	
Index: lams_learning/test/web/WEB-INF/web.xml
===================================================================
diff -u -r47a0b22c0f3ff85ed2d419ad50912025d55c9cfa -r7f80ba8587932005ce6285ea17c4f91f94b6e02c
--- lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 47a0b22c0f3ff85ed2d419ad50912025d55c9cfa)
+++ lams_learning/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c)
@@ -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>