Index: lams_common/properties.xml
===================================================================
diff -u -rf686b51b897a2e4c136afba6f4ca9b896b493b87 -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/properties.xml	(.../properties.xml)	(revision f686b51b897a2e4c136afba6f4ca9b896b493b87)
+++ lams_common/properties.xml	(.../properties.xml)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -61,8 +61,8 @@
 	<property name="database.driver.classpath"     value="${database.driver.file}"/>
 	<property name="database.driver"               value="org.gjt.mm.mysql.Driver"/>
 	<property name="database.url"                  value="jdbc:mysql://localhost/lams"/>
-	<property name="database.userid"               value="root"/>
-	<property name="database.password"             value=""/>
+	<property name="database.userid"               value="lams"/>
+	<property name="database.password"             value="lamsdemo"/>
 	<property name="database.schema"               value=""/>
 	<property name="database.catalog"              value=""/>
 
Fisheye: Tag cfef4351991e34dc2c827370370af84d6059bc0d refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/BaseTestCase.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -ra215387a72a943c0e3f1fe6c2dff00ffe8b3b71f -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision a215387a72a943c0e3f1fe6c2dff00ffe8b3b71f)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -1,13 +1,11 @@
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import java.util.List;
-
+import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
 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.learningdesign.BaseTestCase;
 
 /*
  * Created on Dec 3, 2004
@@ -22,25 +20,47 @@
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestActivityDAO extends BaseTestCase {
-
+public class TestActivityDAO extends AbstractLamsCommonTestCase {
+	
 	protected ActivityDAO activityDAO;
 	protected Activity activity;
 	protected LearningDesignDAO learningDesignDAO;
 	protected LearningLibraryDAO learningLibraryDAO;
 	protected GroupingDAO groupingDAO;
+
+	/**
+	 * @param name
+	 */
+	public TestActivityDAO(String name) {
+		super(name);
+	}
 	
+	
 	public void setUp() throws Exception {
 		super.setUp();
 		activityDAO =(ActivityDAO) context.getBean("activityDAO");
 		learningLibraryDAO =(LearningLibraryDAO)context.getBean("learningLibraryDAO");
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
 		groupingDAO = (GroupingDAO)context.getBean("groupingDAO");
 	}
