Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	(.../TestActivity.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java	(.../TestActivity.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,18 +1,29 @@
-/* ********************************************************************************
- *  Copyright Notice
- *  =================
- * This file contains propriety information of LAMS Foundation. 
- * Copying or reproduction with prior written permission is prohibited.
- * Copyright (c) 2005 
- * Created on 2005-2-18
- ******************************************************************************** */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.learningdesign;
 
 import java.util.Set;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
@@ -23,7 +34,7 @@
  * @author Jacky Fang 2005-2-18
  * 
  */
-public class TestActivity extends AbstractLamsTestCase
+public class TestActivity extends AbstractCommonTestCase
 {
 	protected ActivityDAO activityDAO;
 	protected IUserDAO userDAO; 
@@ -36,9 +47,6 @@
 	private static final Integer TEST_USER_ID = new Integer(2);
 	private static final long TEST_CHILD_QNA_ACTIVITY_ID = 22;
 	
-    /*
-     * @see AbstractLamsTestCase#setUp()
-     */
     protected void setUp() throws Exception
     {
         super.setUp();
@@ -48,9 +56,6 @@
 		
     }
 
-    /*
-     * @see AbstractLamsTestCase#tearDown()
-     */
     protected void tearDown() throws Exception
     {
         super.tearDown();
@@ -105,15 +110,4 @@
         assertNotNull(child);
         assertEquals("verify id",TEST_CHILD_QNA_ACTIVITY_ID,child.getActivityId().longValue());
     }
-    protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
-
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGateActivityStrategy.java
===================================================================
diff -u -r7c861054fe51b0ee7de9fc48d6aebb67a1f6b82e -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGateActivityStrategy.java	(.../TestGateActivityStrategy.java)	(revision 7c861054fe51b0ee7de9fc48d6aebb67a1f6b82e)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestGateActivityStrategy.java	(.../TestGateActivityStrategy.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -54,19 +54,13 @@
     private static final int NUM_OF_TEST_USERS = 5;
     private static final int TEST_USER_ID = 1;
     
-    /*
-     * @see AbstractLamsTestCase#setUp()
-     */
     protected void setUp() throws Exception
     {
 
         //initialize lesson users
         for(int i =0; i<NUM_OF_TEST_USERS;i++)
             testLessonUsers.add(createUser(new Integer(i+1),"tester"+i));
     }
-    /*
-     * @see AbstractLamsTestCase#tearDown()
-     */
     protected void tearDown() throws Exception
     {
         super.tearDown();
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,28 +1,43 @@
 package org.lamsfoundation.lams.learningdesign.dao;
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 import java.util.List;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.GroupingActivity;
+import org.lamsfoundation.lams.learningdesign.LearningDesign;
+import org.lamsfoundation.lams.learningdesign.OptionsActivity;
+import org.lamsfoundation.lams.learningdesign.ParallelActivity;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.Transition;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
-import org.lamsfoundation.lams.learningdesign.*;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 
-/*
- * Created on Dec 3, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-
 /**
  * @author MMINHAS
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestActivityDAO extends AbstractLamsTestCase {
+public class TestActivityDAO extends AbstractCommonTestCase {
 	
 	protected ActivityDAO activityDAO;
 	protected Activity activity;
@@ -63,12 +78,6 @@
 		assertNotNull(activity.getTitle());
 		System.out.println("ActivityID: " + activity.getActivityId());
 	}
-	/* (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
 	public void testgetActivityByLibraryID(){
 		List activities = activityDAO.getActivitiesByLibraryID(new Long(1));
 		assertNotNull(activities);
@@ -122,8 +131,5 @@
 		}
 		assertNotNull(parallelActivity.getActivityId());
 	}
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}	
 }
 
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	(.../TestGroupingDAO.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	(.../TestGroupingDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -22,9 +22,9 @@
 
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
@@ -36,7 +36,7 @@
  * @version
  * 
  */
-public class TestGroupingDAO extends AbstractLamsTestCase
+public class TestGroupingDAO extends AbstractCommonTestCase
 {
 	protected IGroupingDAO groupingDAO;
 	protected IUserDAO userDAO = null;
@@ -74,13 +74,6 @@
     {
         super(testName);
     }
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-     */
-    protected String[] getContextConfigLocation()
-    {
-    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-    }
 
     public void testGetGrouping()
     {
@@ -103,13 +96,4 @@
         
     }
 
-    /**
-     * @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 -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,33 +1,43 @@
-/*
- * Created on Dec 6, 2004
- */
-package org.lamsfoundation.lams.learningdesign.dao;
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
+package org.lamsfoundation.lams.learningdesign.dao;
+
 import java.util.List;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Activity;
-
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
 import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
-
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 
-
 /**
  * @author MMINHAS
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestLearningDesignDAO extends AbstractLamsTestCase {
+public class TestLearningDesignDAO extends AbstractCommonTestCase {
 	
 	protected ActivityDAO activityDAO;
 	private LearningDesignDAO learningDesignDAO;
@@ -54,9 +64,6 @@
 		long x = 20;
 		assertEquals(activity.getActivityId().longValue(),x);
 	}
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
 	public void testGetAllValidLearningDesignsInFolder(){
 		List list = learningDesignDAO.getAllValidLearningDesignsInFolder(new Integer(1));
 		System.out.println("SIZE:"+list.size());
@@ -67,7 +74,4 @@
 		String str = WDDXProcessor.serialize(learningDesignDTO);
 		System.out.println(str);		
 	}	
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}	
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,23 +1,36 @@
-/*
- * Created on Dec 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.lamsfoundation.lams.learningdesign.dao;
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
+package org.lamsfoundation.lams.learningdesign.dao;
+
 import java.util.Set;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 
 
 /**
  * @author manpreet
  */
-public class TestLearningLibraryDAO extends AbstractLamsTestCase {
+public class TestLearningLibraryDAO extends AbstractCommonTestCase {
 	
 	protected LearningLibraryDAO libraryDAO;
 	protected LearningLibrary library;
@@ -37,15 +50,4 @@
 		System.out.println(lib.getTitle());
 		System.out.println(set.size());
 	}
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,22 +1,33 @@
-/*
- * Created on Feb 8, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Transition;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 
 /**
  * @author Minhas
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestTransitionDAO extends AbstractLamsTestCase{
+public class TestTransitionDAO extends AbstractCommonTestCase{
 	
 	protected TransitionDAO transitionDAO;
 	protected Transition transition;
@@ -35,14 +46,4 @@
 		System.out.println(transition.getTitle());
 		
 	}
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -14,10 +14,8 @@
 import java.util.Set;
 
 import junit.framework.TestCase;
-
 import net.sf.hibernate.HibernateException;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
@@ -29,6 +27,7 @@
 import org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO;
 import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
@@ -45,7 +44,7 @@
  * @author Jacky Fang 2/02/2005
  * 
  */
-public class LessonDataAccessTestCase extends AbstractLamsTestCase
+public class LessonDataAccessTestCase extends AbstractCommonTestCase
 {
 
     //---------------------------------------------------------------------
@@ -119,7 +118,7 @@
 
     }
     protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml",
+		return new String[] {"org/lamsfoundation/lams/localApplicationContext.xml",
 							 "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml"};
 	}
 
@@ -281,11 +280,4 @@
         
     }
 
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
 }
\ No newline at end of file
Fisheye: Tag 4eadad01f792238a725b1482fd63e185a86e3b73 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java
===================================================================
diff -u
--- lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java	(revision 0)
+++ lams_common/test/java/org/lamsfoundation/lams/test/AbstractCommonTestCase.java	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -0,0 +1,54 @@
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
+package org.lamsfoundation.lams.test;
+
+
+
+/**
+ * Contains all the information shared across the lams_common junit tests.
+ * In particular, it sets up the context file and hibernate session name.
+ *  
+ * @author Fiona Malikoff
+ * 
+ */
+abstract public class AbstractCommonTestCase extends AbstractLamsTestCase
+{
+    /**
+     * Constructor for AbstractCommonTestCase.
+     * @param arg0
+     */
+    public AbstractCommonTestCase(String arg0) {
+        super(arg0);
+    }
+
+    protected String[] getContextConfigLocation() {
+		return new String[] {"org/lamsfoundation/lams/localApplicationContext.xml"};
+	}
+
+    /**
+     * @see org.lamsfoundation.lams.test.AbstractLamsTestCase#getHibernateSessionFactoryName()
+     */
+    protected String getHibernateSessionFactoryName()
+    {
+        return "coreSessionFactory";
+    }
+
+}
Index: lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java	(.../TestCSSThemeDAO.java)	(revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/test/java/org/lamsfoundation/lams/themes/dao/TestCSSThemeDAO.java	(.../TestCSSThemeDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.themes.CSSProperty;
 import org.lamsfoundation.lams.themes.CSSStyle;
 import org.lamsfoundation.lams.themes.CSSThemeVisualElement;
@@ -35,7 +35,7 @@
 /**
  * @author Fiona Malikoff
  */
-public class TestCSSThemeDAO extends AbstractLamsTestCase {
+public class TestCSSThemeDAO extends AbstractCommonTestCase {
 
     private CSSThemeDAO themeDAO = null;
     private final static Long RUBY_THEME_ID = new Long(1);
@@ -48,13 +48,6 @@
 		themeDAO =(CSSThemeDAO) context.getBean("themeDAO");
     }
 
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";		
-	}
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-
     /*
      * @see TestCase#tearDown()
      */
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,17 +1,27 @@
-/* ********************************************************************************
- *  Copyright Notice
- *  =================
- * This file contains propriety information of LAMS Foundation. 
- * Copying or reproduction with prior written permission is prohibited.
- * Copyright (c) 2005 
- * Created on 8/02/2005
- ******************************************************************************** */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.tool;
 
 import java.util.Date;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
@@ -21,15 +31,13 @@
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO;
-
-
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.tool.dao.IToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.IToolDAO;
 import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO;
 import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO;
-
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dao.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
@@ -40,7 +48,7 @@
  * @author Jacky Fang 8/02/2005
  * 
  */
-public class ToolDataAccessTestCase extends AbstractLamsTestCase
+public class ToolDataAccessTestCase extends AbstractCommonTestCase
 {
 
     protected IToolContentDAO toolContentDao;
@@ -116,14 +124,11 @@
     {
         super(arg0);
     }
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-     */
     protected String[] getContextConfigLocation()
     {
         return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
                 			  "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
-                			  "org/lamsfoundation/lams/applicationContext.xml"};
+                			  "org/lamsfoundation/lams/localApplicationContext.xml"};
     }
     
     public void initTestToolSession()
@@ -151,12 +156,4 @@
                                       testLesson);
     }
 
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
-   
-}
+ }
Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	(.../TestToolDAO.java)	(revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	(.../TestToolDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,17 +1,27 @@
-/* ********************************************************************************
- *  Copyright Notice
- *  =================
- * This file contains propriety information of LAMS Foundation. 
- * Copying or reproduction with prior written permission is prohibited.
- * Copyright (c) 2005 
- * Created on 9/02/2005
- ******************************************************************************** */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.tool.dao;
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolDataAccessTestCase;
 
 
Fisheye: Tag 4eadad01f792238a725b1482fd63e185a86e3b73 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java
===================================================================
diff -u -rfc947ff9a995fcf7fb1ffb39b165340c50140379 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	(.../TestUserManagementService.java)	(revision fc947ff9a995fcf7fb1ffb39b165340c50140379)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java	(.../TestUserManagementService.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -24,7 +24,8 @@
 
 import java.io.IOException;
 import java.util.Date;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO;
@@ -36,7 +37,7 @@
 /**
  * @author Manpreet Minhas
  */
-public class TestUserManagementService extends AbstractLamsTestCase {
+public class TestUserManagementService extends AbstractCommonTestCase {
 	
 	protected UserDAO userDAO;
 	protected RoleDAO roleDAO;
@@ -60,13 +61,6 @@
 		userOrganisationRoleDAO = (UserOrganisationRoleDAO)context.getBean("userOrganisationRoleDAO");
 	}
 
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
 	public void testSaveOrganisation(){
 		Organisation organisation = new Organisation("Test Organisation",
 													 "Test Organisation Description",													
@@ -94,11 +88,4 @@
 		String packet = userManagementService.getUsersFromOrganisationByRole(new Integer(4),"AUTHOR");
 		System.out.println(packet);
 	}
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-	 */
-	protected String getHibernateSessionFactoryName() {		
-		return "coreSessionFactory";
-	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	(.../OrganisationDAOTest.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAOTest.java	(.../OrganisationDAOTest.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,23 +1,36 @@
-/*
- * Created on Nov 26, 2004
- *
- * Last modified on Nov 26, 2004
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 
 /**
- * TODO Add description here
- *
  * <p>
  * <a href="OrganisationDAOTest.java.html"><i>View Source</i></a>
  * </p>
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
-public class OrganisationDAOTest extends AbstractLamsTestCase {
+public class OrganisationDAOTest extends AbstractCommonTestCase {
 	
 	private Organisation organisation = null;	
 	private OrganisationDAO organisationDAO = null;
@@ -38,11 +51,5 @@
 		organisation = organisationDAO.getOrganisationByWorkspaceID(new Integer(1));
 		assertNotNull(organisation.getOrganisationId());
 	}
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}	
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	(.../OrganisationTypeDAOTest.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	(.../OrganisationTypeDAOTest.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,26 +1,39 @@
-/*
- * Created on Nov 26, 2004
- *
- * Last modified on Nov 26, 2004
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import org.springframework.context.ApplicationContext;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
+import org.springframework.context.ApplicationContext;
 
 
 
 /**
- * TODO Add description here
- *
  * <p>
  * <a href="OrganisationTypeTypeDAOTest.java.html"><i>View Source</i></a>
  * </p>
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
-public class OrganisationTypeDAOTest extends AbstractLamsTestCase{
+public class OrganisationTypeDAOTest extends AbstractCommonTestCase{
 	private OrganisationType organisationType = null;
 	private String errorMessage = "";
 	private OrganisationTypeDAO organisationTypeDAO = null;
@@ -43,13 +56,7 @@
 		organisationTypeDAO.saveOrganisationType(organisationType);
 		assertNotNull(organisationTypeDAO.getOrganisationTypeByName("TEST"));
 	}
-	/**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-     */
-    protected String[] getContextConfigLocation()
-    {
-    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-    }
+
 	public void testGetOrganisationTypeById(){
 		errorMessage = "The name of the organisationType gotten by Id 1 is not ROOT ORGANISATION";
 		organisationType = organisationTypeDAO.getOrganisationTypeById(new Integer(1));
@@ -68,12 +75,5 @@
 		organisationTypeDAO.deleteOrganisationType(organisationType);
 		assertNull(organisationTypeDAO.getOrganisationTypeByName("TEST"));
 	}
-	/**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
 
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java	(.../RoleDAOTest.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAOTest.java	(.../RoleDAOTest.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,24 +1,37 @@
-/*
- * Created on Nov 26, 2004
- *
- * Last modified on Nov 26, 2004
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
-import org.springframework.context.ApplicationContext;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.Role;
+import org.springframework.context.ApplicationContext;
 
 
 /**
- * TODO Add description here
- *
  * <p>
  * <a href="RoleDAOTest.java.html"><i>View Source</i></a>
  * </p>
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
-public class RoleDAOTest extends AbstractLamsTestCase {
+public class RoleDAOTest extends AbstractCommonTestCase {
 
 	private Role role = null;
 	private String errorMessage = "";
@@ -52,18 +65,4 @@
 		role = roleDAO.getRoleByName("SYSADMIN");
 		assertEquals(errorMessage,new Integer(1),role.getRoleId());
 	}
-	/**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-     */
-    protected String getHibernateSessionFactoryName()
-    {
-        return "coreSessionFactory";
-    }
-    /**
-     * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-     */
-    protected String[] getContextConfigLocation()
-    {
-    	return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-    }
 }
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java
===================================================================
diff -u -re8dae3d7178a12d09282f26c1c2257728f2fc65a -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java	(.../TestUserOrganisationDAO.java)	(revision e8dae3d7178a12d09282f26c1c2257728f2fc65a)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestUserOrganisationDAO.java	(.../TestUserOrganisationDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,19 +1,33 @@
-/*
- * Created on May 28, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
 import java.util.List;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 
 /**
  * @author Manpreet Minhas
  */
-public class TestUserOrganisationDAO extends AbstractLamsTestCase {
+public class TestUserOrganisationDAO extends AbstractCommonTestCase {
 	
 	protected UserOrganisationDAO userOrganisationDAO;
 	protected UserDAO userDAO;
@@ -27,21 +41,6 @@
 		userDAO =(UserDAO)context.getBean("userDAO");
 	}
 
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-	 */
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 	public void testGetUserOrganisationsByUser(){
 		List memberships = userOrganisationDAO.getUserOrganisationsByUser(userDAO.getUserById(new Integer(4)));
 		assertEquals(memberships.size(),4);
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java
===================================================================
diff -u -r54c07197cd4876147b2180165e0bf238e3f89f23 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java	(.../TestWorkspaceDAO.java)	(revision 54c07197cd4876147b2180165e0bf238e3f89f23)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceDAO.java	(.../TestWorkspaceDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,34 +1,40 @@
-/*
- * Created on Apr 15, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.Workspace;
 import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceDAO;
 
 /**
  * @author Minhas
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestWorkspaceDAO extends AbstractLamsTestCase {
+public class TestWorkspaceDAO extends AbstractCommonTestCase {
 	
 	protected IWorkspaceDAO workspaceDAO;
 	
 	public TestWorkspaceDAO(String name){
 		super(name);
 	}
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}	
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
+
 	protected void setUp() throws Exception{	
 		super.setUp();
 		workspaceDAO =(IWorkspaceDAO)context.getBean("userManagementWorkspaceDAO");
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java
===================================================================
diff -u -re8dae3d7178a12d09282f26c1c2257728f2fc65a -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java	(.../TestWorkspaceFolderDAO.java)	(revision e8dae3d7178a12d09282f26c1c2257728f2fc65a)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/TestWorkspaceFolderDAO.java	(.../TestWorkspaceFolderDAO.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,18 +1,32 @@
-/*
- * Created on May 28, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 
 /**
  * @author Manpreet Minhas
  */
-public class TestWorkspaceFolderDAO extends AbstractLamsTestCase {
+public class TestWorkspaceFolderDAO extends AbstractCommonTestCase {
 	
 	protected WorkspaceFolderDAO workspaceFolderDAO;
 	
@@ -24,21 +38,6 @@
 		workspaceFolderDAO = (WorkspaceFolderDAO)context.getBean("workspaceFolderDAO");
 	}
 
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
-	 */
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getHibernateSessionFactoryName()
-	 */
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 	public void testGetRunSequencesFolderForUser(){
 		WorkspaceFolder folder = workspaceFolderDAO.getRunSequencesFolderForUser(new Integer(4));
 		assertEquals(folder.getWorkspaceFolderId(),new Integer(7));
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -1,12 +1,28 @@
-/*
- * Created on Nov 22, 2004
- *
- * Last modified on Nov 22, 2004
- */
+/* 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt 
+*/
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
 import java.util.Date;
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+
+import org.lamsfoundation.lams.test.AbstractCommonTestCase;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -15,15 +31,13 @@
 
 
 /**
- * TODO Add description here
- *
  * <p>
  * <a href="UserDAOTest.java.html"><i>View Source</i></a>
  * </p>
  * 
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
-public class UserDAOTest extends AbstractLamsTestCase{
+public class UserDAOTest extends AbstractCommonTestCase {
 	private User user = null;
 	private UserDAO userDAO = null;
 	protected RoleDAO roleDAO;
@@ -60,9 +74,6 @@
 		boolean member = user.isMember(organisation);
 		assertTrue(member);
 	}
-	protected String[] getContextConfigLocation() {
-		return new String[] {"org/lamsfoundation/lams/applicationContext.xml"};
-	}	
 	public void testSaveUser(){
 		User user = new User();
 		user.setLogin("MiniMinhas");
@@ -90,7 +101,4 @@
 		userOrganisationRoleDAO.saveUserOrganisationRole(userOrganisationRole);
 		return userOrganisationRole;
 	}	
-	protected String getHibernateSessionFactoryName() {
-		return "coreSessionFactory";
-	}
 }
Index: lams_common/test/web/WEB-INF/.struts-config.mex
===================================================================
diff -u
--- lams_common/test/web/WEB-INF/.struts-config.mex	(revision 0)
+++ lams_common/test/web/WEB-INF/.struts-config.mex	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -0,0 +1 @@
+<FlowViewLayout Version="1.1"><StrutsActivity path="/user.do" /><StrutsActivity path="/passwordChanged.do" /><StrutsActivity path="/admin.do" /><StrutsActivity path="/usersadd.do" /><StrutsActivity path="usersremove.do" /><StrutsActivity path="/admin/organisation.do" /><StrutsActivity path="/home.do" /><StrutsActivity path="/workspace.do" /><StrutsActivity path=".admin.error" /><StrutsActivity path=".admin" /><StrutsActivity path=".admin.user" /><StrutsActivity path="/index.jsp" /><StrutsActivity path=".passwordChangeOk" /><StrutsActivity path=".passwordChange" /><StrutsActivity path=".admin.usersadd" /><StrutsActivity path=".admin.usersremove" /><StrutsActivity path=".admin.organisation" /><StrutsActivity path="/learner.jsp" /><StrutsActivity path="/staff.jsp" /><StrutsActivity path=".error" /><StrutsActivity path="/author.jsp" /><StrutsTransition id="/workspace.do,success,/index.jsp,1" routingType="0" /><StrutsTransition id="usersremove.do,admin,.admin,1" routingType="0" /><StrutsTransition id="/admin.do,organisation,.admin.organisation,1" routingType="0" /><StrutsTransition id="/admin/organisation.do,error,.admin.error,1" routingType="0" /><StrutsTransition id=".admin.usersadd,null,/usersadd.do,2" routingType="0" /><StrutsTransition id="/home.do,staff,/staff.jsp,1" routingType="0" /><StrutsTransition id="/home.do,admin,.admin,1" routingType="0" /><StrutsTransition id="/user.do,admin,.admin,1" routingType="0" /><StrutsTransition id=".passwordChange,null,/passwordChanged.do,2" routingType="0" /><StrutsTransition id="/usersadd.do,admin,.admin,1" routingType="0" /><StrutsTransition id="/home.do,passwordChange,.passwordChange,1" routingType="0" /><StrutsTransition id=".admin.usersremove,null,usersremove.do,2" routingType="0" /><StrutsTransition id="/admin.do,admin,.admin,1" routingType="0" /><StrutsTransition id="/admin.do,error,.admin.error,1" routingType="0" /><StrutsTransition id="/passwordChanged.do,okay,.passwordChangeOk,1" routingType="0" /><StrutsTransition id="/admin/organisation.do,admin,.admin,1" routingType="0" /><StrutsTransition id="/admin.do,usersremove,.admin.usersremove,1" routingType="0" /><StrutsTransition id=".admin.user,null,/user.do,2" routingType="0" /><StrutsTransition id="/admin.do,usersadd,.admin.usersadd,1" routingType="0" /><StrutsTransition id="/home.do,learner,/learner.jsp,1" routingType="0" /><StrutsTransition id="/home.do,author,/author.jsp,1" routingType="0" /><StrutsTransition id="/usersadd.do,usersadd,.admin.usersadd,1" routingType="0" /><StrutsTransition id=".admin.organisation,null,/admin/organisation.do,2" routingType="0" /><StrutsTransition id="/user.do,error,.admin.error,1" routingType="0" /><StrutsTransition id="/passwordChanged.do,cancelled,/index.jsp,1" routingType="0" /><StrutsTransition id="/usersadd.do,error,.admin.error,1" routingType="0" /><StrutsTransition id="usersremove.do,error,.admin.error,1" routingType="0" /><StrutsTransition id="/admin.do,user,.admin.user,1" routingType="0" /><StrutsTransition id="/home.do,error,.error,1" routingType="0" /></FlowViewLayout>
\ No newline at end of file
Fisheye: Tag 4eadad01f792238a725b1482fd63e185a86e3b73 refers to a dead (removed) revision in file `lams_common/test/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4eadad01f792238a725b1482fd63e185a86e3b73 refers to a dead (removed) revision in file `lams_common/test/web/WEB-INF/learningDesignApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -214,21 +214,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
-      name="WorkspaceAction"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="/index.jsp"
-        redirect="false"
-      />
-    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>
Index: lams_common/test/web/WEB-INF/web.xml
===================================================================
diff -u -r5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7 -r4eadad01f792238a725b1482fd63e185a86e3b73
--- lams_common/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 5bd9057d6aa08bfa1bb1e6c240d5b3707743c3d7)
+++ lams_common/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 4eadad01f792238a725b1482fd63e185a86e3b73)
@@ -23,13 +23,17 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-<context-param>
-	<param-name>contextConfigLocation</param-name>
-	<param-value>/WEB-INF/spring/applicationContext.xml		  
-	/WEB-INF/spring/learningDesignApplicationContext.xml		  
-	/WEB-INF/spring/workspaceApplicationContext.xml 
-	</param-value>
-</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			classpath:/org/lamsfoundation/lams/applicationContext.xml
+		</param-value>
+	</context-param>
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
Fisheye: Tag 4eadad01f792238a725b1482fd63e185a86e3b73 refers to a dead (removed) revision in file `lams_common/test/web/WEB-INF/workspaceApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?