Index: lams_learning/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/.classpath,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/.classpath	18 Mar 2005 03:23:37 -0000	1.1
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="test/web"/>
+	<classpathentry kind="src" path="test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/struts/struts.jar"/>
+	<classpathentry kind="lib" path="lib/log4j/log4j-1.2.9.jar"/>
+	<classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-collections-2.1.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-digester.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-lang-2.0.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j/dom4j-1.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/odmg/odmg-3.0.jar"/>
+	<classpathentry sourcepath="/lams_tool_survey/src/java" kind="lib" path="lib/lams/lams-tool-survey.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/ehcache-1.0.jar"/>
+	<classpathentry kind="lib" path="web/WEB-INF/lib/mysql-connector-java-3.1.7-bin.jar"/>
+	<classpathentry sourcepath="lib/lams/src/lams-src.zip" kind="lib" path="lib/lams/lams.jar"/>
+	<classpathentry sourcepath="lib/hibernate/src/hibernate2-src.zip" kind="lib" path="lib/hibernate/hibernate2.jar"/>
+	<classpathentry kind="lib" path="lib/aopalliance/aopalliance.jar"/>
+	<classpathentry kind="lib" path="lib/spring/spring.jar"/>
+	<classpathentry kind="lib" path="lib/cglib/cglib-nodep-2.1-dev.jar"/>
+	<classpathentry kind="lib" path="lib/strutstestcase/strutstest-2.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/wddx/wddx-1.0a-lfl-0.2.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commons/commons-beanutils.jar"/>
+	<classpathentry kind="src" path="/lams_tool_survey"/>
+	<classpathentry kind="output" path="web/WEB-INF/classes"/>
+</classpath>
Index: lams_learning/.mymetadata
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/.mymetadata,v
diff -u
Binary files differ
Index: lams_learning/.mystrutsdata
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/.mystrutsdata,v
diff -u
Binary files differ
Index: lams_learning/.project
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/.project,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_learning/.project	18 Mar 2005 03:23:37 -0000	1.1
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>lams_learning</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.genuitec.eclipse.j2eedt.core.WebClasspathBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.j2eedt.core.J2EEProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.ibm.etools.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.ibm.sse.model.structuredbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
+		<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.genuitec.eclipse.cross.easystruts.eclipse.easystrutsnature</nature>
+	</natures>
+</projectDescription>
Index: lams_learning/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/build.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/build.xml	14 Mar 2005 05:02:13 -0000	1.4
+++ lams_learning/build.xml	18 Mar 2005 03:23:37 -0000	1.5
@@ -107,7 +107,18 @@
 			</fileset>
 		</copy>
 	</target>
-
+	<!-- ================================================================ -->
+	<!-- Make jar archive for deployment        		    	          -->
+	<!-- ================================================================ -->
+	<target name="build-jar" depends="compile.java" description="creates jar file">
+		<delete file="${build.lib}/${product}.jar"/>
+		<jar jarfile="${build.lib}/${product}.jar">
+			<fileset dir="${build.classes.java}">
+			</fileset>
+			<fileset dir="${build.classes.test}">
+			</fileset>			
+		</jar>
+	</target>
 	<!-- =================================================================== -->
 	<!-- Fails if XDoclet 1.2.x is not on classpath                          -->
 	<!-- =================================================================== -->
@@ -202,7 +213,7 @@
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
 	<!-- Make the war archive  for deployment             -->
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
-	<target name="lams-war" depends="compile.java, webdoclet" description="creates war file">
+	<target name="build-war" depends="compile.java, webdoclet" description="creates war file">
 		<delete file="${build.lib}/${product}.war"/>
 		<war warfile="${build.lib}/${product}.war" 
   				webxml="${conf.webinf.dir}/web.xml">
Index: lams_learning/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-actions.xml,v
diff -u -r1.4 -r1.5
--- lams_learning/conf/xdoclet/struts-actions.xml	17 Mar 2005 00:07:34 -0000	1.4
+++ lams_learning/conf/xdoclet/struts-actions.xml	18 Mar 2005 03:23:38 -0000	1.5
@@ -25,7 +25,7 @@
 
 <action path="/content"
 	type="org.apache.struts.actions.ForwardAction"
-	parameter="/learner.do?method=joinLesson&amp;userId=2&amp;lessonId=2" />
+	parameter=".welcome" />
 
 <action path="/requestDisplay"
 	type="org.apache.struts.actions.ForwardAction"