-	public void testGetActivitiesByParentActivityId() {
-		List list = activityDAO.getActivitiesByParentActivityId(new Long(17));
+	/*public void testGetActivitiesByParentActivityId() {
+		List list = activityDAO.getActivitiesByParentActivityId(new Long(14));
 		System.out.print("SIZE:" + list.size());
+	}*/
+	public void test(){
+		activity = activityDAO.getActivityByActivityId(new Long(22));
+		Transition transition = activity.getTransitionTo();
+		System.out.println("Transition TO:" + transition.getTransitionId());
+		transition = activity.getTransitionFrom();
+		System.out.println("Transition FROM:" + transition.getActivityByToActivityId());
 	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation()
+	 */
+	protected String[] getContextConfigLocation() {
+		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
+		 "applicationContext.xml"};
+	}
 
 	/*protected void tearDown() throws Exception {
 		super.tearDown();
Fisheye: Tag cfef4351991e34dc2c827370370af84d6059bc0d refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag cfef4351991e34dc2c827370370af84d6059bc0d refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
diff -u -r1197a06ec1722bf2704ebcfe523fb9e36be20ae0 -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 1197a06ec1722bf2704ebcfe523fb9e36be20ae0)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -3,7 +3,7 @@
  */
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import org.lamsfoundation.lams.learningdesign.BaseTestCase;
+import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -17,15 +17,20 @@
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestLearningDesignDAO extends BaseTestCase {
+public class TestLearningDesignDAO extends AbstractLamsCommonTestCase {
 	
+	
 	private LearningDesignDAO learningDesignDAO;	
 	protected WorkspaceFolderDAO workspaceFolderDAO;
 	private UserDAO userDAO;
 	private User user;
 	private LearningDesign learningDesign;
 	
+	public TestLearningDesignDAO(String name) {
+		super(name);
+	}	
 	public void setUp() throws Exception{
+		super.setUp();
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
 		workspaceFolderDAO =(WorkspaceFolderDAO)context.getBean("workspaceFolderDAO");
 	}
@@ -84,4 +89,11 @@
 		System.out.print(workspaceFolder.getName());		
 		
 	}
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation()
+	 */
+	protected String[] getContextConfigLocation() {
+		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
+		 "applicationContext.xml"};
+	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
diff -u -ra215387a72a943c0e3f1fe6c2dff00ffe8b3b71f -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision a215387a72a943c0e3f1fe6c2dff00ffe8b3b71f)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	(.../TestLearningLibraryDAO.java)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -5,26 +5,38 @@
  * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.lamsfoundation.lams.learningdesign.dao;
-import org.lamsfoundation.lams.learningdesign.BaseTestCase;
-
+import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
 
 
 /**
  * @author manpreet
  */
-public class TestLearningLibraryDAO extends BaseTestCase {
+public class TestLearningLibraryDAO extends AbstractLamsCommonTestCase {
 	
 	protected LearningLibraryDAO libraryDAO;
 	protected LearningLibrary library;
 	
+	public TestLearningLibraryDAO(String name) {
+		super(name);
+	}
+	
 	public void setUp() throws Exception{
+		super.setUp();
 		libraryDAO =(LearningLibraryDAO) context.getBean("learningLibraryDAO");
 	}
 	public void testGetAllLibraries(){
 		LearningLibrary lib = libraryDAO.getLearningLibraryById(new Long(8));
 		assertNotNull(lib.getTitle());
 		System.out.println(lib.getTitle());		
 	}
+	/**
+	 * (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation()
+	 */
+	protected String[] getContextConfigLocation() {
+		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
+		 "applicationContext.xml"};
+	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java
===================================================================
diff -u -r5f710ab8baa32eb46ac83986b8420410067e517a -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision 5f710ab8baa32eb46ac83986b8420410067e517a)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java	(.../TestTransitionDAO.java)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.learningdesign.BaseTestCase;
+import org.lamsfoundation.lams.AbstractLamsCommonTestCase;
 import org.lamsfoundation.lams.learningdesign.Transition;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO;
 
@@ -18,11 +18,16 @@
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
-public class TestTransitionDAO extends BaseTestCase{
+public class TestTransitionDAO extends AbstractLamsCommonTestCase{
 	
 	protected TransitionDAO transitionDAO;
 	protected Transition transition;
 	
+	
+	public TestTransitionDAO(String name) {
+		super(name);	
+	}
+	
 	public void setUp() throws Exception {
 		super.setUp();
 		transitionDAO =(TransitionDAO) context.getBean("transitionDAO");		
@@ -34,5 +39,13 @@
 		System.out.println(transition.getTitle());
 		
 	}
+	/**
+	 * (non-Javadoc)
+	 * @see org.lamsfoundation.lams.AbstractLamsCommonTestCase#getContextConfigLocation()
+	 */
+	protected String[] getContextConfigLocation() {
+		return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
+		 "applicationContext.xml"};
+	}
 
 }
Fisheye: Tag cfef4351991e34dc2c827370370af84d6059bc0d refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dbConnection.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
===================================================================
diff -u -r0eec16fd28afef262a27b5c704b4b32fb7c5eb93 -rcfef4351991e34dc2c827370370af84d6059bc0d
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision 0eec16fd28afef262a27b5c704b4b32fb7c5eb93)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	(.../learningDesignApplicationContext.xml)	(revision cfef4351991e34dc2c827370370af84d6059bc0d)
@@ -6,109 +6,33 @@
 -->
 <beans>
 
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-
-	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
-	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
-	
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"><value>/org/lamsfoundation/lams/learningdesign/dbConnection.properties</value></property>
-	</bean>
-
-	<!-- Message source for this context, loaded from localized "messages_xx" files -->
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename"><value>messages</value></property>										
-	</bean>
-
-
-	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-  
-	<!-- Local DataSource that works in any environment -->
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName"><value>${jdbc.driverClassName}</value></property>
-		<property name="url"><value>${jdbc.url}</value></property>
-		<property name="username"><value>${jdbc.username}</value></property>
-		<property name="password"><value>${jdbc.password}</value></property>
-	</bean>
-
-
-
-	<!-- Hibernate SessionFactory -->
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-		<property name="dataSource"><ref local="dataSource"/></property>
-		<property name="mappingResources">
-			<list>	
-				<!-- learning design related mapping files -->
-				<value>org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>				
-				<value>org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml</value>	
-				<value>org/lamsfoundation/lams/learningdesign/Transition.hbm.xml</value>	
-				
-				
-				<!-- lesson related mapping files-->
-				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
-				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>				
-				
-				<!-- Tool related mapping files-->
-				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
-				
-				
-				<!-- usermanagement related mapping files-->
-				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Role.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/User.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml</value>				
-				
-			</list>
-		</property>
-		<property name="hibernateProperties">
-			<props>
-				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
-				<prop key="hibernate.show_sql">${hibernate.show_sql}</prop>
-				<prop key="hibernate.c3p0.minPoolSize">${hibernate.c3p0.minPoolSize}</prop>
-				<prop key="hibernate.c3p0.maxPoolSize">${hibernate.c3p0.maxPoolSize}</prop>
-				<prop key="hibernate.c3p0.timeout">${hibernate.c3p0.timeout}</prop>
-				<prop key="hibernate.c3p0.max_statement">${hibernate.c3p0.max_statement}</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
-	</bean>
-
-
-
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 	
 	<!-- Learning Design related beans-->
 	
 	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
 	
 	<!-- Usermanagement realted beans -->
 	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	
 </beans>