Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_common/test/java/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
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.12 -r1.13
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	12 Apr 2005 07:43:36 -0000	1.12
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	13 Apr 2005 00:11:38 -0000	1.13
@@ -1,5 +1,6 @@
 package org.lamsfoundation.lams.learningdesign.dao;
 
+import java.util.HashSet;
 import java.util.List;
 
 import org.lamsfoundation.lams.AbstractLamsTestCase;
@@ -8,8 +9,6 @@
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
 import org.lamsfoundation.lams.learningdesign.*;
-import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 
 /*
  * Created on Dec 3, 2004
@@ -32,7 +31,7 @@
 	protected LearningLibraryDAO learningLibraryDAO;
 	protected GroupingDAO groupingDAO;
 	protected LearningDesign learningDesign;
-	protected UserDAO userDAO;
+
 	/**
 	 * @param name
 	 */
@@ -47,7 +46,6 @@
 		learningLibraryDAO =(LearningLibraryDAO)context.getBean("learningLibraryDAO");
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
 		groupingDAO = (GroupingDAO)context.getBean("groupingDAO");
-		userDAO = (UserDAO)context.getBean("userDAO");
 		learningDesign = learningDesignDAO.getLearningDesignById(new Long(1));
 	}
 	public void testGetActivitiesByParentActivityId() {
@@ -70,8 +68,8 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
-		 "applicationContext.xml"};
+		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
+		 "WEB-INF/spring/applicationContext.xml"};
 	}
 	public void testgetActivityByLibraryID(){
 		List activities = activityDAO.getActivitiesByLibraryID(new Long(1));
@@ -85,9 +83,8 @@
 	}
 	public void testGetContributionType(){
 		activity = activityDAO.getActivityByActivityId(new Long(18));
-		Integer as[]=((SimpleActivity)activity).getContributionType();
-		for(int i=0;i<as.length;i++)
-			System.out.println(as[i]);
+		HashSet set = activity.getContributionType();
+		assertTrue(set.size()>0);
 		
 	}
 	public void testCreateToolActivityCopy(){
@@ -125,40 +122,6 @@
 			activityDAO.insert(parallelActivity);
 		}
 		assertNotNull(parallelActivity.getActivityId());
-	}
-	
-	public void testUpdateGateActivity()
-	{
-	    User learner = userDAO.getUserById(new Integer(1));
-	    Activity synchGate = activityDAO.getActivityByActivityId(new Long(26));
-	    
-	    //add waiting learner.
-	    ((GateActivity)synchGate).addWaitingLeaner(learner);
-	    ((GateActivity)synchGate).setGateOpen(new Boolean(true));
-	    
-	    activityDAO.updateActivity(synchGate);
-	    
-	    synchGate = activityDAO.getActivityByActivityId(new Long(26));
-	    assertTrue("gate status should be open",((GateActivity)synchGate).getGateOpen().booleanValue());
-	    assertEquals("should be one learner waiting",1,((GateActivity)synchGate).getWaitingLearners().size());
-	    
-	    //remove waiting learner
-	    ((GateActivity)synchGate).getWaitingLearners().clear();
-	    
-	    activityDAO.updateActivity(synchGate);
-	    synchGate = activityDAO.getActivityByActivityId(new Long(26));
-	    assertTrue("gate status should be open",((GateActivity)synchGate).getGateOpen().booleanValue());
-	    assertEquals("should be no learner waiting",0,((GateActivity)synchGate).getWaitingLearners().size());
-
-	}
-
-
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
+	}	
 }
 
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.8 -r1.9
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	12 Apr 2005 07:43:36 -0000	1.8
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	13 Apr 2005 00:11:38 -0000	1.9
@@ -3,15 +3,24 @@
  */
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import java.util.Date;
+
+import java.util.List;
+
 import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Activity;
+
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
+import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
+
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO;
+import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 
+
 /**
  * @author MMINHAS
  *
@@ -20,8 +29,9 @@
  */
 public class TestLearningDesignDAO extends AbstractLamsTestCase {
 	
-	
-	private LearningDesignDAO learningDesignDAO;	
+	protected ActivityDAO activityDAO;
+	private LearningDesignDAO learningDesignDAO;
+	protected TransitionDAO transitionDAO;
 	protected WorkspaceFolderDAO workspaceFolderDAO;
 	private UserDAO userDAO;
 	private User user;
@@ -33,38 +43,29 @@
 	public void setUp() throws Exception{
 		super.setUp();
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");		
+		transitionDAO =(TransitionDAO) context.getBean("transitionDAO");
+		activityDAO =(ActivityDAO) context.getBean("activityDAO");
 		userDAO = (UserDAO)context.getBean("userDAO");
-	}	
-	/*
-	public void testInsertLearningDesign(){
-		LearningDesign design = new LearningDesign();
-				
-		design.setValidDesign(new Boolean (true));
-		design.setReadOnly(new Boolean (false));
-		design.setUser(userDAO.getUserById(new Integer(1)));
-		design.setCopyTypeID(new Integer(1));
-		design.setCreateDateTime(new Date());		
-		learningDesignDAO.insert(design);		
-	}*/
+	}
 	public void testCalculateFirstActivity(){
-		learningDesign = learningDesignDAO.getLearningDesignById(new Long(1));
+		learningDesign = learningDesignDAO.getLearningDesignById(new Long(2));
 		Activity activity = learningDesign.calculateFirstActivity();
 		assertNotNull(activity.getActivityId());
-		long x = 20;
+		long x = 27;
 		assertEquals(activity.getActivityId().longValue(),x);
 	}
