Index: lams_learning/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/servlets.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/conf/xdoclet/servlets.xml	21 Jan 2005 04:28:19 -0000	1.1
+++ lams_learning/conf/xdoclet/servlets.xml	28 Jan 2005 02:36:25 -0000	1.2
@@ -11,11 +11,11 @@
 	  - This means that its beans are automatically available in these child contexts,
 	  - both for getBean(name) calls and (external) bean references.
 		-->
-	<!-- servlet>
+	<servlet>
 		<servlet-name>context</servlet-name>
 		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
-	</servlet-->
+	</servlet>
 	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
Index: lams_learning/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-message-resources.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/struts-message-resources.xml	24 Jan 2005 00:36:05 -0000	1.2
+++ lams_learning/conf/xdoclet/struts-message-resources.xml	28 Jan 2005 02:36:25 -0000	1.3
@@ -1,2 +1,2 @@
 
-<message-resources parameter="com.lamsinternational.lams.learning.LearningResources" />
+<message-resources parameter="org.lamsfoundation.lams.learning.LearningResources" />
Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/web-settings.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/conf/xdoclet/web-settings.xml	24 Jan 2005 00:36:05 -0000	1.2
+++ lams_learning/conf/xdoclet/web-settings.xml	28 Jan 2005 02:36:25 -0000	1.3
@@ -1,4 +1,10 @@
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>com.lamsinternational.lams.learning.LearningResources</param-value>
+  	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
+</context-param>
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>
+		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
+	</param-value>
 </context-param>
\ No newline at end of file
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.2 -r1.3
--- lams_learning/web/WEB-INF/web.xml	21 Jan 2005 04:29:57 -0000	1.2
+++ lams_learning/web/WEB-INF/web.xml	28 Jan 2005 02:38:37 -0000	1.3
@@ -3,6 +3,16 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app >
+ <context-param>
+  	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+  	<param-value>org.lamsfoundation.lams.learning.LearningResources</param-value>
+</context-param>
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>
+		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
+	</param-value>
+</context-param>
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
@@ -37,11 +47,11 @@
 	  - This means that its beans are automatically available in these child contexts,
 	  - both for getBean(name) calls and (external) bean references.
 		-->
-	<!-- servlet>
+	<servlet>
 		<servlet-name>context</servlet-name>
 		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
-	</servlet-->
+	</servlet>
 	<servlet>
 	    <servlet-name>action</servlet-name>
 	    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/WEB-INF/spring/applicationContext.xml	28 Jan 2005 02:38:27 -0000	1.1
