Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
===================================================================
diff -u -r2db1c52567bf8f79ccb7589d1d8785be4ed1118c -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 2db1c52567bf8f79ccb7589d1d8785be4ed1118c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml	(.../Group.hbm.xml)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -56,7 +56,7 @@
   
     <!-- bi-directional one-to-many association to User -->
     <set
-        name="userGroups"
+        name="users"
         lazy="true"
         inverse="true"
         cascade="none"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
diff -u -rc0710880f1bac8ff501394218afacdb9286c5469 -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision c0710880f1bac8ff501394218afacdb9286c5469)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml	(.../Grouping.hbm.xml)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -74,11 +74,16 @@
         
     <subclass name="org.lamsfoundation.lams.lesson.LessonClass" discriminator-value="3">
         <!-- uni-directional many-to-one (effectiviey a  one to one) assocaites to Group in staff group role -->
-        <many-to-one name="staffGroup" class="org.lamsfoundation.lams.learningdesign.Group" column="staff_group_id" unique="true"/>
+        <many-to-one name="staffGroup" 
+        			 class="org.lamsfoundation.lams.learningdesign.Group" 
+        			 column="staff_group_id" 
+        			 unique="true"
+        			 cascade="none"/>
         <!-- bi-directional one-to-one association to Lesson -->
         <one-to-one name="lesson"
         	class="org.lamsfoundation.lams.lesson.Lesson"
-        	property-ref="lessonClass" />
+        	property-ref="lessonClass" 
+        	cascade="none"/>
     </subclass>
 </class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -re840fc03d3eb7ae1a3757be5ee65415caea89981 -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision e840fc03d3eb7ae1a3757be5ee65415caea89981)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -53,7 +53,7 @@
 		</many-to-one>
 		
 		<!-- bi-directional one-to-many association to LearnerProgress -->
-		<set name="learnerProgresses" lazy="true" inverse="true"
+		<set name="learnerProgresses" lazy="false" inverse="true"
 			cascade="none">
 			<key>
 				<column name="lesson_id" />
@@ -77,7 +77,8 @@
 		<many-to-one name="lessonClass"
 			class="org.lamsfoundation.lams.lesson.LessonClass"
 			column="class_grouping_id"
-			unique="true" />
+			unique="true" 
+			cascade = "save-update"/>
 
 		<!-- bi-directional many-to-one association to Organisation -->
 		<many-to-one name="organisation"
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java	(.../Group.java)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -24,7 +24,7 @@
     private org.lamsfoundation.lams.learningdesign.Grouping grouping;
 
     /** persistent field */
-    private Set userGroups;
+    private Set users;
 
     /** persistent field */
     private Set toolSessions;
@@ -34,7 +34,7 @@
         this.groupId = groupId;
         this.orderId = orderId;
         this.grouping = grouping;
-        this.userGroups = userGroups;
+        this.users = userGroups;
         this.toolSessions = toolSessions;
     }
 
@@ -86,23 +86,19 @@
         this.grouping = grouping;
     }
 
-    /** 
-     *            @hibernate.set
-     *             lazy="true"
-     *             inverse="true"
-     *             cascade="none"
-     *            @hibernate.collection-key
-     *             column="group_id"
-     *            @hibernate.collection-one-to-many
-     *             class="org.lamsfoundation.lams.lesson.UserGroup"
-     *         
+    /**
+     * @hibernate.set lazy="true" inverse="true" cascade="none"
+     * 				  table = "lams_user_group"
+     * @hibernate.collection-key column="group_id"
+     * @hibernate.collection-many-to-many
+     *            class="org.lamsfoundation.lams.usermanagement.User"
      */
