Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.24 -r1.25
--- lams_common/build.xml	9 May 2005 09:36:26 -0000	1.24
+++ lams_common/build.xml	11 May 2005 00:00:41 -0000	1.25
@@ -12,18 +12,21 @@
 
 	<!-- import properties from the specified file -->
 	&properties;
-
+	
 	<path id="all-libs">
 		<fileset dir="${lib}">
 			<include name="**/*.jar"/>
 		</fileset>
+		<fileset dir="${j2eelibs}">
+				<include name="**/*.jar"/>
+		</fileset>
 	</path>
-
+	
 	<path id="project.classpath">
 		<path refid="all-libs"/>
 		<!-- Java CLASSPATH should be added as the last item -->
 		<!-- This property is supposed to be set in eclipse  -->
-		<pathelement location="${java.class.path}" />
+		<pathelement location="${java.class.path}"/>
 	</path>
 
 	<target name="usage">
@@ -176,9 +179,17 @@
 		<javac srcdir="${src.java}" compiler="modern"
 	         	 	destdir="${build.classes}" deprecation="on" debug="on">
 			<classpath>
+				<pathelement location="${build.classes}"/>
 				<path refid="project.classpath"/>
 			</classpath>
 		</javac>
+		<!-- Spring files -->
+		<copy overwrite="yes" todir="${build.classes}/org/lamsfoundation/lams/">
+				<fileset dir="${src.java}/org/lamsfoundation/lams">
+						<include name="*.xml"/>
+						<include name="*.properties"/>
+				</fileset>
+		</copy>
 	</target>
 
 	<target name="compile.test" depends="compile">
@@ -195,6 +206,17 @@
 			</fileset>
 		</copy>
 	</target>
+				
+	<target name="copyContext">
+		<deltree dir="${build.web}"/>
+		<mkdir dir="${build.web}"/>
+		<!--copy overwrite="yes" todir="${build.web}">
+			<fileset dir="${web}">
+				<include name="**/*.xml"/>
+				<include name="**/*.tld"/>
+			</fileset>
+		</copy-->
+	</target>
         <!-- effectively a synonym for lams-jar 
             required by the master build script
         -->
@@ -203,15 +225,13 @@
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
 	<!-- ================================================================ -->
-	<target name="lams-jar" depends="compile,compile.test" description="creates jar file">
+	<target name="lams-jar" depends="compile,compile.test,copyContext" description="creates jar file">
 		<delete file="${build.lib}/${product}.jar"/>
 		<jar jarfile="${build.lib}/${product}.jar">
-			<fileset dir="${build.classes}">
-			</fileset>
-			<fileset dir="${build.test}">
-			</fileset>			
-			<fileset dir="${hbm}">
-			</fileset>
+			<fileset dir="${build.classes}"/>
+			<fileset dir="${build.test}"/>
+			<fileset dir="${hbm}"/>
+			<fileset dir="${build.web}"/>
 		</jar>
 	</target>
 
Index: lams_common/properties.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/Attic/properties.xml,v
diff -u -r1.15 -r1.16
--- lams_common/properties.xml	9 May 2005 09:36:43 -0000	1.15
+++ lams_common/properties.xml	10 May 2005 23:58:03 -0000	1.16
@@ -13,7 +13,8 @@
 	<property name="xdoclet.version"               value="1.2.2"/>
 	
 	<!-- path properties -->
-	<property name="lib"                       value="${basedir}/lib"/>
+	<property name="lib" value="../lams_build/lib"/>
+	<property name="j2eelibs"  value="C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.1/data/libraryset/1.4"/>
 	<property name="sql"                       value="${basedir}/db/sql"/>
 	<property name="src"                       value="${basedir}/src"/>
 	<property name="src.java"                  value="${basedir}/src/java"/>
@@ -52,7 +53,9 @@
 	<property name="build.test"            value="${build}/test"/>
 	
 	<property name="build.lib"                     value="${build}/lib"/>
+	<property name="build.web"                     value="${build}/web"/>
 	
+	
 	<property name="package"                   value="org/lamsfoundation/lams"/>
 	<property name="package.learningdesign"    value="${package}/learningdesign"/>
 	<property name="package.usermanagement"    value="${package}/usermanagement"/>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	10 May 2005 23:53:31 -0000	1.1
