Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/web/WEB-INF/web.xml	28 Jan 2005 02:38:37 -0000	1.3
+++ lams_learning/web/WEB-INF/web.xml	30 Jan 2005 22:57:18 -0000	1.4
@@ -14,20 +14,42 @@
 	</param-value>
 </context-param>
 
-    <!--
-    To use non XDoclet filters, create a filters.xml file that
-    contains the additional filters (eg Sitemesh) and place it in your
-    project's merge dir.  Don't include filter-mappings in this file,
-    include them in a file called filter-mappings.xml and put that in
-    the same directory.
-    -->
+<!-- The hibernate filter configuration -->
+<!-- context-param>
+	<param-name>HIBERNATE_FILTER_SESSION_FACTORY_JNDI</param-name>
+	<param-value>java:comp/env/hibernate/SessionFactory</param-value>
+</context-param>
+<context-param>
+	<param-name>HIBERNATE_FILTER_REQUEST_ATTRIBUTE_ID</param-name>
+	<param-value>HibernateSession</param-value>
+</context-param>
+<context-param>
+	<param-name>HIBERNATE_FILTER_USE_PROXY</param-name>
+	<param-value>true</param-value>
+</context-param-->
 
-    <!--
-    To use non XDoclet filter-mappings, create a filter-mappings.xml file that
-    contains the additional filter-mappings and place it in your
-    project's merge dir.
-    -->
+<filter>
+	<filter-name>HibernateFilter</filter-name>
+	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<init-param>
+		<param-name>sessionFactoryBeanName</param-name>
+		<param-value>coreSessionFactory</param-value>
+	</init-param>
+	<init-param>
+		<param-name>singleSession</param-name>
+		<param-value>false</param-value>
+	</init-param>
+</filter>
 
+<filter-mapping>
+	<filter-name>HibernateFilter</filter-name>
+	<url-pattern>*.do</url-pattern>
+</filter-mapping>
+<filter-mapping>
+	<filter-name>HibernateFilter</filter-name>
+	<url-pattern>*.jsp</url-pattern>
+</filter-mapping>
+
     <!--
     To use non XDoclet listeners, create a listeners.xml file that
     contains the additional listeners and place it in your
Index: lams_learning/web/WEB-INF/spring/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/applicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/web/WEB-INF/spring/applicationContext.xml	28 Jan 2005 02:38:27 -0000	1.1
+++ lams_learning/web/WEB-INF/spring/applicationContext.xml	30 Jan 2005 22:57:01 -0000	1.2
@@ -39,35 +39,36 @@
 		<property name="mappingResources">
 			<list>
 				<!-- usermanagement related mapping files -->	
-				<value>com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Organisation.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Role.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/User.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Workspace.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Role.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/User.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml</value>
 				
 				<!-- learning design related mapping files -->
-				<value>com/lamsinternational/lams/learningdesign/Activity.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/Group.hbm.xml</value>				
-				<value>com/lamsinternational/lams/learningdesign/Grouping.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml</value>	
-				<value>com/lamsinternational/lams/learningdesign/Transition.hbm.xml</value>	
+				<value>org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>				
+				<value>org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml</value>	
+				<value>org/lamsfoundation/lams/learningdesign/Transition.hbm.xml</value>	
 				
 				
 				<!-- lesson related mapping files-->
-				<value>com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/Lesson.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
                 <!-- value>com/lamsinternational/lams/lesson/LessonClass.hbm.xml</value-->
 				
 				<!-- Tool related mapping files-->
-				<value>com/lamsinternational/lams/tool/Tool.hbm.xml</value>
-				<value>com/lamsinternational/lams/tool/ToolSession.hbm.xml</value>
-				<value>com/lamsinternational/lams/tool/ToolSessionState.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSessionState.hbm.xml</value>
 			</list>
 		</property>
 		<property name="hibernateProperties">
@@ -94,7 +95,7 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 
 	<!-- LAMS primary business object: Hibernate implementation -->
-	<bean id="userManagementServiceTarget" class="com.lamsinternational.lams.usermanagement.service.UserManagementService"
+	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
 		singleton="false"
 	>
 		<property name="userDAO"><ref local="userDAO"/></property>
@@ -122,79 +123,36 @@
 		</property>
 	</bean>
 	
-	<bean id="userDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.UserDAO">
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="roleDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.RoleDAO">
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 	
-	<bean id="organisationDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationDAO">
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="organisationTypeDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="authenticationMethodDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
+	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="userOrganisationDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="userOrganisationRoleDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
+	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<!-- Learning Design related beans-->
-	
-	<bean id="activityDAO" class="com.lamsinternational.lams.learningdesign.dao.hibernate.ActivityDAO">
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
-	<bean id="learningLibraryDAO" class="com.lamsinternational.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningDesignDAO" class="com.lamsinternational.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="groupDAO" class="com.lamsinternational.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="groupingDAO" class="com.lamsinternational.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="lessonDAO" class="com.lamsinternational.lams.lesson.dao.hibernate.LessonDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
 
-
-	<!-- bean id="lessonTarget" class="com.lamsinternational.lams.lesson.Lesson">
-	</bean>
-	
-	
-	<bean id="hibernateInterceptor" class="org.springframework.orm.hibernate.HibernateInterceptor">
-		<property name="sessionFactory">
-			<ref bean="coreSessionFactory"/>
-		</property>
-	</bean>
-	<bean id="hibernateInterceptorCreator"  class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator">
-		<property name="proxyTargetClass">
-			<value>true</value>
-		</property>
-		<property name="interceptorNames">
-			<list>
-				<value>hibernateInterceptor</value>
-			</list>
-		</property>
-		<property name="beanNames">
-			<list>
-				<value>lessonTarget</value>
-			</list>
-		</property>
-	</bean-->
-
 </beans>
Index: lams_learning/web/WEB-INF/spring/dataAccessContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/dataAccessContext.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/web/WEB-INF/spring/dataAccessContext.xml	28 Jan 2005 02:38:27 -0000	1.1
+++ lams_learning/web/WEB-INF/spring/dataAccessContext.xml	30 Jan 2005 22:57:01 -0000	1.2
@@ -67,7 +67,7 @@
 
 	<!-- ========================= DAO DEFINITIONS ========================= -->
 
-	<!-- bean id="surveyContentDAO" class="com.lamsinternational.lams.tool.survey.dao.hibernate.SurveyContentDAO">
+	<!-- bean id="surveyContentDAO" class="org.lamsfoundation.lams.tool.survey.dao.hibernate.SurveyContentDAO">
 		<property name="sessionFactory"><ref local="sessionFactory"/></property>
 	</bean-->