-    public Set getUserGroups() {
-        return this.userGroups;
+    public Set getUsers() {
+        return this.users;
     }
 
-    public void setUserGroups(Set userGroups) {
-        this.userGroups = userGroups;
+    public void setUsers(Set userGroups) {
+        this.users = userGroups;
     }
 
     /** 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -15,13 +15,13 @@
 public abstract class Grouping implements Serializable
 {
     /** Grouping type id of random grouping */
-    public static final int RANDOM_GROUPING_TYPE = 1;
+    public static final Integer RANDOM_GROUPING_TYPE = new Integer(1);
     
     /** Grouping type id of chosen grouping */
-    public static final int CHOSEN_GROUPING_TYPE = 2;
+    public static final Integer CHOSEN_GROUPING_TYPE = new Integer(2);
     
     /** Grouping type id for lesson class grouping */
-    public static final int CLASS_GROUPING_TYPE = 3;
+    public static final Integer CLASS_GROUPING_TYPE = new Integer(3);
     
     /** identifier field */
     private Long groupingId;
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r94103d94d6e3ade6573602d6790a590287216688 -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 94103d94d6e3ade6573602d6790a590287216688)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -1,6 +1,5 @@
 package org.lamsfoundation.lams.lesson;
 
-import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -10,8 +9,6 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-
-
 /** 
  * A Lesson is a learning sequence that is assocated with
  * a number of users for use in learning.        
@@ -22,18 +19,20 @@
  * 
  */
 public class Lesson implements Serializable {
-
+    //The state for newly created lesson
+    public static final Integer CREATED = new Integer(1);
+    //The state for lessons that have been scheduled
+    public static final Integer NOT_STARTED_STATE = new Integer(2);
+    //The state for started lesson
+    public static final Integer STARTED_STATE = new Integer(3);
+    //The state for lessons that have been suspended by the teacher. 
+    //Note that suspension of the entire lesson is not a 1.1 feature.
+    public static final Integer SUSPENDED_STATE = new Integer(4);
+    //The state for lessons that have been finished.
+    public static final Integer FINISHED_STATE = new Integer(5);
+    //The state for lesssons that are no longer visible to the learners.
+    public static final Integer ARCHIVED_STATE = new Integer(6);
     
-    public static final Integer NOT_STARTED_STATE = new Integer(1);
-    
-    public static final Integer STARTED_STATE = new Integer(2);
-    
-    public static final Integer SUSPENDED_STATE = new Integer(3);
-    
-    public static final Integer FINISHED_STATE = new Integer(4);
-    
-    public static final Integer ARCHIVED_STATE = new Integer(5);
-    
     /** identifier field */
     private Long lessonId;
 
@@ -69,8 +68,19 @@
      */
     private Set learners;
     
-    
+    /** default constructor */
+    public Lesson() {
+    }
 
+    /** 
+     * Minimum constructor that includes all not null attributes to create
+     * a new Lesson object.
+     * Chain construtor implementation. 
+     */
+    public Lesson(Date createDateTime, User user, Integer lessonStateId, LearningDesign learningDesign, LessonClass lessonClass, Organisation organisation, Set learnerProgresses) {
+
+        this(null,createDateTime,null,null,user,lessonStateId,learningDesign,lessonClass,organisation,learnerProgresses);
+    }    
     
     /** full constructor */
     public Lesson(Long lessonId, Date createDateTime, Date startDateTime, Date endDateTime, User user, Integer lessonStateId, LearningDesign learningDesign, LessonClass lessonClass, Organisation organisation, Set learnerProgresses) {
@@ -86,27 +96,11 @@
         this.learnerProgresses = learnerProgresses;        
     }
 
-    /** default constructor */
-    public Lesson() {
-    }
 
-    /** minimal constructor */
-    public Lesson(Long lessonId, Date createDateTime, User user, Integer lessonStateId, LearningDesign learningDesign, LessonClass lessonClass, Organisation organisation, Set learnerProgresses) {
-        this.lessonId = lessonId;
-        this.createDateTime = createDateTime;
-        this.user = user;
-        this.lessonStateId = lessonStateId;
-        this.learningDesign = learningDesign;
-        this.lessonClass = lessonClass;
-        this.organisation = organisation;
-        this.learnerProgresses = learnerProgresses;        
-    }
 
     /** 
-     * @hibernate.id
-     *            generator-class="assigned"
-     *            type="java.lang.Long"
-     *            column="lesson_id"
+     * @hibernate.id  generator-class="identity" type="java.lang.Long"
+     *                column="lesson_id"
      */
     public Long getLessonId() {
         return this.lessonId;
@@ -117,10 +111,8 @@
     }
 
     /** 
-     * @hibernate.property
-     *            type="java.sql.Timestamp"
-     *            column="create_date_time"
-     *            length="10"
+     * @hibernate.property type="java.sql.Timestamp" column="create_date_time"
+     *            		   length="19"
      */
     public Date getCreateDateTime() {
         return this.createDateTime;
@@ -131,10 +123,8 @@
     }
 
     /** 
-     * @hibernate.property
-     *            type="java.sql.Timestamp"
-     *            column="start_date_time"
-     *            length="10"
+     * @hibernate.property type="java.sql.Timestamp" column="start_date_time"
+     *            		   length="19"
      */
     public Date getStartDateTime() {
         return this.startDateTime;
@@ -145,10 +135,8 @@
     }
 
     /** 
-     * @hibernate.property
-     *            type="java.sql.Timestamp"
-     *            column="end_date_time"
-     *            length="10"
+     * @hibernate.property type="java.sql.Timestamp"  column="end_date_time"
+     *            	       length="19"
      */
     public Date getEndDateTime() {
         return this.endDateTime;
@@ -159,9 +147,8 @@
     }
 
     /** 
-     * @hibernate.many-to-one
-     *            not-null="true"
-     *            @hibernate.column name="user_id"     
+     * @hibernate.many-to-one not-null="true"
+     * @hibernate.column name="user_id"     
      */
     public User getUser() {
         return this.user;
@@ -172,8 +159,8 @@
     }
 
     /** 
-     *                    
-     *         
+     * @hibernate.property type="java.lang.Integer"  column="lesson_state_id"
+     *            	       length="3"
      */
     public Integer getLessonStateId() {
         return this.lessonStateId;
@@ -184,8 +171,8 @@
     }
 
     /** 
-     *                
-     *         
+     * @hibernate.many-to-one not-null="true" cascade="none"
+     * @hibernate.column name="learning_design_id"        
      */
     public LearningDesign getLearningDesign() {
         return this.learningDesign;
@@ -196,8 +183,9 @@
     }
 
     /** 
-     *              
-     *         
+     * @hibernate.many-to-one not-null="true" unique="true" 
+     * 						  cascade = "save-update"
+     * @hibernate.column name="learning_design_id"           
      */
     public LessonClass getLessonClass() {
         return this.lessonClass;
@@ -208,8 +196,8 @@
     }
 
     /** 
-     *              
-     *         
+     * @hibernate.many-to-one not-null="true" cascade="none"
+     * @hibernate.column name="organisation_id"         
      */
     public Organisation getOrganisation() {
         return this.organisation;
@@ -218,10 +206,32 @@
     public void setOrganisation(Organisation organisation) {
         this.organisation = organisation;
     }
+    /**
+     * @hibernate.set lazy="true" inverse="true" cascade="none"
+     * 				  table="lams_lesson_learner"
+     * @hibernate.collection-key column="lesson_id"
+     * @hibernate.collection-many-to-many
+     *            class="org.lamsfoundation.lams.usermanagement.User"
+     */
+    public Set getLearners()
+    {
+        return this.learners;
+    }
 
+    /**
+     * Setter for property learners.
+     * @param learners New value of property learners.
+     */
+    public void setLearners(Set learners)
+    {
+        this.learners = learners;
+    }
+    
     /** 
-     *           
-     *         
+     * @hibernate.set lazy="false" inverse="true" cascade="none"
+     * @hibernate.collection-key column="lesson_id"
+     * @@hibernate.collection-one-to-many
+     *            class="org.lamsfoundation.lams.lesson.LearnerProgress"      
      */
     public Set getLearnerProgresses() {
         return this.learnerProgresses;
@@ -252,26 +262,6 @@
             .toHashCode();
     }
 
-    /**
-     * @hibernate.set lazy="true" inverse="true" cascade="none"
-     * @hibernate.collection-key column="lesson_id"
-     * @hibernate.collection-many-to-many
-     *            class="org.lamsfoundation.lams.usermanagement.User"
-     */
-    public Set getLearners()
-    {
 
-        return this.learners;
-    }
 
-    /**
-     * Setter for property learners.
-     * @param learners New value of property learners.
-     */
-    public void setLearners(Set learners)
-    {
-
-        this.learners = learners;
-    }
-
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -r6eb1e89c36a16cadbb773f1fbc03cf8e7aad2ee9 -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 6eb1e89c36a16cadbb773f1fbc03cf8e7aad2ee9)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -9,9 +9,25 @@
 
 package org.lamsfoundation.lams.lesson;
 
-import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
+import junit.framework.TestCase;
 
+import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
+import org.lamsfoundation.lams.learningdesign.Group;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
+import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
+import org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO;
+import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
+
 /**
  * 
  * @author Jacky Fang 2/02/2005
@@ -20,6 +36,32 @@
 public class LessonDataAccessTestCase extends AbstractLamsCommonTestCase
 {
 
+    //---------------------------------------------------------------------
+    // DAO instances for initializing data
+    //---------------------------------------------------------------------
+    protected IUserDAO userDao;
+    protected ILearningDesignDAO learningDesignDao;
+    protected IOrganisationDAO orgDao;
+    //---------------------------------------------------------------------
+    // Domain Object instances
+    //---------------------------------------------------------------------
+    protected Lesson testLesson;
+    protected User testUser;
+    protected LearningDesign testLearningDesign;
+    protected Organisation testOrg;
+    protected LessonClass testLessonClass;
+    //---------------------------------------------------------------------
+    // Class level constants
+    //---------------------------------------------------------------------
+    private final Integer TEST_USER_ID = new Integer(1);
+    private final Long TEST_LEARNING_DESIGN_ID = new Long(1);
+    private final Integer TEST_ORGANIZATION_ID = new Integer(1);
+    private final int TEST_GROUP_ORDER_ID = 0;
+    private final Long TEST_CLASS_GROUPING_ID = new Long(1);
+
+    //---------------------------------------------------------------------
+    // Overidden methods
+    //---------------------------------------------------------------------
     /**
      * @param name
      */
@@ -29,13 +71,95 @@
     }
 
     /**
+     * @see TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        userDao = (UserDAO) this.ac.getBean("userDAO");
+        learningDesignDao = (LearningDesignDAO) this.ac.getBean("learningDesignDAO");
+        orgDao = (OrganisationDAO) this.ac.getBean("organisationDAO");
+
+        //retrieve test domain data
+        testUser = userDao.getUserById(TEST_USER_ID);
+        testLearningDesign = learningDesignDao.getLearningDesignById(TEST_LEARNING_DESIGN_ID);
+        testOrg = orgDao.getOrganisationById(TEST_ORGANIZATION_ID);
+    }
+
+    /**
+     * @see TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+
+    }
+
+    /**
      * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation()
      */
     protected String[] getContextConfigLocation()
     {
-        return new String[] {
-                "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml"};
+        return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml" };
     }
 
-    
-}
+    //---------------------------------------------------------------------
+    // Data initialization and finalization methods
+    //---------------------------------------------------------------------
+
+    protected void initLessonData()
+    {
+
+        testLesson = new Lesson(new Date(System.currentTimeMillis()),
+                                testUser,
+                                Lesson.NOT_STARTED_STATE,
+                                testLearningDesign,
+                                testLessonClass,//lesson class
+                                testOrg,
+                                new HashSet());
+
+        testLesson.setLessonClass(createTestLessonClass(testLesson));
+    }
+
+    protected void initLessonClassData()
+    {
+        testLessonClass = new LessonClass(TEST_CLASS_GROUPING_ID, //grouping id
+                                          Grouping.CLASS_GROUPING_TYPE,
+                                          new HashSet(),//groups
+                                          testLearningDesign.getActivities(),
+                                          null, //staff group 
+                                          testLesson);
+        //create a new staff group
+        Set staffs = new HashSet();
+        staffs.add(testUser);
+        Group staffGroup = new Group(null,//group id 
+                                     TEST_GROUP_ORDER_ID,
+                                     testLessonClass,
+                                     staffs,
+                                     new HashSet());
+        testLessonClass.setStaffGroup(staffGroup);
+
+        //create learner class group
+        Set learnergroups = new HashSet();
+        Group learnerClassGroup = new Group(null,//group id 
+                                            TEST_GROUP_ORDER_ID,
+                                            testLessonClass,
+                                            testOrg.getUsers(),
+                                            new HashSet());//tool session, should be empty now
+
+        learnergroups.add(learnerClassGroup);
+    }
+    //---------------------------------------------------------------------
+    // Helper methods
+    //---------------------------------------------------------------------
+    /**
+     * Create test lesson class based on the give lesson
+     * @param lesson the lesson for the class we are going to create
+     * @return the new Lesson Class transiant hibernate object
+     */
+    private LessonClass createTestLessonClass(Lesson lesson)
+    {
+
+        return testLessonClass;
+    }
+}
\ No newline at end of file
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java
===================================================================
diff -u
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java	(revision 0)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestInitLesson.java	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -0,0 +1,62 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2005 
+ * Created on 3/02/2005
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.lesson.dao;
+
+import org.lamsfoundation.lams.lesson.LessonDataAccessTestCase;
+import org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO;
+import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO;
+
+
+/**
+ * 
+ * @author Jacky Fang 3/02/2005
+ * 
+ */
+public class TestInitLesson extends LessonDataAccessTestCase
+{
+    
+    private ILessonDAO lessonDao;
+    private ILessonClassDAO lessonClassDao;
+    /*
+     * @see LessonDataAccessTestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        lessonDao = (LessonDAO)this.ac.getBean("lessonDAO");
+        lessonClassDao = (LessonClassDAO)this.ac.getBean("lessonClassDAO");
+    }
+
+    /*
+     * @see LessonDataAccessTestCase#tearDown()
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+    }
+
+    /**
+     * Constructor for TestInitLesson.
+     * @param arg0
+     */
+    public TestInitLesson(String arg0)
+    {
+        super(arg0);
+    }
+
+    public void testInitLesson()
+    {
+        super.initLessonData();
+        super.initLessonClassData();
+        lessonClassDao.saveLessonClass(this.testLessonClass);
+        lessonDao.saveLesson(testLesson);
+        assertEquals("",1,1);
+    }
+}
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
===================================================================
diff -u -r6eb1e89c36a16cadbb773f1fbc03cf8e7aad2ee9 -r4ec6567d23397141210e7c6979f4293c1d99a5d0
--- lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision 6eb1e89c36a16cadbb773f1fbc03cf8e7aad2ee9)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision 4ec6567d23397141210e7c6979f4293c1d99a5d0)
@@ -72,7 +72,7 @@
 		<property name="hibernateProperties">
 			<props>
 				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
-				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.show_sql">true</prop>
 				<prop key="hibernate.c3p0.minPoolSize">5</prop>
 				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
 				<prop key="hibernate.c3p0.timeout">1800</prop>
@@ -105,5 +105,18 @@
 	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
-
+	
+	<!-- Usermanagement realted beans -->
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<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="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
 </beans>