Index: lams_monitoring/lib/lams/lams-authoring.jar
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/lib/lams/lams.jar
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r1a7c63095329d28b04079ad6b6a67c68a4141e09
Binary files differ
Index: lams_monitoring/lib/lams/src/lams-src.zip
===================================================================
diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r1a7c63095329d28b04079ad6b6a67c68a4141e09
Binary files differ
Index: lams_monitoring/lib/lams/src/lams_common_src.zip
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(revision 0)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,30 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2005 
+ * Created on 2/02/2005
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.monitoring.service;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+
+
+/**
+ * 
+ * @author Jacky Fang 2/02/2005
+ */
+public interface IMonitoringService
+{
+    
+    public void createLesson(long learningDesignId,User user,Organisation organisation,List organizationUsers,List staffs);;
+    
+    public void startlesson(long lessonId);
+    
+    public void forceCompleteLessonByUser(long learnerProgressId);
+}
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(revision 0)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,159 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2005 
+ * Created on 2/02/2005
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.monitoring.service;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.LessonClass;
+import org.lamsfoundation.lams.lesson.dao.ILessonClassDAO;
+import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
+import org.lamsfoundation.lams.tool.ToolContentManager;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+
+/**
+ * 
+ * @author Jacky Fang 2/02/2005
+ */
+public class MonitoringService implements IMonitoringService,ApplicationContextAware
+{
+    private ILessonDAO lessonDAO;
+    private ILessonClassDAO lessonClassDAO;
+    private IAuthoringService authoringService;
+    private ApplicationContext context;
+    /**
+     * @param authoringService The authoringService to set.
+     */
+    public void setAuthoringService(IAuthoringService authoringService)
+    {
+        this.authoringService = authoringService;
+    }
+    /**
+     * @param lessonClassDAO The lessonClassDAO to set.
+     */
+    public void setLessonClassDAO(ILessonClassDAO lessonClassDAO)
+    {
+        this.lessonClassDAO = lessonClassDAO;
+    }
+    /**
+     * @param lessonDAO The lessonDAO to set.
+     */
+    public void setLessonDAO(ILessonDAO lessonDAO)
+    {
+        this.lessonDAO = lessonDAO;
+    }
+    /**
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+     */
+    public void setApplicationContext(ApplicationContext context) throws BeansException
+    {
+        this.context=context;
+    }
+
+    /**
+     * 
+     */
+    public MonitoringService()
+    {
+        super();
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#createLesson(long, org.lamsfoundation.lams.usermanagement.User, java.util.List, java.util.List)
+     */
+    public void createLesson(long learningDesignId, 
+                             User user, 
+                             Organisation organisation,
+                             List organizationUsers, 
+                             List staffs)
+    {
+        
+        //copy the current learning design
+        LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(new Long(learningDesignId));
+        
+        //copy the tool content
+        for(Iterator i = copiedLearningDesign.getActivities().iterator();i.hasNext();)
+        {
+            Activity currentActivity = (Activity)i.next();
+            if(currentActivity.getActivityTypeId().intValue()==Activity.TOOL_ACTIVITY_TYPE)
+            {
+                ToolContentManager contentManager = (ToolContentManager)context.getBean(((ToolActivity)currentActivity).getTool().getToolSignature());
+                contentManager.copyToolContent(((ToolActivity)currentActivity).getToolContentId(),new Long(1));
+            }
+        }
+        
+        //create a new lesson object
+        LessonClass newLessonClass = createNewLessonClass(copiedLearningDesign);
+        lessonClassDAO.saveLessonClass(newLessonClass);
+        
+        //setup staff group
+        newLessonClass.setStaffGroup(Group.createStaffGroup(newLessonClass,new HashSet(staffs)));
+        //setup learner group
+        newLessonClass.getGroups().add(Group.createLearnerGroup(newLessonClass,new HashSet(organizationUsers)));
+        lessonClassDAO.updateLessonClass(newLessonClass);
+        
+        //create new Lesson object
+        Lesson newLesson = Lesson.createNewLesson(user, organisation, copiedLearningDesign, newLessonClass);
+        newLessonClass.setLesson(newLesson);
+        lessonDAO.saveLesson(newLesson);
+
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#startlesson(long)
+     */
+    public void startlesson(long lessonId)
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#forceCompleteLessonByUser(long)
+     */
+    public void forceCompleteLessonByUser(long learnerProgressId)
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    /**
+     * @param copiedLearningDesign
+     * @return
+     */
+    private LessonClass createNewLessonClass(LearningDesign copiedLearningDesign)
+    {
+        //make a copy of lazily initialized activities
+        Set activities = new HashSet(copiedLearningDesign.getActivities());
+        LessonClass newLessonClass = new LessonClass(null, //grouping id
+                                                     Grouping.CLASS_GROUPING_TYPE,
+                                                     new HashSet(),//groups
+                                                     activities,
+                                                     null, //staff group 
+                                                     null);//lesson
+        return newLessonClass;
+    }
+
+    
+}
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/applicationContext.xml
===================================================================
diff -u
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/applicationContext.xml	(revision 0)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/applicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for LAMS.
+-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
+	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
+	<!-- 
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location"><value>/WEB-INF/dbConnection.properties</value></property>
+	</bean>
+	-->
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>messages</value></property>										
+	</bean>
+
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+  
+	<!-- Local DataSource that works in any environment -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+		<property name="url"><value>jdbc:mysql://localhost/lams</value></property>
+		<property name="username"><value>lams</value></property>
+		<property name="password"><value>lamsdemo</value></property>
+	</bean>
+
+
+
+	<!-- Hibernate SessionFactory -->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref local="dataSource"/></property>
+		<property name="mappingResources">
+			<list>
+				<!-- usermanagement related mapping files -->	
+				<value>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>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
+                <!-- value>com/lamsinternational/lams/lesson/LessonClass.hbm.xml</value-->
+				
+				<!-- Tool related mapping files-->
+				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSessionState.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<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>
+	</bean>	
+	
+	<!-- Transactional proxy for the user management primary business object -->
+	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref local="transactionManager"/></property>
+		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="userDAO" class="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>
+	
+	<!-- learningdesign package -->
+
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<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="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<!-- lesson package -->
+
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+</beans>
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/learningDesignApplicationContext.xml
===================================================================
diff -u
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/learningDesignApplicationContext.xml	(revision 0)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/learningDesignApplicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,41 @@
+<?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 ========================= -->
+	
+	<bean id="authoringServiceTarget" class="org.lamsfoundation.lams.authoring.service.AuthoringService">
+		<property name="learningDesignDAO">
+			<ref bean="learningDesignDAO"/>
+		</property>
+		<property name="learningLibraryDAO">
+			<ref bean="learningLibraryDAO"/>
+		</property>
+		<property name="userDAO">
+			<ref bean="userDAO"/>
+		</property>
+		<property name="activityDAO">
+			<ref bean="activityDAO"/>
+		</property>
+	</bean>
+	
+	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager">
+			<ref bean ="transactionManager"/>
+		</property>
+		<property name ="target">
+			<ref bean="authoringServiceTarget"/>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="insert*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>
+</beans>
Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/monitoringApplicationContext.xml
===================================================================
diff -u
--- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/monitoringApplicationContext.xml	(revision 0)
+++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/monitoringApplicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<!--
+		- A parent bean definition which is a base definition for transaction proxies.
+		- It's marked as abstract, since it's not supposed to be instantiated itself.
+		- We set shared transaction attributes here, following our naming patterns.
+		- The attributes can still be overridden in child bean definitions.
+    -->
+	<bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" 
+	  	  abstract="true">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<!-- prop key="remove*">PROPAGATION_REQUIRED</prop-->
+			</props>
+		</property>
+	</bean>
+
+	<!--
+	  - Lams monitoring primary business object (default implementation), as an inner bean wrapped
+		- by an outer transactional proxy. The two bean definitions could have been separate,
+		- but this is cleaner as there is no need to ever access the unwrapped object.
+		-->
+	<bean id="monitoringService" parent="baseTransactionProxy">
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.monitoring.service.MonitoringService">
+				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+				<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>	
+				<property name="authoringService"><ref bean="authoringService"/></property>			
+			</bean>
+		</property>
+	</bean>  
+
+</beans>
Index: lams_monitoring/web/spring/applicationContext.xml
===================================================================
diff -u
--- lams_monitoring/web/spring/applicationContext.xml	(revision 0)
+++ lams_monitoring/web/spring/applicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for LAMS.
+-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
+	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
+	<!-- 
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location"><value>/WEB-INF/dbConnection.properties</value></property>
+	</bean>
+	-->
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>messages</value></property>										
+	</bean>
+
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+  
+	<!-- Local DataSource that works in any environment -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+		<property name="url"><value>jdbc:mysql://localhost/lams</value></property>
+		<property name="username"><value>lams</value></property>
+		<property name="password"><value>lamsdemo</value></property>
+	</bean>
+
+
+
+	<!-- Hibernate SessionFactory -->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref local="dataSource"/></property>
+		<property name="mappingResources">
+			<list>
+				<!-- usermanagement related mapping files -->	
+				<value>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>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
+                <!-- value>com/lamsinternational/lams/lesson/LessonClass.hbm.xml</value-->
+				
+				<!-- Tool related mapping files-->
+				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSessionState.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<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>
+	</bean>	
+	
+	<!-- Transactional proxy for the user management primary business object -->
+	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref local="transactionManager"/></property>
+		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="userDAO" class="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>
+	
+	<!-- learningdesign package -->
+
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<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="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<!-- lesson package -->
+
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+</beans>
Index: lams_monitoring/web/spring/learningDesignApplicationContext.xml
===================================================================
diff -u
--- lams_monitoring/web/spring/learningDesignApplicationContext.xml	(revision 0)
+++ lams_monitoring/web/spring/learningDesignApplicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,41 @@
+<?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 ========================= -->
+	
+	<bean id="authoringServiceTarget" class="org.lamsfoundation.lams.authoring.service.AuthoringService">
+		<property name="learningDesignDAO">
+			<ref bean="learningDesignDAO"/>
+		</property>
+		<property name="learningLibraryDAO">
+			<ref bean="learningLibraryDAO"/>
+		</property>
+		<property name="userDAO">
+			<ref bean="userDAO"/>
+		</property>
+		<property name="activityDAO">
+			<ref bean="activityDAO"/>
+		</property>
+	</bean>
+	
+	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager">
+			<ref bean ="transactionManager"/>
+		</property>
+		<property name ="target">
+			<ref bean="authoringServiceTarget"/>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="insert*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>
+</beans>
Index: lams_monitoring/web/spring/monitoringApplicationContext.xml
===================================================================
diff -u
--- lams_monitoring/web/spring/monitoringApplicationContext.xml	(revision 0)
+++ lams_monitoring/web/spring/monitoringApplicationContext.xml	(revision 1a7c63095329d28b04079ad6b6a67c68a4141e09)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<!--
+		- A parent bean definition which is a base definition for transaction proxies.
+		- It's marked as abstract, since it's not supposed to be instantiated itself.
+		- We set shared transaction attributes here, following our naming patterns.
+		- The attributes can still be overridden in child bean definitions.
+    -->
+	<bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" 
+	  	  abstract="true">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<!-- prop key="remove*">PROPAGATION_REQUIRED</prop-->
+			</props>
+		</property>
+	</bean>
+
+	<!--
+	  - Lams monitoring primary business object (default implementation), as an inner bean wrapped
+		- by an outer transactional proxy. The two bean definitions could have been separate,
+		- but this is cleaner as there is no need to ever access the unwrapped object.
+		-->
+	<bean id="monitoringService" parent="baseTransactionProxy">
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.monitoring.service.MonitoringService">
+				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+				<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>	
+				<property name="authoringService"><ref bean="authoringService"/></property>			
+			</bean>
+		</property>
+	</bean>  
+
+</beans>