Index: lams_learning/lib/lams/lams-tool-survey.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/lib/lams/Attic/lams-tool-survey.jar,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_learning/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/lib/lams/Attic/lams.jar,v
diff -u -r1.18 -r1.19
Binary files differ
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java,v
diff -u -r1.13 -r1.14
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	16 Mar 2005 00:16:09 -0000	1.13
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	18 Mar 2005 03:23:38 -0000	1.14
@@ -60,6 +60,12 @@
      */
     public LearnerProgress getProgress(User learner, Lesson lesson);
     
+    /**
+     * Return the current progress data against progress id.
+     * @param progressId
+     * @return
+     */
+    public LearnerProgress getProgressById(Long progressId);
     
     /**
      * Marks an activity as attempted. Called when a user selects an OptionsActivity.
@@ -87,11 +93,11 @@
      * the learning design. This method is for tools to redirect the client on 
      * complete.
      * @param toolSessionId, session ID for completed tool
-     * @param learner TODO
+     * @param learner the learne who is completing the tool session.
      * @return the URL for the next activity
      * @throws LearnerServiceException in case of problems.
      */
-    public String completeToolSession(long toolSessionId, User learner);
+    public String completeToolSession(Long toolSessionId, User learner);
     
     /**
      * Retrieve all lessons that has been started, suspended or finished. All
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.24 -r1.25
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	16 Mar 2005 00:16:09 -0000	1.24
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	18 Mar 2005 03:23:38 -0000	1.25
@@ -45,7 +45,8 @@
 
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
-import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
+
 import org.lamsfoundation.lams.tool.service.LamsToolServiceException;
 import org.lamsfoundation.lams.usermanagement.User;
 /**
@@ -64,7 +65,7 @@
     private IActivityDAO activityDAO;
     private ProgressEngine progressEngine;
     private IToolSessionDAO toolSessionDAO;
-    private ILamsToolService lamsToolService;
+    private ILamsCoreToolService lamsCoreToolService;
     private ActivityMapping activityMapping;
     //---------------------------------------------------------------------
     // Inversion of Control Methods - Constructor injection
@@ -105,9 +106,9 @@
     /**
      * @param lamsToolService The lamsToolService to set.
      */
-    public void setLamsToolService(ILamsToolService lamsToolService)
+    public void setLamsCoreToolService(ILamsCoreToolService lamsToolService)
     {
-        this.lamsToolService = lamsToolService;
+        this.lamsCoreToolService = lamsToolService;
     }
     
     public void setActivityMapping(ActivityMapping activityMapping) {
@@ -198,8 +199,19 @@
         return learnerProgressDAO.getLearnerProgressByLearner(learner, lesson);
     }
     
