Index: lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java
===================================================================
diff -u -r6e59ce4878d3f44cf14542a284c749258f2a9039 -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java	(.../AbstractLamsStrutsTestCase.java)	(revision 6e59ce4878d3f44cf14542a284c749258f2a9039)
+++ lams_common/test/java/org/lamsfoundation/lams/AbstractLamsStrutsTestCase.java	(.../AbstractLamsStrutsTestCase.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -57,18 +57,18 @@
 public abstract class AbstractLamsStrutsTestCase extends MockStrutsTestCase
 {
     //protected ApplicationContext context;
-    private final String CONFIG_LOCATIONS;
+    //private String CONFIG_LOCATIONS;
     protected HttpServletRequestSimulator httpRequest;
     protected HttpSession httpSession ; 
     protected WebApplicationContext wac;
     
     /**
      * @param arg0
      */
-    public AbstractLamsStrutsTestCase(String testName,String location)
+    public AbstractLamsStrutsTestCase(String testName)
     {
         super(testName);
-        this.CONFIG_LOCATIONS = location;
+        //this.CONFIG_LOCATIONS = location;
         
     }
     
@@ -85,7 +85,7 @@
         context.setInitParameter(ContextLoader.CONTEXT_CLASS_PARAM,
                                  XmlWebApplicationContext.class.getName());
         context.setInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
-                                 CONFIG_LOCATIONS);
+                                 getContextConfigLocation());
         ctxLoader.initWebApplicationContext(context);
         
         wac = WebApplicationContextUtils.getRequiredWebApplicationContext(context);
@@ -108,7 +108,7 @@
     protected void initializeHibernateSession() throws HibernateException
     {
         //hold the hibernate session
-		SessionFactory sessionFactory = (SessionFactory) this.wac.getBean("coreSessionFactory");
+		SessionFactory sessionFactory = (SessionFactory) this.wac.getBean(getHibernateSessionFactoryBeanName());
 		Session s = sessionFactory.openSession();
 		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(s));
     }   
@@ -119,7 +119,7 @@
     protected void finalizeHibernateSession() throws HibernateException
     {
         //clean the hibernate session
-		SessionFactory sessionFactory = (SessionFactory)this.wac           .getBean("coreSessionFactory");
+		SessionFactory sessionFactory = (SessionFactory)this.wac.getBean(getHibernateSessionFactoryBeanName());
 	    SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory);
 	    if (holder != null) {
 	    	Session s = holder.getSession(); 
@@ -128,4 +128,11 @@
 		    SessionFactoryUtils.closeSessionIfNecessary(s, sessionFactory);
 	    }
     }
+    
+    /**
+     * @return
+     */
+    protected abstract String getHibernateSessionFactoryBeanName();
+    
+    protected abstract String getContextConfigLocation();
 }
Index: lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java
===================================================================
diff -u -r488701987d2200568421ecdb409bd25b3aca4d8e -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java	(.../AbstractLamsTestCase.java)	(revision 488701987d2200568421ecdb409bd25b3aca4d8e)
+++ lams_common/test/java/org/lamsfoundation/lams/AbstractLamsTestCase.java	(.../AbstractLamsTestCase.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -53,6 +53,11 @@
     protected abstract String[] getContextConfigLocation();
 	
     /**
+     * @return
+     */
+    protected abstract String getHibernateSessionFactoryName();
+    
+    /**
      * @see TestCase#tearDown()
      */
     protected void tearDown() throws Exception
@@ -67,17 +72,19 @@
     protected void initializeHibernateSession() throws HibernateException
     {
         //hold the hibernate session
-		SessionFactory sessionFactory = (SessionFactory) this.context.getBean("coreSessionFactory");
+		SessionFactory sessionFactory = (SessionFactory) this.context.getBean(getHibernateSessionFactoryName());
 		Session s = sessionFactory.openSession();
 		TransactionSynchronizationManager.bindResource(sessionFactory, new SessionHolder(s));
     }    
+
+
     /**
      * @throws HibernateException
      */
     protected void finalizeHibernateSession() throws HibernateException
     {
         //clean the hibernate session
-		SessionFactory sessionFactory = (SessionFactory)this.context.getBean("coreSessionFactory");
+		SessionFactory sessionFactory = (SessionFactory)this.context.getBean(getHibernateSessionFactoryName());
 	    SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory);
 	    if (holder != null&&shouldFlush) {
 	    	Session s = holder.getSession(); 
@@ -89,13 +96,12 @@
 
     protected Session getSession()
     {
-		SessionFactory sessionFactory = (SessionFactory)this.context.getBean("coreSessionFactory");
+		SessionFactory sessionFactory = (SessionFactory)this.context.getBean(getHibernateSessionFactoryName());
 	    SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory);
 	    if (holder != null) 
 	    	return holder.getSession(); 
 	    else
 	        return null;
-
     }
     /**
      * @param shouldFlush The shouldFlush to set.
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java
===================================================================
diff -u -r1298a23011114e3088ec0e9686e0ceac246d9a6f -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	(.../TestActivity.java)	(revision 1298a23011114e3088ec0e9686e0ceac246d9a6f)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	(.../TestActivity.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -114,4 +114,12 @@
 		 "applicationContext.xml"};
     }
 
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
+
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -r8171e99285e7666cfde843b3f8a132ad0361922b -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 8171e99285e7666cfde843b3f8a132ad0361922b)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -151,5 +151,14 @@
 	    assertEquals("should be no learner waiting",0,((GateActivity)synchGate).getWaitingLearners().size());
 
 	}
+
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
 
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
===================================================================
diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	(.../TestGroupingDAO.java)	(revision 35d5350252748108494c7cb4bfc2e7d5f2271cba)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	(.../TestGroupingDAO.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -104,5 +104,13 @@
         
     }
 
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 
+
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
diff -u -r4c43b6fe5f48045c572b50bb279484abd09dcdda -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 4c43b6fe5f48045c572b50bb279484abd09dcdda)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -34,7 +34,8 @@
 		super.setUp();
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");		
 		userDAO = (UserDAO)context.getBean("userDAO");
-	}	/*
+	}	
+	/*
 	public void testInsertLearningDesign(){
 		LearningDesign design = new LearningDesign();
 				
@@ -59,4 +60,11 @@
 		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
 		 "applicationContext.xml"};
 	}
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -45,4 +45,12 @@
 		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
 		 "applicationContext.xml"};
 	}
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java
===================================================================
diff -u -r28d64aab07ef56ac02ca94111b73322d520c967f -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision 28d64aab07ef56ac02ca94111b73322d520c967f)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -43,4 +43,12 @@
 		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
 		 "applicationContext.xml"};
 	}
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -r488701987d2200568421ecdb409bd25b3aca4d8e -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 488701987d2200568421ecdb409bd25b3aca4d8e)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -284,4 +284,12 @@
         assertEquals("check up the learner progresses",0,lesson.getLearnerProgresses().size());
         
     }
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
 }
\ No newline at end of file
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -r0735f8bbbe378127d27795e3d9773f3c1293ed41 -r4601ad05006851314d0497b306151ce24447cf22
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 0735f8bbbe378127d27795e3d9773f3c1293ed41)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 4601ad05006851314d0497b306151ce24447cf22)
@@ -144,5 +144,13 @@
                                       testGroup,
                                       testLesson);
     }
+
+    /**
+     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
    
 }