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.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	8 Feb 2005 04:30:32 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	17 Feb 2005 00:18:04 -0000	1.5
@@ -7,7 +7,6 @@
 package org.lamsfoundation.lams.learning.service;
 
 import java.util.List;
-import java.util.Set;
 
 import org.lamsfoundation.lams.learning.progress.ProgressException;
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -47,7 +46,7 @@
      * @param lessionID identifies the Lesson to start
      * @throws LearnerServiceException in case of problems.
      */
-    public LearnerProgress startLesson(User learner, Lesson lesson) throws ProgressException;
+    public LearnerProgress joinLesson(User learner, Lesson lesson) throws ProgressException;
     
 
     /**
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.3 -r1.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	8 Feb 2005 04:30:32 -0000	1.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	17 Feb 2005 00:18:04 -0000	1.4
@@ -6,7 +6,6 @@
 package org.lamsfoundation.lams.learning.service;
 
 import java.util.List;
-import java.util.Set;
 
 import org.lamsfoundation.lams.learning.progress.ProgressEngine;
 import org.lamsfoundation.lams.learning.progress.ProgressException;
@@ -15,9 +14,11 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 
 import org.lamsfoundation.lams.lesson.Lesson;
-import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
+
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO;
+import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
+
 import org.lamsfoundation.lams.usermanagement.User;
 /**
  * This class is a facade over the Learning middle tier.
@@ -27,10 +28,13 @@
 {
     private ILearnerProgressDAO learnerProgressDAO = null;
     private ILessonDAO lessonDAO = null;
-    
+    private ProgressEngine progressEngine;
+
+   
     /** Creates a new instance of LearnerService */
-    public LearnerService()
+    public LearnerService(ProgressEngine progressEngine)
     {
+        this.progressEngine = progressEngine;
     }
 
     /**
@@ -51,15 +55,14 @@
     
  
     /**
-     * Joins a User to a a new lesson as a learner
+     * Joins a User to a new lesson as a learner
      * @param learner the Learner
      * @param lessionID identifies the Lesson to start
      * @throws LearnerServiceException in case of problems.
      */
-    public LearnerProgress startLesson(User learner, Lesson lesson) throws ProgressException
+    public LearnerProgress joinLesson(User learner, Lesson lesson) throws ProgressException
     {
-        //return ProgressEngine.startLesson(learner, lesson);
-    	LearnerProgress learnerProgress = new ProgressEngine().getStartPoint(learner, lesson);
+    	LearnerProgress learnerProgress = progressEngine.getStartPoint(learner, lesson);
     	return learnerProgress;
     }
     
@@ -95,7 +98,7 @@
      */
     public LearnerProgress calculateProgress(Activity completedActivity, User learner, Lesson lesson) throws ProgressException
     {
-    	return new ProgressEngine().calculateProgress(learner, lesson, completedActivity);
+    	return progressEngine.calculateProgress(learner, lesson, completedActivity);
     }
     
 
@@ -127,4 +130,5 @@
 	public void setLessonDAO(ILessonDAO lessonDAO) {
 		this.lessonDAO = lessonDAO;
 	}
+
 }
Index: lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/test/java/WEB-INF/spring/Attic/learningApplicationContext.xml,v
diff -u -r1.2 -r1.3
--- lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	8 Feb 2005 04:42:01 -0000	1.2
+++ lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	17 Feb 2005 00:19:32 -0000	1.3
@@ -12,8 +12,12 @@
 	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="learnerService" class="org.lamsfoundation.lams.learning.service.TestLearnerService" singleton="false">
+		<construtor-arg>
+			<ref bean="progressEngine"/>
+		</construtor-arg>
 		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
 	</bean>
 
-
+	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.ProgressEngine.java" singleton="false">
+	</bean>
 </beans>