-
-    public LearnerProgress chooseActivity(User learner, Lesson lesson, Activity activity) {
+    /**
+     * @see org.lamsfoundation.lams.learning.service.ILearnerService#getProgressById(java.lang.Long)
+     */
+    public LearnerProgress getProgressById(Long progressId)
+    {
+        return learnerProgressDAO.getLearnerProgress(progressId);
+    }
+    
+    /**
+     * @see org.lamsfoundation.lams.learning.service.ILearnerService#chooseActivity(org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.lesson.Lesson, org.lamsfoundation.lams.learningdesign.Activity)
+     */
+    public LearnerProgress chooseActivity(User learner, Lesson lesson, Activity activity) 
+    {
     	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learner, lesson);
     	progress.setProgressState(activity, LearnerProgress.ACTIVITY_ATTEMPTED);
     	learnerProgressDAO.saveLearnerProgress(progress);
@@ -248,14 +260,14 @@
      * 
      * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(long, User)
      */
-    public String completeToolSession(long toolSessionId, User learner) 
+    public String completeToolSession(Long toolSessionId, User learner) 
     {
         //update tool session state in lams
-        ToolSession toolSession = lamsToolService.getToolSessionById(new Long(toolSessionId));
+        ToolSession toolSession = lamsCoreToolService.getToolSessionById(toolSessionId);
     	
         toolSession.setToolSessionStateId(ToolSession.ENDED_STATE);
         
-        lamsToolService.updateToolSession(toolSession);
+        lamsCoreToolService.updateToolSession(toolSession);
         //build up the url for next activity.
     	try 
     	{
@@ -359,11 +371,11 @@
      */
     private void createToolSessionFor(ToolActivity toolActivity,User learner,Lesson lesson) throws LamsToolServiceException
     {
-        ToolSession toolSession = lamsToolService.createToolSession(learner,toolActivity,lesson);
+        ToolSession toolSession = lamsCoreToolService.createToolSession(learner,toolActivity,lesson);
         
         toolActivity.getToolSessions().add(toolSession);
         
-        lamsToolService.notifyToolsToCreateSession(toolSession.getToolSessionId(), toolActivity);
+        lamsCoreToolService.notifyToolsToCreateSession(toolSession.getToolSessionId(), toolActivity);
     }
     
     
@@ -383,7 +395,4 @@
         return (LessonDTO[])lessonDTOList.toArray(new LessonDTO[lessonDTOList.size()]);   
     }
 
-
-   
-
 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java,v
diff -u -r1.13 -r1.14
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	17 Mar 2005 00:07:34 -0000	1.13
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	18 Mar 2005 03:23:38 -0000	1.14
@@ -32,6 +32,7 @@
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsAction;
 import org.lamsfoundation.lams.lesson.*;
 import org.lamsfoundation.lams.learningdesign.*;
@@ -72,13 +73,16 @@
 	 */
 	protected LearnerProgress getLearnerProgress(HttpServletRequest request) {
 		
-	    LearnerProgress learnerProgress = (LearnerProgress)request.getAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE);
+	    LearnerProgress learnerProgress = (LearnerProgress)request.getSession().getAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE);
 		
 		if (learnerProgress == null) 
 		{
+		    long learnerProgressId = WebUtil.readLongParam(request,LearningWebUtil.PARAM_PROGRESS_ID);
+		    learnerProgress = getLearnerService().getProgressById(new Long(learnerProgressId));
+		    /**
 		    SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
 		    learnerProgress = sessionBean.getLearnerProgress();
-		    setSessionBean(sessionBean, request);
+		    setSessionBean(sessionBean, request);*/
 		}
 		return learnerProgress;
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java	17 Mar 2005 00:07:34 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java	18 Mar 2005 03:23:38 -0000	1.6
@@ -73,7 +73,7 @@
 		ActivityMapping actionMappings = LearnerServiceProxy.getActivityMapping(this.getServlet().getServletContext());
 		
 		SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext());
-		
+				
 		if(log.isDebugEnabled())
 		    log.debug("Entering display activity: the session bean is"
 		              + sessionBean.toString());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v
diff -u -r1.7 -r1.8
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	17 Mar 2005 00:07:34 -0000	1.7
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	18 Mar 2005 03:23:38 -0000	1.8
@@ -187,6 +187,7 @@
         request.getSession().setAttribute(SessionBean.NAME,new SessionBean(learner,
                                                                            lesson,
                                                                            learnerProgress));
+        request.getSession().setAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE,learnerProgress);
 
         //serialize a acknowledgement flash message with the path of display next
         //activity
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	17 Mar 2005 00:07:34 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	18 Mar 2005 03:23:37 -0000	1.6
@@ -39,7 +39,7 @@
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSession;
-import org.lamsfoundation.lams.tool.service.ILamsToolService;
+import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.tool.service.LamsToolServiceException;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -66,7 +66,7 @@
 
     private ActivityMappingStrategy activityMappingStrategy = new ActivityMappingStrategy();
 
