Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
===================================================================
diff -u -rdfb1ce22125fb80478d8126989c3800ebc7c0d70 -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(.../ILearnerProgressDAO.java)	(revision dfb1ce22125fb80478d8126989c3800ebc7c0d70)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(.../ILearnerProgressDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -27,7 +27,7 @@
      * Saves or Updates learner progress data.
      * @param learnerProgress holds the learne progress data
      */
-    public void saveOrUpdateLearnerProgress(LearnerProgress learnerProgress);
+    public void saveLearnerProgress(LearnerProgress learnerProgress);
     
     /**
      * Deletes a LearnerProgress data <b>permanently</b>.
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonClassDAO.java
===================================================================
diff -u -rdfb1ce22125fb80478d8126989c3800ebc7c0d70 -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonClassDAO.java	(.../ILessonClassDAO.java)	(revision dfb1ce22125fb80478d8126989c3800ebc7c0d70)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonClassDAO.java	(.../ILessonClassDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -26,7 +26,7 @@
      * Saves or Updates a Lesson.
      * @param lesson the Lesson to save
      */
-    public void saveOrUpdateLessonClass(LessonClass lessonClass);
+    public void saveLessonClass(LessonClass lessonClass);
     
     /**
      * Deletes a Lesson <b>permanently</b>.
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
===================================================================
diff -u -rdfb1ce22125fb80478d8126989c3800ebc7c0d70 -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(.../ILessonDAO.java)	(revision dfb1ce22125fb80478d8126989c3800ebc7c0d70)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(.../ILessonDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -37,7 +37,7 @@
      * Saves or Updates a Lesson.
      * @param lesson the Lesson to save
      */
-    public void saveOrUpdateLesson(Lesson lesson);
+    public void saveLesson(Lesson lesson);
     
     /**
      * Deletes a Lesson <b>permanently</b>.
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
===================================================================
diff -u -r610914022aed01fa94e57540ea63bc1489dab3dd -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision 610914022aed01fa94e57540ea63bc1489dab3dd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -33,7 +33,7 @@
      * Saves or Updates learner progress data.
      * @param learnerProgress holds the learne progress data
      */
-    public void saveOrUpdateLearnerProgress(LearnerProgress learnerProgress)
+    public void saveLearnerProgress(LearnerProgress learnerProgress)
     {
         getHibernateTemplate().save(learnerProgress);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java
===================================================================
diff -u -r610914022aed01fa94e57540ea63bc1489dab3dd -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java	(.../LessonClassDAO.java)	(revision 610914022aed01fa94e57540ea63bc1489dab3dd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonClassDAO.java	(.../LessonClassDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -27,7 +27,7 @@
      * Saves or Updates a Lesson.
      * @param lesson
      */
-    public void saveOrUpdateLessonClass(LessonClass lessonClass)
+    public void saveLessonClass(LessonClass lessonClass)
     {
         getHibernateTemplate().save(lessonClass);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
diff -u -r610914022aed01fa94e57540ea63bc1489dab3dd -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision 610914022aed01fa94e57540ea63bc1489dab3dd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -15,6 +15,8 @@
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataRetrievalFailureException;
+import org.springframework.orm.hibernate.HibernateCallback;
+import org.springframework.orm.hibernate.HibernateTemplate;
 import org.springframework.orm.hibernate.support.HibernateDaoSupport;
 
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
@@ -43,26 +45,38 @@
      * @param learner a User that identifies the learner.
      * @return a List with all active lessons in it.
      */
-    public List getActiveLessonsForLearner(User learner)
+    public List getActiveLessonsForLearner(final User learner)
     {
     	List lessons = null;
-    	Session session = this.getSession();
+    	
+        HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory());
+    	lessons = (List)hibernateTemplate.execute(
+            new HibernateCallback() {
+                public Object doInHibernate(Session session) throws HibernateException {
+        	    	Query query = session.getNamedQuery("activeLessons");
+        	    	query.setInteger("userId", learner.getUserId().intValue());
+        	    	List result = query.list();
+                    return result;
+                }
+            }
+        );
+    	/*Session session = this.getSession();
     	try {
 	    	Query query = session.getNamedQuery("activeLessons");
 	    	query.setInteger("userId", learner.getUserId().intValue());
 	    	lessons = query.list();
     	}
     	catch (HibernateException e) {
     		throw new DataRetrievalFailureException(e.getMessage(), e);
-    	}
+    	}*/
         return lessons;
     }
     
     /**
      * Saves or Updates a Lesson.
      * @param lesson
      */
-    public void saveOrUpdateLesson(Lesson lesson)
+    public void saveLesson(Lesson lesson)
     {
         getHibernateTemplate().save(lesson);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java
===================================================================
diff -u -r363b19286e2a0bc8ffa22eb1b7f38b5b62f19232 -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java	(.../IToolSessionDAO.java)	(revision 363b19286e2a0bc8ffa22eb1b7f38b5b62f19232)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java	(.../IToolSessionDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -22,6 +22,6 @@
      */
     public ToolSession getToolSession(Long toolSessionId);
     
-    public void saveOrUpdateToolSession(ToolSession toolSession);
+    public void saveToolSession(ToolSession toolSession);
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java
===================================================================
diff -u -r610914022aed01fa94e57540ea63bc1489dab3dd -rc3b4b51a62bf1841f6d6667a26b47019e607d3c4
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java	(.../ToolSessionDAO.java)	(revision 610914022aed01fa94e57540ea63bc1489dab3dd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java	(.../ToolSessionDAO.java)	(revision c3b4b51a62bf1841f6d6667a26b47019e607d3c4)
@@ -28,7 +28,7 @@
         return (ToolSession)getHibernateTemplate().get(ToolSession.class, toolSessionId);
     }
 	
-    public void saveOrUpdateToolSession(ToolSession toolSession)
+    public void saveToolSession(ToolSession toolSession)
     {
         getHibernateTemplate().save(toolSession);
     }