Index: lams_learning/test/java/SurveyAnsContent.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyAnsContent.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyAnsContent.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyAnsContent"
+        table="tool_lasr10_survey_ans_content"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="surveyAnsContentId"
+            column="survey_ans_content_id"
+            type="java.lang.Long"
+        >
+            <generator class="increment">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyAnsContent.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="answerEntry"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="answer_entry"
+            length="255"
+        />
+
+        <property
+            name="displayOrder"
+            type="int"
+            update="true"
+            insert="true"
+            access="property"
+            column="dispaly_order"
+            length="11"
+        />
+
+        <set
+            name="surveyUsrResps"
+            lazy="false"
+            inverse="true"
+            cascade="none"
+            sort="unsorted"
+        >
+
+              <key
+                  column="survey_ans_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyUsrResp"
+              />
+
+        </set>
+
+        <many-to-one
+            name="surveyQueContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_que_content_id" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyAnsContent.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveyContent.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyContent.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyContent.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyContent"
+        table="tool_lasr10_survey_content"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="surveyContentId"
+            column="survey_content_id"
+            type="java.lang.Long"
+        >
+            <generator class="assigned">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyContent.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="title"
+            length="65535"
+        />
+
+        <property
+            name="instruction"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="instruction"
+            length="65535"
+        />
+
+        <property
+            name="description"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="description"
+            length="65535"
+        />
+
+        <property
+            name="dateCreated"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="dateCreated"
+            length="150"
+        />
+
+        <property
+            name="creatorUserId"
+            type="long"
+            update="true"
+            insert="true"
+            access="property"
+            column="creatorUserId"
+            length="20"
+        />
+
+        <property
+            name="showUser"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="showUser"
+            length="1"
+        />
+
+        <property
+            name="defineLater"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="defineLater"
+            length="1"
+        />
+
+        <property
+            name="reusable"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="reusable"
+            length="1"
+        />
+
+        <property
+            name="summary"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="summary"
+            length="65535"
+        />
+
+        <set
+            name="surveyQueContents"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="natural"
+        >
+
+              <key
+                  column="survey_content_sid"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+              />
+
+        </set>
+
+        <set
+            name="surveySessions"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+              <key
+                  column="survey_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveySession"
+              />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyContent.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveyQueContent.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyQueContent.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyQueContent.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+        table="tool_lasr10_survey_que_content"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="surveyQueContentId"
+            column="survey_que_content_id"
+            type="java.lang.Long"
+        >
+            <generator class="increment">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyQueContent.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="question"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="question"
+            length="65535"
+        />
+
+        <property
+            name="displayOrder"
+            type="int"
+            update="true"
+            insert="true"
+            access="property"
+            column="display_order"
+            length="11"
+        />
+
+        <property
+            name="isOptional"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="isOptional"
+            length="1"
+        />
+
+        <property
+            name="isTextBoxEnabled"
+            type="boolean"
+            update="true"
+            insert="true"
+            access="property"
+            column="isTextBoxEnabled"
+            length="1"
+        />
+
+        <many-to-one
+            name="surveyContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_content_sid" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="surveyQueType"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueType"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="question_type_id" 
+            />
+        </many-to-one>
+
+        <set
+            name="surveyUsrResps"
+            lazy="false"
+            inverse="true"
+            cascade="none"
+            sort="natural"
+        >
+
+              <key
+                  column="survey_que_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyUsrResp"
+              />
+
+        </set>
+
+        <set
+            name="surveyAnsContents"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="natural"
+        >
+
+              <key
+                  column="survey_que_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyAnsContent"
+              />
+
+        </set>
+
+        <set
+            name="surveyQueUsrs"
+            lazy="false"
+            inverse="true"
+            cascade="none"
+            sort="unsorted"
+        >
+
+              <key
+                  column="survey_que_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyQueUsr"
+              />
+
+        </set>
+
+        <many-to-one
+            name="parentQuestion"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="parent_que_content_id" 
+            />
+        </many-to-one>
+
+        <set
+            name="subQuestions"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="natural"
+        >
+
+              <key
+                  column="parent_que_content_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+              />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyQueContent.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveyQueType.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyQueType.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyQueType.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyQueType"
+        table="tool_lasr10_survey_que_type"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+        mutable="false"
+    >
+
+        <id
+            name="questionTypeId"
+            column="question_type_id"
+            type="java.lang.Long"
+        >
+            <generator class="assigned">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyQueType.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="name"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="name"
+            length="128"
+        />
+
+        <property
+            name="description"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="description"
+            length="65535"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyQueType.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveyQueUsr.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyQueUsr.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyQueUsr.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyQueUsr"
+        table="tool_lasr10_survey_que_usr"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="queUsrId"
+            column="que_usr_id"
+            type="java.lang.Long"
+        >
+            <generator class="increment">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyQueUsr.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="userId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            access="property"
+            column="user_id"
+            length="20"
+        />
+
+        <property
+            name="username"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="username"
+            length="100"
+        />
+
+        <property
+            name="fullName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="fullname"
+            length="100"
+        />
+
+        <many-to-one
+            name="surveyQueContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_que_content_id" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="surveySession"
+            class="org.lamsfoundation.lams.tool.survey.SurveySession"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_session_id" 
+            />
+        </many-to-one>
+
+        <set
+            name="surveyUsrResps"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+              <key
+                  column="que_usr_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyUsrResp"
+              />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyQueUsr.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveySession.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveySession.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveySession.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveySession"
+        table="tool_lasr10_survey_session"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="surveySessionId"
+            column="survey_session_id"
+            type="java.lang.Long"
+        >
+            <generator class="assigned">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveySession.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="sessionStartDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="session_start_date"
+            length="10"
+        />
+
+        <property
+            name="sessionEndDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="session_end_date"
+            length="10"
+        />
+
+        <property
+            name="sessionStatus"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="session_status"
+            length="128"
+        />
+
+        <many-to-one
+            name="surveyContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_content_id" 
+            />
+        </many-to-one>
+
+        <set
+            name="surveyQueUsrs"
+            lazy="false"
+            inverse="true"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+              <key
+                  column="survey_session_id"
+              >
+              </key>
+
+              <one-to-many
+                  class="org.lamsfoundation.lams.tool.survey.SurveyQueUsr"
+              />
+
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveySession.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/SurveyUsrResp.hbm.xml
===================================================================
diff -u
--- lams_learning/test/java/SurveyUsrResp.hbm.xml	(revision 0)
+++ lams_learning/test/java/SurveyUsrResp.hbm.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.tool.survey.SurveyUsrResp"
+        table="tool_lasr10_survey_usr_resp"
+        dynamic-update="false"
+        dynamic-insert="false"
+        select-before-update="false"
+        optimistic-lock="version"
+    >
+
+        <id
+            name="responseId"
+            column="response_id"
+            type="java.lang.Long"
+        >
+            <generator class="increment">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-SurveyUsrResp.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="answer"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            access="property"
+            column="answer"
+            length="65535"
+        />
+
+        <property
+            name="attemptDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            access="property"
+            column="attempt_date"
+            length="19"
+        />
+
+        <many-to-one
+            name="surveyQueContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_que_content_id" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="surveyAnsContent"
+            class="org.lamsfoundation.lams.tool.survey.SurveyAnsContent"
+            cascade="save-update"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="survey_ans_content_id" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="surveyQueUsr"
+            class="org.lamsfoundation.lams.tool.survey.SurveyQueUsr"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+        >
+            <column
+                name="que_usr_id" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-SurveyUsrResp.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u
--- lams_learning/test/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(revision 0)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(revision 6b54bce389e715778dc69b45ad75efdae36acfd3)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+	<bean id="learnerServiceTarget" class="org.lamsfoundation.lams.learning.service.LearnerService" singleton="false">
+		<constructor-arg>
+			<ref bean="progressEngine"/>
+		</constructor-arg>
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
+		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
+		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="activityMapping"><ref bean="activityMapping"/></property>
+	</bean>
+	
+	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="learnerServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="joinLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="calculateProgress">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="completeToolSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="completelActivity">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="exitLesson">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="performGrouping">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="knockGate">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+   			</props>
+		</property>
+	</bean> 
+	
+	<!-- bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
+	</bean-->
+
+	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="false">
+	</bean>
+	
+	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
+		<property name="toolService"><ref bean="lamsCoreToolService"/></property>
+		<property name="baseURL"><value>http://localhost:8080/lams_learning</value></property>
+	</bean>
+	
+	<!-- bean id="dummyLearnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
+		<constructor-arg>
+			<ref bean="progressEngine"/>
+		</constructor-arg>
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+	</bean-->	
+</beans>