Index: lams_learning/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -27,5 +27,6 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
+		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml				  
 	</param-value>
 </context-param>
Index: lams_learning/lib/cglib/cglib-nodep-2.1-dev.jar
===================================================================
diff -u
Binary files differ
Index: lams_learning/lib/lams/lams.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
Binary files differ
Index: lams_learning/lib/lams/src/lams-src.zip
===================================================================
diff -u -r61ab8aad9c6a33202b47ca6089e89653b5131b09 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -93,7 +93,7 @@
      * @return the bean containing the display data for the Learner
      * @throws LearnerServiceException in case of problems.
      */
-    public LearnerProgress calculateProgress(Activity completedActivity, User learner, Lesson lesson) throws ProgressException;
+    public LearnerProgress calculateProgress(Activity completedActivity, User learner, Lesson lesson); 
 
     
     /**
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -60,7 +60,7 @@
     private ProgressEngine progressEngine;
     private IToolSessionDAO toolSessionDAO;
     private ILamsToolService lamsToolService;
-    private ActivityMapping activityMappings;
+    private ActivityMapping activityMapping;
     //---------------------------------------------------------------------
     // Inversion of Control Methods - Constructor injection
     //---------------------------------------------------------------------
@@ -105,8 +105,8 @@
         this.lamsToolService = lamsToolService;
     }
     
-    public void setActivityMappings(ActivityMapping activityMappings) {
-		this.activityMappings = activityMappings;
+    public void setActivityMapping(ActivityMapping activityMapping) {
+		this.activityMapping = activityMapping;
 	}
     //---------------------------------------------------------------------
     // Service Methods
@@ -129,7 +129,18 @@
     
  
     /**
-     * Joins a User to a new lesson as a learner
+     * <p>Joins a User to a lesson as a learner. It could either be a new lesson
+     * or a lesson that has been started.</p>
+     * 
+     * <p>In terms of new lesson, a new learner progress would be initialized.
+     * Tool session for the next activity will be initialized if necessary.</p>
+     * 
+     * <p>In terms of an started lesson, the learner progress will be returned
+     * without calculation. Tool session will be initialized if necessary.
+     * Note that we won't initialize tool session for current activity because
+     * we assume tool session will always initialize before it becomes a 
+     * current activity.</p
+     * 
      * @param learner the Learner
      * @param lessionID identifies the Lesson to start
      * @throws LamsToolServiceException
@@ -179,22 +190,37 @@
     /**
      * Calculates learner progress and returns the data required to be displayed 
      * to the learner.
+     * TODO need to initialize tool session for next activity if necessary.
      * @param completedActivityID identifies the activity just completed
      * @param learner the Learner
      * @param lesson the Lesson in progress.
      * @return the bean containing the display data for the Learner
+     * @throws LamsToolServiceException
      * @throws LearnerServiceException in case of problems.
      */
     public LearnerProgress calculateProgress(Activity completedActivity, 
                                              User learner, 
-                                             Lesson lesson) throws ProgressException
+                                             Lesson lesson) 
     {
         LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learner,lesson);
 
-        learnerProgress = progressEngine.calculateProgress(learner, lesson, completedActivity,learnerProgress);
+        try
+        {
+            learnerProgress = progressEngine.calculateProgress(learner, lesson, completedActivity,learnerProgress);
+            learnerProgressDAO.updateLearnerProgress(learnerProgress);
+            
+            createToolSessionsIfNecessary(learnerProgress);
+        }
+        catch (ProgressException e)
+        {
+            throw new LearnerServiceException(e.getMessage());
+        }
+        catch (LamsToolServiceException e)
+        {
+            throw new LearnerServiceException(e.getMessage());
+        }
 
-        learnerProgressDAO.updateLearnerProgress(learnerProgress);
-        
+
         return learnerProgress;
     }
     
@@ -214,12 +240,8 @@
     	try 
     	{
 	    	LearnerProgress nextLearnerProgress = calculateProgress(toolSession.getToolActivity(), learner, toolSession.getLesson());
-	    	return activityMappings.getProgressURL(nextLearnerProgress);
+	    	return activityMapping.getProgressURL(nextLearnerProgress);
     	}