@@ -0,0 +1,200 @@
+<?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.
+-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
+	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
+	<!-- 
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location"><value>/WEB-INF/dbConnection.properties</value></property>
+	</bean>
+	-->
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>messages</value></property>										
+	</bean>
+
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+  
+	<!-- Local DataSource that works in any environment -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+		<property name="url"><value>jdbc:mysql://localhost/lams</value></property>
+		<property name="username"><value>lams</value></property>
+		<property name="password"><value>lamsdemo</value></property>
+	</bean>
+
+
+
+	<!-- Hibernate SessionFactory -->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref local="dataSource"/></property>
+		<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>
+				
+				<!-- 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>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>com/lamsinternational/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>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
+				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.c3p0.minPoolSize">5</prop>
+				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
+				<prop key="hibernate.c3p0.timeout">1800</prop>
+				<prop key="hibernate.c3p0.max_statement">50</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
+	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
+	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
+	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+
+	<!-- LAMS primary business object: Hibernate implementation -->
+	<bean id="userManagementServiceTarget" class="com.lamsinternational.lams.usermanagement.service.UserManagementService"
+		singleton="false"
+	>
+		<property name="userDAO"><ref local="userDAO"/></property>
+		<property name="roleDAO"><ref local="roleDAO"/></property>
+		<property name="organisationDAO"><ref local="organisationDAO"/></property>
+		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
+		<property name="userOrganisationDAO"><ref local="userOrganisationDAO"/></property>
+		<property name="userOrganisationRoleDAO"><ref local="userOrganisationRoleDAO"/></property>
+		<property name="authenticationMethodDAO"><ref local="authenticationMethodDAO"/></property>
+	</bean>	
+	
+	<!-- Transactional proxy for the user management primary business object -->
+	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref local="transactionManager"/></property>
+		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="userDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="roleDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="organisationTypeDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="authenticationMethodDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationRoleDAO" class="com.lamsinternational.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">
+		<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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/WEB-INF/spring/dataAccessContext.xml	28 Jan 2005 02:38:27 -0000	1.1
@@ -0,0 +1,74 @@
+<?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 data access layer.
+	- Accessed by business layer objects defined in "applicationContext.xml"
+	- (see web.xml's "contextConfigLocation").
+	-
+	- This version of the data access layer utilizing the hibernate framework.
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
+	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
+	
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location"><value>/WEB-INF/spring/dbConnection.properties</value></property>
+	</bean>
+
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>messages</value></property>										
+	</bean>
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+  
+	<!-- Local DataSource that works in any environment -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>${jdbc.driverClassName}</value></property>
+		<property name="url"><value>${jdbc.url}</value></property>
+		<property name="username"><value>${jdbc.username}</value></property>
+		<property name="password"><value>${jdbc.password}</value></property>
+	</bean>
+
+	<!-- Hibernate SessionFactory -->
+	<!-- bean id="sessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref local="dataSource"/></property>
+		<property name="mappingResources">
+			<list>	
+				<value>SurveyAnsContent.hbm.xml</value>
+				<value>SurveyContent.hbm.xml</value>
+				<value>SurveyQueContent.hbm.xml</value>
+				<value>SurveyQueType.hbm.xml</value>
+				<value>SurveyQueUsr.hbm.xml</value>
+				<value>SurveySession.hbm.xml</value>
+				<value>SurveyUsrResp.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
+				<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
+				<prop key="hibernate.c3p0.minPoolSize">${hibernate.c3p0.minPoolSize}</prop>
+				<prop key="hibernate.c3p0.maxPoolSize">${hibernate.c3p0.maxPoolSize}</prop>
+				<prop key="hibernate.c3p0.timeout">${hibernate.c3p0.timeout}</prop>
+				<prop key="hibernate.c3p0.max_statement">${hibernate.c3p0.max_statement}</prop>
+			</props>
+		</property>
+	</bean-->
+
+	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
+	<!-- bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+	</bean-->
+
+	<!-- ========================= DAO DEFINITIONS ========================= -->
+
+	<!-- bean id="surveyContentDAO" class="com.lamsinternational.lams.tool.survey.dao.hibernate.SurveyContentDAO">
+		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+	</bean-->
+	
+</beans>
Index: lams_learning/web/WEB-INF/spring/dbConnection.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/dbConnection.properties,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/WEB-INF/spring/dbConnection.properties	28 Jan 2005 02:38:27 -0000	1.1
@@ -0,0 +1,19 @@
+# Properties file with Hibernate-related settings.
+# Applied by PropertyPlaceholderConfigurer from "dbConnection.xml".
+# Targetted at system administrators, to avoid touching the context XML files.
+
+#jdbc configuration
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost/lams
+jdbc.username=lams
+jdbc.password=lamsdemo
+
+#Hibernate configuration
+hibernate.show_sql=false
+hibernate.dialect=net.sf.hibernate.dialect.MySQLDialect
+
+#Connection Pooling configuration
+hibernate.c3p0.minPoolSize=5
+hibernate.c3p0.maxPoolSize=20
+hibernate.c3p0.timeout=1800
+hibernate.c3p0.max_statement=50
\ No newline at end of file
Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	28 Jan 2005 02:38:27 -0000	1.1
@@ -0,0 +1,19 @@
+<?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="learnerService" class="org.lamsfoundation.lams.learning.service.TestLearnerService" singleton="false">
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+	</bean>
+
+
+</beans>
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/web/WEB-INF/struts/struts-config.xml	21 Jan 2005 04:29:57 -0000	1.2
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	28 Jan 2005 02:38:37 -0000	1.3
@@ -14,12 +14,16 @@
   <form-beans>
 
     <form-bean
+      name="testForm"
+      type="org.lamsfoundation.lams.learning.web.form.TestForm"
+    />
+    <form-bean
       name="activityForm"
-      type="com.lamsinternational.lams.learning.web.form.ActivityForm"
+      type="org.lamsfoundation.lams.learning.web.form.ActivityForm"
     />
     <form-bean
       name="optionsActivityForm"
-      type="com.lamsinternational.lams.learning.web.form.OptionsActivityForm"
+      type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
 
   </form-beans>
@@ -39,8 +43,46 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
+      path="/DisplayParallelActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivity"
+      name="activityForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayParallel"
+        path=".parallelActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivity"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/test"
+      type="org.lamsfoundation.lams.learning.web.action.TestAction"
+      name="testForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+    </action>
+    <action
       path="/Activity"
-      type="com.lamsinternational.lams.learning.web.action.ActivityAction"
+      type="org.lamsfoundation.lams.learning.web.action.ActivityAction"
       name="activityForm"
       scope="request"
       parameter="method"
@@ -84,23 +126,8 @@
       />
     </action>
     <action
-      path="/DisplayOptionsActivity"
-      type="com.lamsinternational.lams.learning.web.action.DisplayOptionsActivity"
-      name="optionsActivityForm"
-      scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayOptions"
-        path=".optionsActivity"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/DisplayToolActivity"
-      type="com.lamsinternational.lams.learning.web.action.DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivity"
       name="activityForm"
       scope="request"
       unknown="false"
@@ -112,26 +139,14 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/DisplayParallelActivity"
-      type="com.lamsinternational.lams.learning.web.action.DisplayParallelActivity"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayParallel"
-        path=".parallelActivity"
-        redirect="false"
-      />
-    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
+<message-resources parameter="org.lamsfoundation.lams.learning.LearningResources" />
+
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
 	<set-property property="definitions-config" value="/WEB-INF/struts/tiles-defs.xml" />
 	<set-property property="definitions-debug" value="0" />