-	/* (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
-		 "applicationContext.xml"};
+		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
+		 "WEB-INF/spring/applicationContext.xml"};
 	}
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
+	public void testGetAllValidLearningDesignsInFolder(){
+		List list = learningDesignDAO.getAllValidLearningDesignsInFolder(new Integer(1));
+		System.out.println("SIZE:"+list.size());
+	}
+	public void testGetLearningDesignDTO() throws Exception{
+		learningDesign = learningDesignDAO.getLearningDesignById(new Long(2));
+		LearningDesignDTO learningDesignDTO = learningDesign.getLearningDesignDTO();		
+		String str = WDDXProcessor.serialize(learningDesignDTO);
+		System.out.println(str);		
+	}	
 }
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.6 -r1.7
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	12 Apr 2005 07:43:36 -0000	1.6
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	13 Apr 2005 00:11:38 -0000	1.7
@@ -42,15 +42,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
-		 "applicationContext.xml"};
+		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
+		 "WEB-INF/spring/applicationContext.xml"};
 	}
-
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
 }
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.8 -r1.9
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	12 Apr 2005 07:43:36 -0000	1.8
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	13 Apr 2005 00:11:38 -0000	1.9
@@ -40,15 +40,7 @@
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
 	protected String[] getContextConfigLocation() {
-		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
-		 "applicationContext.xml"};
+		return new String[] {"WEB-INF/spring/learningDesignApplicationContext.xml",
+		 "WEB-INF/spring/applicationContext.xml"};
 	}
-
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/workspace/Attic/TestWorkspaceManagement.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/test/java/org/lamsfoundation/lams/workspace/TestWorkspaceManagement.java	13 Apr 2005 00:18:56 -0000	1.1
@@ -0,0 +1,46 @@
+/*
+ * Created on Apr 4, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.workspace;
+
+import java.io.IOException;
+
+import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.workspace.service.WorkspaceManagementService;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TestWorkspaceManagement extends AbstractLamsTestCase {
+	
+	protected WorkspaceManagementService workspaceManagementService;
+	
+	public TestWorkspaceManagement(String name){
+		super(name);
+	}
+	public void setUp() throws Exception {
+		super.setUp();		
+		workspaceManagementService =(WorkspaceManagementService)context.getBean("workspaceManagementService");
+	}
+	protected String[] getContextConfigLocation() {
+		return new String[] {"WEB-INF/spring/authoringApplicationContext.xml",
+							 "WEB-INF/spring/workspaceApplicationContext.xml",
+							 "WEB-INF/spring/learningDesignApplicationContext.xml",
+							 "WEB-INF/spring/applicationContext.xml"};		
+	}
+	public void testGetFolderContents()throws IOException{
+		String packet = workspaceManagementService.getFolderContents(new Integer(4),new Integer(2),WorkspaceManagementService.AUTHORING);		
+		System.out.println(packet);
+	}
+	public void testCopyFolder() throws IOException{
+		String packet = workspaceManagementService.copyFolder(new Integer(2),new Integer(8),new Integer(4));
+		System.out.println(packet);
+	}
+
+}
Fisheye: Tag 1.19 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/web/WEB-INF/spring/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/spring/Attic/applicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/web/WEB-INF/spring/applicationContext.xml	13 Apr 2005 00:14:57 -0000	1.1
@@ -0,0 +1,193 @@
+<?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>
+			</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="workspaceDAO"><ref bean="workspaceDAO"/></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="workspaceDAO" 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>
+</beans>
Index: lams_common/web/WEB-INF/spring/learningDesignApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/spring/Attic/learningDesignApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/web/WEB-INF/spring/learningDesignApplicationContext.xml	13 Apr 2005 00:14:57 -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/web/WEB-INF/spring/workspaceApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/spring/Attic/workspaceApplicationContext.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/web/WEB-INF/spring/workspaceApplicationContext.xml	13 Apr 2005 00:14:57 -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="workspaceDAO"/></property>
+		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
+		<property name="authoringService"><ref bean="authoringService"/></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>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file