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.49 -r1.50
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	18 Jun 2006 13:06:54 -0000	1.49
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	18 Jun 2006 18:01:01 -0000	1.50
@@ -181,7 +181,7 @@
      */
     public LessonDTO[] getActiveLessonsFor(Integer learnerId)
     {
-    	User learner = userManagementService.getUserById(learnerId);
+    	User learner = (User)userManagementService.findById(User.class,learnerId);
         List activeLessons = this.lessonDAO.getActiveLessonsForLearner(learner);
         return getLessonDataFor(activeLessons);
     }
@@ -221,7 +221,7 @@
      */
     public LearnerProgress joinLesson(Integer learnerId, Long lessonID)  
     {
-    	User learner = userManagementService.getUserById(learnerId);
+    	User learner = (User)userManagementService.findById(User.class,learnerId);
     	
     	Lesson lesson = getLesson(lessonID);
         LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learner.getUserId(),lessonID);
@@ -404,7 +404,7 @@
     public boolean performGrouping(Long lessonId, Long groupingActivityId, Integer learnerId, boolean forceGrouping) throws LearnerServiceException
     {
     	GroupingActivity groupingActivity = (GroupingActivity) activityDAO.getActivityByActivityId(groupingActivityId, GroupingActivity.class);
-    	User learner = userManagementService.getUserById(learnerId);
+    	User learner = (User)userManagementService.findById(User.class,learnerId);
     	
     	boolean groupingDone = false;
     	try {
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.27 -r1.28
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	18 Jun 2006 13:06:54 -0000	1.27
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	18 Jun 2006 18:01:00 -0000	1.28
@@ -371,7 +371,7 @@
 	
 	        //getting requested object according to coming parameters
 	        Integer learnerId = LearningWebUtil.getUserId();
-	        User learner = LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).getUserById(learnerId);
+	        User learner = (User)LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(User.class,learnerId);
 
 	        Activity requestedActivity = learnerService.getActivity(new Long(activityId));