@@ -0,0 +1,201 @@
+<?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?zeroDateTimeBehavior=convertToNull&amp;characterEncoding=utf8</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>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>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>	
+				<value>org/lamsfoundation/lams/learningdesign/License.hbm.xml</value>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
+ 				
+				<!-- Tool related mapping files-->
+				<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>
+				
+				<!-- Workspace related mapping files -->
+				<value>org/lamsfoundation/lams/workspace/WorkspaceFolderContent.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="org.lamsfoundation.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>
+		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
+		<property name="userManagementWorkspaceDAO"><ref bean="userManagementWorkspaceDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></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="proxyTargetClass"><value>true</value></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>
+	
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<!--User management related beans -->
+	
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<bean id="userManagementWorkspaceDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<bean id="workspaceFolderContentDAO" class="org.lamsfoundation.lams.workspace.dao.hibernate.WorkspaceFolderContentDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+</beans>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/WorkspaceFolderContent.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dao/IWorkspaceFolderContentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/exception/WorkspaceFolderException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/TestActivity.java,v
diff -u -r1.7 -r1.8
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	5 May 2005 03:10:09 -0000	1.7
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	10 May 2005 23:53:31 -0000	1.8
@@ -106,7 +106,7 @@
         assertEquals("verify id",TEST_CHILD_QNA_ACTIVITY_ID,child.getActivityId().longValue());
     }
     protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
     /**
      * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestActivityDAO.java,v
diff -u -r1.15 -r1.16
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	13 Apr 2005 23:28:51 -0000	1.15
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	10 May 2005 23:53:30 -0000	1.16
@@ -67,8 +67,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
 	public void testgetActivityByLibraryID(){
 		List activities = activityDAO.getActivitiesByLibraryID(new Long(1));
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestGroupingDAO.java,v
diff -u -r1.6 -r1.7
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	5 May 2005 03:10:15 -0000	1.6
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	10 May 2005 23:53:30 -0000	1.7
@@ -79,8 +79,7 @@
      */
     protected String[] getContextConfigLocation()
     {
-    	return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
     }
 
     public void testGetGrouping()
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningDesignDAO.java,v
diff -u -r1.12 -r1.13
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	5 May 2005 03:10:15 -0000	1.12
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	10 May 2005 23:53:30 -0000	1.13
@@ -55,8 +55,7 @@
 		assertEquals(activity.getActivityId().longValue(),x);
 	}
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
 	public void testGetAllValidLearningDesignsInFolder(){
 		List list = learningDesignDAO.getAllValidLearningDesignsInFolder(new Integer(1));
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningLibraryDAO.java,v
diff -u -r1.9 -r1.10
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	13 Apr 2005 23:28:57 -0000	1.9
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	10 May 2005 23:53:30 -0000	1.10
@@ -42,8 +42,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
 
 	protected String getHibernateSessionFactoryName() {
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestTransitionDAO.java,v
diff -u -r1.11 -r1.12
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	13 Apr 2005 23:28:57 -0000	1.11
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	10 May 2005 23:53:30 -0000	1.12
@@ -40,8 +40,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
 	protected String getHibernateSessionFactoryName() {
 		return "coreSessionFactory";
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/Attic/LessonDataAccessTestCase.java,v
diff -u -r1.21 -r1.22
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	5 May 2005 03:10:26 -0000	1.21
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	10 May 2005 23:54:56 -0000	1.22
@@ -119,9 +119,8 @@
 
     }
     protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/applicationContext.xml",
-							 "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-							 "WEB-INF/spring/learningDesignApplicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml",
+							 "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml"};
 	}
 
     
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/Attic/ToolDataAccessTestCase.java,v
diff -u -r1.13 -r1.14
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	5 May 2005 03:10:31 -0000	1.13
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	10 May 2005 23:54:56 -0000	1.14
@@ -116,8 +116,7 @@
     {
         return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
                 			  "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
-                			  "WEB-INF/spring/learningDesignApplicationContext.xml",
-        					  "WEB-INF/spring/applicationContext.xml"};
+                			  "org/lamsfoundation/lams/applicationContext.xml"};
     }
     
     public void initTestToolSession()
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/Attic/TestUserManagementService.java,v
diff -u -r1.3 -r1.4
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	5 May 2005 03:10:38 -0000	1.3
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	10 May 2005 23:54:56 -0000	1.4
@@ -48,7 +48,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}
 	public void testSaveOrganisation(){
 		Organisation organisation = new Organisation("Test Organisation",
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/OrganisationDAOTest.java,v
diff -u -r1.4 -r1.5
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	13 Apr 2005 23:29:41 -0000	1.4
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	10 May 2005 23:54:56 -0000	1.5
@@ -39,8 +39,7 @@
 		assertNotNull(organisation.getOrganisationId());
 	}
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}	
 	protected String getHibernateSessionFactoryName() {
 		return "coreSessionFactory";
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/OrganisationTypeDAOTest.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	5 May 2005 03:10:38 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	10 May 2005 23:54:56 -0000	1.3
@@ -48,8 +48,7 @@
      */
     protected String[] getContextConfigLocation()
     {
-    	return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
     }
 	public void testGetOrganisationTypeById(){
 		errorMessage = "The name of the organisationType gotten by Id 1 is not ROOT ORGANISATION";
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/RoleDAOTest.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java	5 May 2005 03:10:38 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java	10 May 2005 23:54:56 -0000	1.3
@@ -64,7 +64,6 @@
      */
     protected String[] getContextConfigLocation()
     {
-    	return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
-		 "WEB-INF/spring/applicationContext.xml"};
+    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
     }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/TestWorkspaceDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java	5 May 2005 03:10:38 -0000	1.2
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java	10 May 2005 23:54:56 -0000	1.3
@@ -24,7 +24,7 @@
 		super(name);
 	}
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}	
 	protected String getHibernateSessionFactoryName() {
 		return "coreSessionFactory";
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/Attic/UserDAOTest.java,v
diff -u -r1.5 -r1.6
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	14 Apr 2005 00:32:34 -0000	1.5
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	10 May 2005 23:54:56 -0000	1.6
@@ -61,7 +61,7 @@
 		assertTrue(member);
 	}
 	protected String[] getContextConfigLocation() {
-		return new String[] {"WEB-INF/spring/applicationContext.xml","WEB-INF/spring/learningDesignApplicationContext.xml"};
+		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
 	}	
 	public void testSaveUser(){
 		User user = new User();
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/workspace/dao/TestWorkspaceFolderContentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/web/WEB-INF/Attic/applicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/test/web/WEB-INF/applicationContext.xml	10 May 2005 23:56:20 -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?zeroDateTimeBehavior=convertToNull&amp;characterEncoding=utf8</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>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>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>	
+				<value>org/lamsfoundation/lams/learningdesign/License.hbm.xml</value>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
+ 				
+				<!-- Tool related mapping files-->
+				<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>
+				
+				<!-- Workspace related mapping files -->
+				<value>org/lamsfoundation/lams/workspace/WorkspaceFolderContent.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="org.lamsfoundation.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>
+		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
+		<property name="userManagementWorkspaceDAO"><ref bean="userManagementWorkspaceDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></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="proxyTargetClass"><value>true</value></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>
+	
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<!--User management related beans -->
+	
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<bean id="userManagementWorkspaceDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="workspaceFolderContentDAO" class="org.lamsfoundation.lams.workspace.dao.hibernate.WorkspaceFolderContentDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+</beans>
Index: lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/web/WEB-INF/Attic/learningDesignApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml	10 May 2005 23:56:20 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - LearningDesign Application context definition for LAMS.
+-->
+<beans>
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+	
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+</beans>
Index: lams_common/test/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1 -r1.2
--- lams_common/test/web/WEB-INF/struts-config.xml	9 Feb 2005 00:45:49 -0000	1.1
+++ lams_common/test/web/WEB-INF/struts-config.xml	10 May 2005 23:56:20 -0000	1.2
@@ -1,190 +1,242 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
 
 <struts-config>
 
-	<!-- ========== Data Sources Definitions =================================== -->
-	<!--
-		Define your Struts data sources in a file called struts-data-sources.xml and place
-		it in your merge directory.
-	-->
+  <!-- ========== Data Sources Definitions =================================== -->
+  <!--
+    Define your Struts data sources in a file called struts-data-sources.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Form Bean Definitions =================================== -->
-	<form-beans>
-	
-    <form-bean name="PasswordChangeActionForm"
-               type="org.lamsfoundation.lams.web.PasswordChangeActionForm" />
-    
-    <form-bean name="OrganisationActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.OrganisationActionForm" />
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
 
-    <form-bean name="UserActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UserActionForm" />
-               
-    <form-bean name="UsersAddActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UsersAddActionForm" />
+    <!--
+         If you have non XDoclet forms, define them in a file called struts-forms.xml and
+         place it in your merge directory.
+    -->
+  </form-beans>
 
-    <form-bean name="UsersRemoveActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveActionForm" />
-               
-	</form-beans>
-	<!-- ========== Global Exceptions Definitions =================================== -->
-	<!--
-		Define your exceptions in a file called global-exceptions.xml and place
-		it in your merge directory.
-	-->
+  <!-- ========== Global Exceptions Definitions =================================== -->
+  <!--
+    Define your exceptions in a file called global-exceptions.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Global Forward Definitions =================================== -->
-	<!--
-		Define your forwards in a file called global-forwards.xml and place
-		it in your merge directory.
-	-->
-	<global-forwards>
-		<forward name="error" path=".error"/>
-	</global-forwards>
+  <!-- ========== Global Forward Definitions =================================== -->
+  <!--
+    Define your forwards in a file called global-forwards.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Action Mapping Definitions =================================== -->
-	<action-mappings>
+  <!-- ========== Action Mapping Definitions =================================== -->
+   <action-mappings>
+    <action
+      path="/user"
+      type="org.lamsfoundation.lams.usermanagement.web.UserAction"
+      name="UserActionForm"
+      scope="session"
+      input=".admin.user"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
+      scope="request"
+      input=".passwordChange"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="okay"
+        path=".passwordChangeOk"
+        redirect="false"
+      />
+      <forward
+        name="cancelled"
+        path="/index.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin"
+      type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="organisation"
+        path=".admin.organisation"
+        redirect="false"
+      />
+      <forward
+        name="user"
+        path=".admin.user"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="usersremove"
+        path=".admin.usersremove"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/usersadd"
+      type="org.lamsfoundation.lams.usermanagement.web.UsersAddAction"
+      name="UsersAddActionForm"
+      scope="session"
+      input=".admin.usersadd"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="usersremove"
+      type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveAction"
+      name="UsersRemoveActionForm"
+      scope="session"
+      input=".admin.usersremove"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin/organisation"
+      type="org.lamsfoundation.lams.usermanagement.web.OrganisationAction"
+      name="OrganisationActionForm"
+      scope="session"
+      input=".admin.organisation"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="learner"
+        path="/learner.jsp"
+        redirect="false"
+      />
+      <forward
+        name="author"
+        path="/author.jsp"
+        redirect="false"
+      />
+      <forward
+        name="staff"
+        path="/staff.jsp"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+      <forward
+        name="passwordChange"
+        path=".passwordChange"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      name="WorkspaceAction"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/index.jsp"
+        redirect="false"
+      />
+    </action>
 
-    <action path="/home"
-            type="org.lamsfoundation.lams.web.HomeAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="staff"
-               path="/staff.jsp">
-      </forward>
-      <forward name="author"
-               path="/author.jsp">
-      </forward>
-      <forward name="learner"
-               path="/learner.jsp">
-      </forward>
-      <forward name="passwordChange"
-               path=".passwordChange">
-      </forward>
-	</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>
 
-    <action path="/admin"
-            type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="organisation"
-               path=".admin.organisation">
-      </forward>
-      <forward name="user"
-               path=".admin.user">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="usersremove"
-               path=".admin.usersremove">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-    <action path="/organisation"
-            type="org.lamsfoundation.lams.usermanagement.web.OrganisationAction"
-            name="OrganisationActionForm"
-            scope="session"
-            input=".admin.organisation"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts message-resources in a file called struts-message-resources.xml and place it in your merge directory. -->
 
-    <action path="/user"
-            type="org.lamsfoundation.lams.usermanagement.web.UserAction"
-            name="UserActionForm"
-            scope="session"
-            input=".admin.user"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
 
-    <action path="/usersadd"
-            type="org.lamsfoundation.lams.usermanagement.web.UsersAddAction"
-            name="UsersAddActionForm"
-            scope="session"
-            input=".admin.usersadd"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
-
-    <action path="/usersremove"
-            type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveAction"
-            name="UsersRemoveActionForm"
-            scope="session"
-            input=".admin.usersremove"
-            validate="false">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
-
-
-    <action path="/passwordChanged"
-            type="org.lamsfoundation.lams.web.PasswordChangeAction"
-            name="PasswordChangeActionForm"
-            scope="session"
-            input=".passwordChange"
-            validate="true">
-      <forward name="okay"
-               path=".passwordChangeOk">
-      </forward>
-      <forward name="cancelled"
-               path="/index.jsp">
-      </forward>
-	</action>
-	
-	<action path="/passwordChangeOk"
-			parameter="/index.jsp"
-			type="org.apache.struts.actions.ForwardAction"
-			scope="request"
-			validate="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.application" />
-
-	<!-- ===================== Plugin Definition  ======================== -->
-	<plug-in className="org.apache.struts.tiles.TilesPlugin">
-		<set-property property="definitions-config"
-			value="/WEB-INF/tiles/tiles-defs.xml" />
-		<set-property property="definitions-debug" value="0" />
-		<set-property property="definitions-parser-details" value="0" />
-		<set-property property="definitions-parser-validate" value="true" />
-	</plug-in>
-
-
-</struts-config>
\ No newline at end of file
+</struts-config>
Index: lams_common/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.1 -r1.2
--- lams_common/test/web/WEB-INF/web.xml	9 Feb 2005 00:45:49 -0000	1.1
+++ lams_common/test/web/WEB-INF/web.xml	10 May 2005 23:56:20 -0000	1.2
@@ -1,241 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!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>
+<web-app >
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<!--
-		To use non XDoclet filters, create a filters.xml file that
-		contains the additional filters (eg Sitemesh) and place it in your
-		projects 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.
-	-->
-	
-	<display-name>LAMS</display-name>
+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.
 
-	<description>Learning Acitivity Management System</description>
-	
-	<!--
-	  - Location of the Log4J config file, for initialization and refresh checks.
-	  - Applied by Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.xml</param-value>
-	</context-param>
+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.
 
-	<!--
-	  - Location of the XML file that defines the root application context.
-	  - Applied by ContextLoaderServlet.
-	-->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/applicationContext.xml
-		</param-value>
-	</context-param>
+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
 
-   <listener>
-      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
-   </listener>
+http://www.gnu.org/licenses/gpl.txt
+-->
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>/WEB-INF/spring/applicationContext.xml		  
+	/WEB-INF/spring/learningDesignApplicationContext.xml		  
+	/WEB-INF/spring/workspaceApplicationContext.xml 
+	</param-value>
+</context-param>
 
-	<!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-		-->
-	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
+    <!--
+    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.
+    -->
 
-	<!--
-	  - Struts servlet that dispatches requests to registered actions.
-		- Reads its configuration from "struts-config.xml".
-		-
-		- A web app can just contain one such servlet.
-		- If you need multiple namespaces, use Struts' module mechanism.
+    <!--
+    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.
     -->
-	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>
-			org.apache.struts.action.ActionServlet
-		</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>webauthservlet</servlet-name>
-		<servlet-class>
-			org.lamsfoundation.lams.security.WebAuthServlet
-		</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
 
-	
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
 
-	<!--
-		- Dispatcher servlet mapping for the main web user interface.
-	-->
-	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-		<url-pattern>*.do</url-pattern>
-	</servlet-mapping>
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<servlet-mapping>
-		<servlet-name>webauthservlet</servlet-name>
-		<url-pattern>/webauth</url-pattern>
-	</servlet-mapping>
+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.
 
-	<session-config>
-		<session-timeout>3600</session-timeout>
-	</session-config>
-	
-	<mime-mapping>
-		<extension>csv</extension>
-		<mime-type>text/plain</mime-type>
-	</mime-mapping>
-	
-	<mime-mapping>
-		<extension>pdf</extension>
-		<mime-type>application/pdf</mime-type>
-	</mime-mapping>
+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.
 
-	<!--
-		To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-		Organize error-pages.xml following this DTD slice:
-		
-		<!ELEMENT error-page ((error-code | exception-type), location)>
-	-->
+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
 
-	<!-- Struts Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-nested.tld
-		</taglib-location>
-	</taglib>
-	
-	<!-- JSTL Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
-	</taglib>
-	
-	<!--Tomcat security config-->
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>*.jsp</url-pattern>
-			<url-pattern>*.html</url-pattern>
-		</web-resource-collection>
+http://www.gnu.org/licenses/gpl.txt
+-->
 
-		<auth-constraint>
-			<role-name>*</role-name>
-		</auth-constraint>
+<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-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>999</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>validate</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+</servlet>
 
-	</security-constraint>
-	
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>lams</realm-name>
-		<form-login-config>
-			<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/login.jsp?failed=y</form-error-page>
-		</form-login-config>
-	</login-config>
+  <!--
+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
+-->
+
+<servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
+
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+  <!--
+  To add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
+
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
 </web-app>
Index: lams_common/test/web/WEB-INF/workspaceApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/web/WEB-INF/Attic/workspaceApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/test/web/WEB-INF/workspaceApplicationContext.xml	10 May 2005 23:56:20 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+	
+	<bean id="workspaceServiceTarget" class="org.lamsfoundation.lams.workspace.service.WorkspaceManagementService">
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="userDAO"><ref bean="userDAO"/></property>
+		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
+		<property name="workspaceDAO"><ref bean="userManagementWorkspaceDAO"/></property>
+		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
+		<property name="authoringService"><ref bean="authoringService"/></property>
+		<property name="workspaceFolderContentDAO"><ref bean="workspaceFolderContentDAO"/></property>
+	</bean>
+	
+	<bean id="workspaceManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="workspaceServiceTarget"/></property>
+		
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="store*">PROPAGATION_REQUIRED</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED</prop>				
+			</props>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
Index: lams_common/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/Attic/web.xml,v
diff -u -r1.8 -r1.9
--- lams_common/web/WEB-INF/web.xml	28 Jan 2005 04:21:09 -0000	1.8
+++ lams_common/web/WEB-INF/web.xml	10 May 2005 23:56:34 -0000	1.9
@@ -1,241 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!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>
+<web-app >
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<!--
-		To use non XDoclet filters, create a filters.xml file that
-		contains the additional filters (eg Sitemesh) and place it in your
-		projects 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.
-	-->
-	
-	<display-name>LAMS</display-name>
+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.
 
-	<description>Learning Acitivity Management System</description>
-	
-	<!--
-	  - Location of the Log4J config file, for initialization and refresh checks.
-	  - Applied by Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.xml</param-value>
-	</context-param>
+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.
 
-	<!--
-	  - Location of the XML file that defines the root application context.
-	  - Applied by ContextLoaderServlet.
-	-->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			/WEB-INF/applicationContext.xml
-		</param-value>
-	</context-param>
+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
 
-   <listener>
-      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
-   </listener>
+http://www.gnu.org/licenses/gpl.txt
+-->
+<context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>/WEB-INF/spring/applicationContext.xml		  
+	/WEB-INF/spring/learningDesignApplicationContext.xml		  
+	/WEB-INF/spring/workspaceApplicationContext.xml 
+	</param-value>
+</context-param>
 
-	<!--
-	  - Loads the root application context of this web app at startup,
-	  - by default from "/WEB-INF/applicationContext.xml".
-		- Note that it is preferable to use ContextLoaderListener in a servlet container
-		- that follows the Servlet 2.4 initialization order (most Servlet 2.3 containers do).
-		-
-	  - Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-	  - to access it anywhere in the web application, outside of the framework.
-	  -
-	  - The root context is the parent of all servlet-specific contexts.
-	  - This means that its beans are automatically available in these child contexts,
-	  - both for getBean(name) calls and (external) bean references.
-		-->
-	<servlet>
-		<servlet-name>context</servlet-name>
-		<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
+    <!--
+    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.
+    -->
 
-	<!--
-	  - Struts servlet that dispatches requests to registered actions.
-		- Reads its configuration from "struts-config.xml".
-		-
-		- A web app can just contain one such servlet.
-		- If you need multiple namespaces, use Struts' module mechanism.
+    <!--
+    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.
     -->
-	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>
-			org.apache.struts.action.ActionServlet
-		</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>webauthservlet</servlet-name>
-		<servlet-class>
-			org.lamsfoundation.lams.security.WebAuthServlet
-		</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
 
-	
+    <!--
+    To use non XDoclet listeners, create a listeners.xml file that
+    contains the additional listeners and place it in your
+    project's merge dir.
+    -->
 
-	<!--
-		- Dispatcher servlet mapping for the main web user interface.
-	-->
-	<servlet-mapping>
-		<servlet-name>action</servlet-name>
-		<url-pattern>*.do</url-pattern>
-	</servlet-mapping>
+ <!--
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
-	<servlet-mapping>
-		<servlet-name>webauthservlet</servlet-name>
-		<url-pattern>/webauth</url-pattern>
-	</servlet-mapping>
+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.
 
-	<session-config>
-		<session-timeout>3600</session-timeout>
-	</session-config>
-	
-	<mime-mapping>
-		<extension>csv</extension>
-		<mime-type>text/plain</mime-type>
-	</mime-mapping>
-	
-	<mime-mapping>
-		<extension>pdf</extension>
-		<mime-type>application/pdf</mime-type>
-	</mime-mapping>
+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.
 
-	<!--
-		To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
-		Organize error-pages.xml following this DTD slice:
-		
-		<!ELEMENT error-page ((error-code | exception-type), location)>
-	-->
+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
 
-	<!-- Struts Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-bean-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-bean-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-logic-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-logic-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-html-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-html-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-tiles-el.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-tiles-el.tld
-		</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri>
-		<taglib-location>
-			/WEB-INF/struts/struts-nested.tld
-		</taglib-location>
-	</taglib>
-	
-	<!-- JSTL Tag Library Defintions -->
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/core_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/c-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/fmt_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/fmt-rt.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>http://java.sun.com/jstl/xml_rt</taglib-uri>
-		<taglib-location>/WEB-INF/jstl/x-rt.tld</taglib-location>
-	</taglib>
-	
-	<!--Tomcat security config-->
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Secure Content</web-resource-name>
-			<url-pattern>*.jsp</url-pattern>
-			<url-pattern>*.html</url-pattern>
-		</web-resource-collection>
+http://www.gnu.org/licenses/gpl.txt
+-->
 
-		<auth-constraint>
-			<role-name>*</role-name>
-		</auth-constraint>
+<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-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>999</param-value>
+    </init-param>
+    <init-param>
+      <param-name>detail</param-name>
+      <param-value>2</param-value>
+    </init-param>
+    <init-param>
+      <param-name>validate</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+</servlet>
 
-	</security-constraint>
-	
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>lams</realm-name>
-		<form-login-config>
-			<form-login-page>/login.jsp</form-login-page>
-			<form-error-page>/login.jsp?failed=y</form-error-page>
-		</form-login-config>
-	</login-config>
+  <!--
+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
+-->
+
+<servlet-mapping>
+	<servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+</servlet-mapping>
+
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
+   <!--
+   To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
+   Organize mime-mappings.xml following this DTD slice:
+
+   <!ELEMENT mime-mapping (extension, mime-type)>
+   -->
+
+   <!--
+   To specify error pages, create a file named error-pages.xml, put it in your project's mergedir.
+   Organize error-pages.xml following this DTD slice:
+
+   <!ELEMENT error-page ((error-code | exception-type), location)>
+   -->
+
+  <!--
+  To add taglibs by xml, create a file called taglibs.xml and place it
+  in your merge dir.
+  -->
+
+   <!--
+   To set up security settings for your web app, create a file named web-security.xml, put it in your project's mergedir.
+   Organize web-security.xml following this DTD slice:
+
+   <!ELEMENT security-constraint (display-name?, web-resource-collection+, auth-constraint?, user-data-constraint?)>
+   <!ELEMENT web-resource-collection (web-resource-name, description?, url-pattern*, http-method*)>
+   <!ELEMENT web-resource-name (#PCDATA)>
+   <!ELEMENT url-pattern (#PCDATA)>
+   <!ELEMENT http-method (#PCDATA)>
+   <!ELEMENT user-data-constraint (description?, transport-guarantee)>
+   <!ELEMENT transport-guarantee (#PCDATA)>
+
+   <!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
+   <!ELEMENT auth-method (#PCDATA)>
+   <!ELEMENT realm-name (#PCDATA)>
+   <!ELEMENT form-login-config (form-login-page, form-error-page)>
+   <!ELEMENT form-login-page (#PCDATA)>
+   <!ELEMENT form-error-page (#PCDATA)>
+   -->
+
 </web-app>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/learningDesignApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/spring/workspaceApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.9 -r1.10
--- lams_common/web/WEB-INF/struts/struts-config.xml	28 Jan 2005 04:21:08 -0000	1.9
+++ lams_common/web/WEB-INF/struts/struts-config.xml	10 May 2005 23:56:40 -0000	1.10
@@ -1,190 +1,242 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
 
 <struts-config>
 
-	<!-- ========== Data Sources Definitions =================================== -->
-	<!--
-		Define your Struts data sources in a file called struts-data-sources.xml and place
-		it in your merge directory.
-	-->
+  <!-- ========== Data Sources Definitions =================================== -->
+  <!--
+    Define your Struts data sources in a file called struts-data-sources.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Form Bean Definitions =================================== -->
-	<form-beans>
-	
-    <form-bean name="PasswordChangeActionForm"
-               type="org.lamsfoundation.lams.web.PasswordChangeActionForm" />
-    
-    <form-bean name="OrganisationActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.OrganisationActionForm" />
+  <!-- ========== Form Bean Definitions =================================== -->
+  <form-beans>
 
-    <form-bean name="UserActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UserActionForm" />
-               
-    <form-bean name="UsersAddActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UsersAddActionForm" />
+    <!--
+         If you have non XDoclet forms, define them in a file called struts-forms.xml and
+         place it in your merge directory.
+    -->
+  </form-beans>
 
-    <form-bean name="UsersRemoveActionForm"
-               type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveActionForm" />
-               
-	</form-beans>
-	<!-- ========== Global Exceptions Definitions =================================== -->
-	<!--
-		Define your exceptions in a file called global-exceptions.xml and place
-		it in your merge directory.
-	-->
+  <!-- ========== Global Exceptions Definitions =================================== -->
+  <!--
+    Define your exceptions in a file called global-exceptions.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Global Forward Definitions =================================== -->
-	<!--
-		Define your forwards in a file called global-forwards.xml and place
-		it in your merge directory.
-	-->
-	<global-forwards>
-		<forward name="error" path=".error"/>
-	</global-forwards>
+  <!-- ========== Global Forward Definitions =================================== -->
+  <!--
+    Define your forwards in a file called global-forwards.xml and place
+    it in your merge directory.
+  -->
 
-	<!-- ========== Action Mapping Definitions =================================== -->
-	<action-mappings>
+  <!-- ========== Action Mapping Definitions =================================== -->
+   <action-mappings>
+    <action
+      path="/user"
+      type="org.lamsfoundation.lams.usermanagement.web.UserAction"
+      name="UserActionForm"
+      scope="session"
+      input=".admin.user"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/passwordChanged"
+      type="org.lamsfoundation.lams.web.PasswordChangeAction"
+      name="PasswordChangeActionForm"
+      scope="request"
+      input=".passwordChange"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="okay"
+        path=".passwordChangeOk"
+        redirect="false"
+      />
+      <forward
+        name="cancelled"
+        path="/index.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin"
+      type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="organisation"
+        path=".admin.organisation"
+        redirect="false"
+      />
+      <forward
+        name="user"
+        path=".admin.user"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="usersremove"
+        path=".admin.usersremove"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/usersadd"
+      type="org.lamsfoundation.lams.usermanagement.web.UsersAddAction"
+      name="UsersAddActionForm"
+      scope="session"
+      input=".admin.usersadd"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="usersadd"
+        path=".admin.usersadd"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="usersremove"
+      type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveAction"
+      name="UsersRemoveActionForm"
+      scope="session"
+      input=".admin.usersremove"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/admin/organisation"
+      type="org.lamsfoundation.lams.usermanagement.web.OrganisationAction"
+      name="OrganisationActionForm"
+      scope="session"
+      input=".admin.organisation"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".admin.error"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/home"
+      type="org.lamsfoundation.lams.web.HomeAction"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="admin"
+        path=".admin"
+        redirect="false"
+      />
+      <forward
+        name="learner"
+        path="/learner.jsp"
+        redirect="false"
+      />
+      <forward
+        name="author"
+        path="/author.jsp"
+        redirect="false"
+      />
+      <forward
+        name="staff"
+        path="/staff.jsp"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+      <forward
+        name="passwordChange"
+        path=".passwordChange"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/workspace"
+      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
+      name="WorkspaceAction"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path="/index.jsp"
+        redirect="false"
+      />
+    </action>
 
-    <action path="/home"
-            type="org.lamsfoundation.lams.web.HomeAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="staff"
-               path="/staff.jsp">
-      </forward>
-      <forward name="author"
-               path="/author.jsp">
-      </forward>
-      <forward name="learner"
-               path="/learner.jsp">
-      </forward>
-      <forward name="passwordChange"
-               path=".passwordChange">
-      </forward>
-	</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>
 
-    <action path="/admin"
-            type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
-            parameter="method">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="organisation"
-               path=".admin.organisation">
-      </forward>
-      <forward name="user"
-               path=".admin.user">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="usersremove"
-               path=".admin.usersremove">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-    <action path="/organisation"
-            type="org.lamsfoundation.lams.usermanagement.web.OrganisationAction"
-            name="OrganisationActionForm"
-            scope="session"
-            input=".admin.organisation"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts message-resources in a file called struts-message-resources.xml and place it in your merge directory. -->
 
-    <action path="/user"
-            type="org.lamsfoundation.lams.usermanagement.web.UserAction"
-            name="UserActionForm"
-            scope="session"
-            input=".admin.user"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
+   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
 
-    <action path="/usersadd"
-            type="org.lamsfoundation.lams.usermanagement.web.UsersAddAction"
-            name="UsersAddActionForm"
-            scope="session"
-            input=".admin.usersadd"
-            validate="true">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="usersadd"
-               path=".admin.usersadd">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
-
-    <action path="/usersremove"
-            type="org.lamsfoundation.lams.usermanagement.web.UsersRemoveAction"
-            name="UsersRemoveActionForm"
-            scope="session"
-            input=".admin.usersremove"
-            validate="false">
-      <forward name="admin"
-               path=".admin">
-      </forward>
-      <forward name="error"
-               path=".admin.error">
-      </forward>
-	</action>
-
-
-    <action path="/passwordChanged"
-            type="org.lamsfoundation.lams.web.PasswordChangeAction"
-            name="PasswordChangeActionForm"
-            scope="session"
-            input=".passwordChange"
-            validate="true">
-      <forward name="okay"
-               path=".passwordChangeOk">
-      </forward>
-      <forward name="cancelled"
-               path="/index.jsp">
-      </forward>
-	</action>
-	
-	<action path="/passwordChangeOk"
-			parameter="/index.jsp"
-			type="org.apache.struts.actions.ForwardAction"
-			scope="request"
-			validate="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.application" />
-
-	<!-- ===================== Plugin Definition  ======================== -->
-	<plug-in className="org.apache.struts.tiles.TilesPlugin">
-		<set-property property="definitions-config"
-			value="/WEB-INF/tiles/tiles-defs.xml" />
-		<set-property property="definitions-debug" value="0" />
-		<set-property property="definitions-parser-details" value="0" />
-		<set-property property="definitions-parser-validate" value="true" />
-	</plug-in>
-
-
-</struts-config>
\ No newline at end of file
+</struts-config>