-    private ILamsToolService toolService;
+    private ILamsCoreToolService toolService;
     private String baseURL;
 
     /**
@@ -199,7 +199,7 @@
             // cause a client request to clear ALL frames.
             String strutsAction = this.getActivityMappingStrategy()
                                       .getLessonCompleteAction();
-            activityURL = strutsActionToURL(strutsAction, null, true);
+            return activityURL = strutsActionToURL(strutsAction, null, true);
         }
         else
         {
@@ -231,7 +231,8 @@
             }
         }
 
-        return activityURL;
+        return activityURL+"&"+LearningWebUtil.PARAM_PROGRESS_ID+"="
+        	   +progress.getLearnerProgressId();
     }
 
     /**
@@ -345,7 +346,7 @@
                 + " for activity[" + activity.getActivityId().longValue() + "]");
     }
 
-    public void setToolService(ILamsToolService toolService)
+    public void setToolService(ILamsCoreToolService toolService)
     {
         this.toolService = toolService;
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.2 -r1.3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	16 Mar 2005 00:16:10 -0000	1.2
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	18 Mar 2005 03:23:37 -0000	1.3
@@ -28,6 +28,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
+import org.lamsfoundation.lams.learning.web.action.ActivityAction;
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -51,8 +52,10 @@
     //---------------------------------------------------------------------
 	public static final String PARAM_USER_ID = "userId";
 	public static final String PARAM_LESSON_ID = "lessonId";
-	public static final String ATTR_USERDATA = "user";
+	public static final String ATTR_USER_DATA = "user";
+	public static final String ATTR_LESSON_DATA ="lesson";
 	public static final String PARAM_ACTIVITY_ID = "activityId";
+	public static final String PARAM_PROGRESS_ID = "progressId";
     
     /**
      * Helper method to retrieve the user data. We always load up from http
@@ -67,7 +70,7 @@
     {
         //retrieve complete user data from http session
         User currentUser = (User) request.getSession()
-                                              .getAttribute(ATTR_USERDATA);
+                                              .getAttribute(ATTR_USER_DATA);
         if(log.isDebugEnabled()&&currentUser!=null)
             log.debug("user retrieved from http session:"+currentUser.getUserId());
         
@@ -81,7 +84,7 @@
                 log.debug("user retrieved from database:"+currentUser.getUserId());
             
             //create session cache
-            request.getSession().setAttribute(ATTR_USERDATA, currentUser);
+            request.getSession().setAttribute(ATTR_USER_DATA, currentUser);
         }
         return currentUser;
     }
@@ -96,11 +99,17 @@
      */
     public static Lesson getLessonData(HttpServletRequest request, ServletContext servletContext)
     {
-        //initialize service object
-        ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext);
-
-        long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
-        return learnerService.getLesson(new Long(lessonId));
+        Lesson lesson = (Lesson)request.getAttribute(ATTR_LESSON_DATA);
+        
+        if(lesson ==null)
+        {
+            //initialize service object
+            ILearnerService learnerService = LearnerServiceProxy.getLearnerService(servletContext);
+            long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
+            lesson = learnerService.getLesson(new Long(lessonId));
+            request.getSession().setAttribute(ATTR_LESSON_DATA,lesson);
+        }
+        return lesson;
     }
     
     /**
@@ -123,8 +132,10 @@
             User currentLearner = getUserData(request, servletContext);
             Lesson lesson = getLessonData(request,servletContext);
             LearnerProgress progress = learnerService.getProgress(currentLearner,lesson);
-            
             bean = new SessionBean(currentLearner,lesson,progress);
+            
+            request.getSession().setAttribute(SessionBean.NAME,bean);
+            request.getSession().setAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE,progress);
         }
         return bean;
     }
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/service/Attic/TestLearnerService.java,v
diff -u -r1.13 -r1.14
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	16 Mar 2005 00:16:10 -0000	1.13
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	18 Mar 2005 03:23:38 -0000	1.14
@@ -146,14 +146,14 @@
 
     public void testCompleteToolSession()
     {
-        String urlForNextActivity = learnerService.completeToolSession(TEST_TOOL_SESSION_ID,testUser);
+        String urlForNextActivity = learnerService.completeToolSession(new Long(TEST_TOOL_SESSION_ID),testUser);
         
         ToolSession toolSession = toolSessionDao.getToolSession(new Long(TEST_TOOL_SESSION_ID));
         
         assertNotNull("verify the existance of tool session",toolSession);
         assertEquals("verify tool session state",ToolSession.ENDED_STATE,toolSession.getToolSessionStateId());
         
-        assertEquals("verify the returned url",HOST+LOAD_TOOL_URL+PARAM_ACTIVITY_ID+TEST_NB_ACTIVITY_ID,urlForNextActivity);
+        assertEquals("verify the returned url",HOST+LOAD_TOOL_URL+PARAM_ACTIVITY_ID+TEST_NB_ACTIVITY_ID+"progressId=1",urlForNextActivity);
         
     }
     
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/Attic/DummyToolAction.java,v
diff -u -r1.7 -r1.8
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	2 Mar 2005 12:12:26 -0000	1.7
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java	18 Mar 2005 03:23:37 -0000	1.8
@@ -81,7 +81,7 @@
 		
 		ILearnerService learnerService = (LearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext());
 		//learnerService.setRequest(request);
-		String url = learnerService.completeToolSession(toolSessionId, null);
+		String url = learnerService.completeToolSession(new Long(toolSessionId), null);
 		try {
 			response.sendRedirect(url);
 		}
Index: lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/web/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml	16 Mar 2005 00:16:10 -0000	1.3
+++ lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml	18 Mar 2005 03:23:40 -0000	1.4
@@ -18,7 +18,7 @@
 		<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="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
 		<property name="activityDAO"><ref bean="activityDAO"/></property>
 		<property name="activityMapping"><ref bean="activityMapping"/></property>
 	</bean>
@@ -43,8 +43,8 @@
 	</bean>
 	
 	<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>
+		<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">
Index: lams_learning/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v
diff -u -r1.2 -r1.3
--- lams_learning/web/main.jsp	17 Mar 2005 00:07:34 -0000	1.2
+++ lams_learning/web/main.jsp	18 Mar 2005 03:23:37 -0000	1.3
@@ -41,7 +41,7 @@
 
 	<frameset rows="*" cols="178,*">
 		<frame src="controlFrame.jsp" name="controlFrame" scrolling="NO">
-		<frame src="learner.do?method=joinLesson&userId=2&lessonId=2" name="contentFrame" scrolling="YES">
+		<frame src="content.do" name="contentFrame" scrolling="YES">
 	</frameset>
 	
 	<noframes>
Index: lams_learning/web/welcome.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/welcome.jsp,v
diff -u -r1.1 -r1.2
--- lams_learning/web/welcome.jsp	10 Mar 2005 00:34:14 -0000	1.1
+++ lams_learning/web/welcome.jsp	18 Mar 2005 03:23:37 -0000	1.2
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://jakarta.apache.org/struts/struts-html" prefix="html"%>
 
 <table width="100%" height="295" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
 	<tr> 
@@ -8,4 +9,11 @@
           	</div>
         </td>
     </tr>
+    <TR>
+		<TD>
+			<html:link href="/lams_learning/learner.do?method=joinLesson&userId=2&lessonId=2" target="_self" >
+				Join a started Lesson
+			</html:link>
+		</TD>
+    </TR>
 </table>
Index: lams_learning/web/WEB-INF/lib/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/lib/Attic/lams.jar,v
diff -u -r1.7 -r1.8
Binary files differ
Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.12 -r1.13
--- lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	17 Mar 2005 00:07:34 -0000	1.12
+++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml	18 Mar 2005 03:23:40 -0000	1.13
@@ -18,7 +18,7 @@
 		<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="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
 		<property name="activityDAO"><ref bean="activityDAO"/></property>
 		<property name="activityMapping"><ref bean="activityMapping"/></property>
 	</bean>
@@ -43,7 +43,7 @@
 	</bean>
 	
 	<bean id="activityMapping" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
-		<property name="toolService"><ref bean="lamsToolService"/></property>
+		<property name="toolService"><ref bean="lamsCoreToolService"/></property>
 		<property name="baseURL"><value>http://localhost:8080/lams_learning/</value></property>
 	</bean>
 	
Index: lams_learning/web/WEB-INF/spring/toolApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/spring/Attic/toolApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_learning/web/WEB-INF/spring/toolApplicationContext.xml	2 Mar 2005 12:12:25 -0000	1.1
+++ lams_learning/web/WEB-INF/spring/toolApplicationContext.xml	18 Mar 2005 03:23:40 -0000	1.2
@@ -32,16 +32,16 @@
 		</property>
 	</bean>
 	
-	<bean id="lamsToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsToolService"
+	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService"
 		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">
+	<bean id="lamsCoreToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref local="lamsToolServiceTarget"/></property>
+		<property name="target"><ref local="lamsCoreToolServiceTarget"/></property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="createToolSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
Index: lams_learning/web/WEB-INF/struts/.struts-config.mex
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/.struts-config.mex,v
diff -u -r1.3 -r1.4
Binary files differ
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.11 -r1.12
--- lams_learning/web/WEB-INF/struts/struts-config.xml	17 Mar 2005 00:07:35 -0000	1.11
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	18 Mar 2005 03:23:38 -0000	1.12
@@ -293,7 +293,7 @@
 
 <action path="/content"
 	type="org.apache.struts.actions.ForwardAction"
-	parameter="/learner.do?method=joinLesson&amp;userId=2&amp;lessonId=2" />
+	parameter=".welcome" />
 
 <action path="/requestDisplay"
 	type="org.apache.struts.actions.ForwardAction"
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.6 -r1.7
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	10 Mar 2005 00:34:13 -0000	1.6
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	18 Mar 2005 03:23:38 -0000	1.7
@@ -67,7 +67,7 @@
 	</definition>
 	<definition name=".welcome" extends=".activityLayout">
 		<put name="title" value="Welcome"/>
-		<put name="body" value="welcome.jsp"/>
+		<put name="body" value="/welcome.jsp"/>
 	</definition>
 	
 	<!-- Journal definitions -->