-    	catch (ProgressException e) 
-    	{
-    		throw new LearnerServiceException(e.getMessage());
-    	}
         catch (UnsupportedEncodingException e)
         {
     		throw new LearnerServiceException(e.getMessage());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -26,8 +26,8 @@
 import java.util.*;
 
 import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learning.service.LearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
-import org.lamsfoundation.lams.learning.service.DummyLearnerService;
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
@@ -51,9 +51,9 @@
 	/**
 	 * Get the learner service.
 	 */
-	protected ILearnerService getLearnerService(HttpServletRequest request) {
-		DummyLearnerService learnerService = (DummyLearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
-		learnerService.setRequest(request);
+	protected ILearnerService getLearnerService() {
+		ILearnerService learnerService = (LearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
+		//learnerService.setRequest(request);
 		//learnerService.setActionMappings(actionMappings);
 		return learnerService;
 	}
@@ -79,7 +79,7 @@
 			User learner = sessionBean.getLearner();
 			Lesson lesson = sessionBean.getLesson();
 			
-			ILearnerService learnerService = getLearnerService(request);
+			ILearnerService learnerService = getLearnerService();
 			learnerProgress = learnerService.getProgress(learner, lesson);
 			
 			// Save progress in session for Flash request
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
===================================================================
diff -u -r4e049aced5079eff1ff599aa4572624cc0314e59 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	(.../ChooseActivityAction.java)	(revision 4e049aced5079eff1ff599aa4572624cc0314e59)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	(.../ChooseActivityAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -86,7 +86,7 @@
 			return mapping.findForward(ActivityMapping.ERROR);
 		}
 
-		ILearnerService learnerService = getLearnerService(request);
+		ILearnerService learnerService = getLearnerService();
 		learnerService.chooseActivity(learner, lesson, activity);
 		
 		ActionForward forward = actionMappings.getActivityForward(activity, progress, true);
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
===================================================================
diff -u -r4e049aced5079eff1ff599aa4572624cc0314e59 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision 4e049aced5079eff1ff599aa4572624cc0314e59)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -28,6 +28,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.progress.ProgressException;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -89,13 +90,13 @@
 			return mapping.findForward(ActivityMapping.ERROR);
 		}
 
-		ILearnerService learnerService = getLearnerService(request);
+		ILearnerService learnerService = getLearnerService();
 		
 		// Set activity as complete
 		try {
 			progress = learnerService.calculateProgress(activity, learner, lesson);
 		}
-		catch (ProgressException e) {
+		catch (LearnerServiceException e) {
 			return mapping.findForward("error");
 		}
 		request.setAttribute(ActivityAction.ACTIVITY_REQUEST_ATTRIBUTE, progress.getNextActivity());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
===================================================================
diff -u -r4e049aced5079eff1ff599aa4572624cc0314e59 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java	(.../DisplayActivityAction.java)	(revision 4e049aced5079eff1ff599aa4572624cc0314e59)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java	(.../DisplayActivityAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -29,7 +29,6 @@
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 
-import org.lamsfoundation.lams.usermanagement.*;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learningdesign.*;
 import org.lamsfoundation.lams.lesson.*;
@@ -67,8 +66,8 @@
 		}
 		
 		// Get learner
-		User learner = sessionBean.getLearner();
-		Lesson lesson = sessionBean.getLesson();
+		//User learner = sessionBean.getLearner();
+		//Lesson lesson = sessionBean.getLesson();
 		
 		LearnerProgress learnerProgress = getLearnerProgress(request, form);
 		Activity activity = getActivity(request, form, learnerProgress);
Index: lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -19,7 +19,7 @@
 		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
 		<property name="lamsToolService"><ref bean="lamsToolService"/></property>
-		<property name="activityMappings"><ref bean="activityMappings"/></property>
+		<property name="activityMapping"><ref bean="activityMapping"/></property>
 	</bean>
 	
 	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -34,21 +34,21 @@
 		</property>
 	</bean> 
 	
-	<bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
-	</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="activityMappings" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
-		<property name="toolService"><ref bean="toolService"/></property>
+	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
+		<property name="toolService"><ref bean="lamsToolService"/></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">
+	<!-- 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>	
+	</bean-->	
 </beans>
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -70,8 +70,8 @@
 		this.request = request;
 	}
 	
-	public void setActivityMapping(ActivityMapping actionMappings) {
-		this.activityMapping = actionMappings;
+	public void setActivityMapping(ActivityMapping actionMapping) {
+		this.activityMapping = actionMapping;
 	}
 
 	private LearnerProgress getProgress() {
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java
===================================================================
diff -u -rcd9dd16d2a3966104ea1b84097d819c2578e9333 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java	(.../DummyLessonAction.java)	(revision cd9dd16d2a3966104ea1b84097d819c2578e9333)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyLessonAction.java	(.../DummyLessonAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -32,7 +32,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
-import org.lamsfoundation.lams.learning.service.DummyLearnerService;
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -53,6 +52,10 @@
  */
 public class DummyLessonAction extends Action {
 	
+    
+    private static final Integer TEST_USER_ID = new Integer(1);
+    private static final Long TEST_ACTIVITY_ID = new Long(36);
+    
 	/**
 	 * Gets the session bean from session.
 	 * @return SessionBean for this request, null if no session.
@@ -86,14 +89,14 @@
 		
 		SessionBean sessionBean = new SessionBean();
 		IUserManagementService userService = getUserService(this.servlet.getServletContext());
-		User user = userService.getUserById(new Integer(1));
+		User user = userService.getUserById(TEST_USER_ID);
 		sessionBean.setLearner(user);
 		setSessionBean(sessionBean, request);
 
-		DummyLearnerService learnerService = (DummyLearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
-		learnerService.setRequest(request);
-		learnerService.clearProgress();
-		activityForm.setActivityId(new Long(1));
+		ILearnerService learnerService = LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
+		//learnerService.setRequest(request);
+		//learnerService.clearProgress();
+		activityForm.setActivityId(TEST_ACTIVITY_ID);
 		
 		ActionForward forward = mapping.findForward("displayLesson");
 		return forward;
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	(.../DummyToolAction.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	(.../DummyToolAction.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -30,8 +30,9 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learning.service.LearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
-import org.lamsfoundation.lams.learning.service.DummyLearnerService;
 import org.lamsfoundation.lams.learning.web.form.DummyToolForm;
 
 
@@ -78,8 +79,8 @@
 		}
 		long toolSessionId = testForm.getToolSessionId().longValue();
 		
-		DummyLearnerService learnerService = (DummyLearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
-		learnerService.setRequest(request);
+		ILearnerService learnerService = (LearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
+		//learnerService.setRequest(request);
 		String url = learnerService.completeToolSession(toolSessionId, null);
 		try {
 			response.sendRedirect(url);
Index: lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java	(.../DummyToolService.java)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java	(.../DummyToolService.java)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -73,4 +73,31 @@
         return null;
     }
 
+    /**
+     * @see org.lamsfoundation.lams.tool.service.ILamsToolService#getToolSessionByLearner(org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.learningdesign.Activity)
+     */
+    public ToolSession getToolSessionByLearner(User arg0, Activity arg1) throws LamsToolServiceException
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.tool.service.ILamsToolService#getToolSessionById(java.lang.Long)
+     */
+    public ToolSession getToolSessionById(Long arg0)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.tool.service.ILamsToolService#updateToolSession(org.lamsfoundation.lams.tool.ToolSession)
+     */
+    public void updateToolSession(ToolSession arg0)
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
 }
Index: lams_learning/web/WEB-INF/lib/cglib-nodep-2.1-dev.jar
===================================================================
diff -u
Binary files differ
Index: lams_learning/web/WEB-INF/lib/lams.jar
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
Binary files differ
Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
diff -u -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1)
+++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-USA
-
-http://www.gnu.org/licenses/gpl.txt
--->
 <!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="learnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
+	<!-- bean id="learnerService" class="org.lamsfoundation.lams.learning.service.DummyLearnerService" singleton="false">
 		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
 		<property name="activityMapping"><ref local="activityMapping"/></property>
-	</bean>
+	</bean-->
 	
-	<bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
+	<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="lamsToolService"><ref bean="lamsToolService"/></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_REQUIRES_NEW,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="toolService" /></property>
+		<property name="toolService"><ref bean="lamsToolService"/></property>
 		<property name="baseURL"><value>http://localhost:8080/lams_learning/</value></property>
 	</bean>
 	
-
-	<!-- bean id="notebookService" class="org.lamsfoundation.lams.notebook.service.NotebookService" singleton="false">
-		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO"/></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>
Index: lams_learning/web/WEB-INF/spring/lessonApplicationContext.xml
===================================================================
diff -u
--- lams_learning/web/WEB-INF/spring/lessonApplicationContext.xml	(revision 0)
+++ lams_learning/web/WEB-INF/spring/lessonApplicationContext.xml	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -0,0 +1,25 @@
+<?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>
+
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+	
+	<!-- lesson package -->
+
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+</beans>
Index: lams_learning/web/WEB-INF/spring/toolApplicationContext.xml
===================================================================
diff -u
--- lams_learning/web/WEB-INF/spring/toolApplicationContext.xml	(revision 0)
+++ lams_learning/web/WEB-INF/spring/toolApplicationContext.xml	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -0,0 +1,55 @@
+<?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>
+
+	<bean id="toolContentDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolContentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="toolSessionDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
+		singleton="true"
+	>
+		<property name="toolContentDao"><ref local="toolContentDAO"/></property>
+	</bean>	
+	
+	<bean id="toolContentIDGenerator" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="toolContentIDGeneratorTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="getNextToolContentIDFor">PROPAGATION_REQUIRES_NEW,ISOLATION_READ_COMMITTED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="lamsToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsToolService"
+		singleton="false"
+	>
+		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
+		<property name="contentIDGenerator"><ref bean="toolContentIDGenerator"/></property>	
+	</bean>	
+	
+	<bean id="lamsToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="lamsToolServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="createToolSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<prop key="notifyToolsToCreateSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+			    <prop key="update*">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+			    <prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>   	
+	
+</beans>
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r4e049aced5079eff1ff599aa4572624cc0314e59 -rf0f13cd7ba427bab1d37dc3a8a14e290c98245ef
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 4e049aced5079eff1ff599aa4572624cc0314e59)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision f0f13cd7ba427bab1d37dc3a8a14e290c98245ef)
@@ -32,6 +32,7 @@
 	<param-name>contextConfigLocation</param-name>
 	<param-value>
 		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
+		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml				  
 	</param-value>
 </context-param>