Index: lams_common/test/java/applicationContext.xml
===================================================================
diff -u -r2eeeb7da6fd05405ea0bdd511270423401536fa9 -ra6cf2cb595b55b325c991334ba51a099b269e18b
--- lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision 2eeeb7da6fd05405ea0bdd511270423401536fa9)
+++ lams_common/test/java/applicationContext.xml	(.../applicationContext.xml)	(revision a6cf2cb595b55b325c991334ba51a099b269e18b)
@@ -26,7 +26,7 @@
 	<!-- Local DataSource that works in any environment -->
 	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
 		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
-		<property name="url"><value>jdbc:mysql://localhost/lams</value></property>
+		<property name="url"><value>jdbc:mysql://localhost/lams?characterEncoding=utf8</value></property>
 		<property name="username"><value>lams</value></property>
 		<property name="password"><value>lamsdemo</value></property>
 	</bean>
@@ -57,6 +57,7 @@
 				<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>	
+				<value>org/lamsfoundation/lams/learningdesign/License.hbm.xml</value>	
 				
 				
 				<!-- lesson related mapping files-->
@@ -147,21 +148,6 @@
 
 	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
-	<!-- learningdesign package -->
+	</bean>	
 
-	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-
 </beans>
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -rceebf32d92002b7509364edecf1da2405913e8e7 -ra6cf2cb595b55b325c991334ba51a099b269e18b
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision ceebf32d92002b7509364edecf1da2405913e8e7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision a6cf2cb595b55b325c991334ba51a099b269e18b)
@@ -48,12 +48,17 @@
 		System.out.print("SIZE:" + list.size());
 	}*/
 	public void test(){
-		activity = activityDAO.getActivityByActivityId(new Long(22));
+		activity = activityDAO.getActivityByActivityId(new Long(18));
 		Transition transition = activity.getTransitionTo();
 		System.out.println("Transition TO:" + transition.getTransitionId());
 		transition = activity.getTransitionFrom();
 		System.out.println("Transition FROM:" + transition.getActivityByToActivityId());
 	}
+	public void testGetFirstDesignActivity(){
+		Activity activity = activityDAO.getActivityByUIID(new Integer(3),learningDesignDAO.getLearningDesignById(new Long(1)));
+		assertNotNull(activity.getTitle());
+		System.out.println("ActivityID: " + activity.getActivityId());
+	}
 	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
 	 */
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
diff -u -rceebf32d92002b7509364edecf1da2405913e8e7 -ra6cf2cb595b55b325c991334ba51a099b269e18b
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision ceebf32d92002b7509364edecf1da2405913e8e7)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision a6cf2cb595b55b325c991334ba51a099b269e18b)
@@ -3,11 +3,11 @@
  */
 package org.lamsfoundation.lams.learningdesign.dao;
 
+import java.util.Date;
 import org.lamsfoundation.lams.AbstractLamsTestCase;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
 import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO;
 import org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO;
 
@@ -31,63 +31,18 @@
 	}	
 	public void setUp() throws Exception{
 		super.setUp();
-		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
-		workspaceFolderDAO =(WorkspaceFolderDAO)context.getBean("workspaceFolderDAO");
-	}
-	/*public void testGetLearningDesignByUserId(){
-		List list = learningDesignDAO.getLearningDesignByUserId(new Long(1));
-		LearningDesign d = (LearningDesign) list.get(0);
-		System.out.println("Size: " + list.size());
-		System.out.println("Title: " + d.getTitle());
-		assertNotNull(list);
-	}*/
-	/*public TestLearningDesignDAO(){
 		learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");		
-		userDAO =(UserDAO)context.getBean("userDAO");
-		initUserData();
-		initLearningDesignData();
-		
-	}
-	public void initUserData(){
-		user = userDAO.getUserById(new Integer(1));
-	}
-	public void initLearningDesignData(){
-		learningDesign = new LearningDesign();
-		learningDesign.setId(new Integer(20));		
-		learningDesign.setTitle("Title for 20");	
-		learningDesign.setDescription("Description for 20");
-		learningDesign.setFirstActivityId(new Long(1));
-		learningDesign.setMaxId(new Integer(4));
-		learningDesign.setDateReadOnly(new Date());
-		learningDesign.setReadAccess(new Long(1));
-		learningDesign.setWriteAccess(new Long(1));
-		learningDesign.setHelpText("Help");
-		learningDesign.setOpenDateTime(new Date());
-		learningDesign.setCloseDateTime(new Date());
-		learningDesign.setValidDesign(new Boolean(true));
-		learningDesign.setReadOnly(new Boolean(false));
-		learningDesign.setLessonCopy(new Boolean(false));
-		learningDesign.setCreateDateTime(new Date());
-		learningDesign.setVersion("1.1");
-		learningDesign.setLearningDesign(null);
-		learningDesign.setUser(user);		
-	}
-	
-	public void testSaveLearningDesign(){		
-		learningDesignDAO.insert(learningDesign);		
-		//assertNotNull(learningDesignDAO.getLearningDesignById(new Long(20)));
-	}
-	/*public void testDeleteLearningDesign(){
-		learningDesignDAO.delete(learningDesignDAO.getLearningDesignById(new Long(20)));		
+		userDAO = (UserDAO)context.getBean("userDAO");
 	}	
-	public void testGetLearningDesignByID(){
-		learningDesign = learningDesignDAO.getLearningDesignById(new Long(1));
-		assertNotNull(learningDesign);		
-	}*/
-	public void testWorkspaceFolderDAO(){
-		WorkspaceFolder workspaceFolder = workspaceFolderDAO.getWorkspaceFolderByID(new Integer(1));
-		System.out.print(workspaceFolder.getName());		
-		
+	public void testInsertLearningDesign(){
+		LearningDesign design = new LearningDesign();
+				
+		design.setValidDesign(new Boolean (true));
+		design.setReadOnly(new Boolean (false));
+		design.setUser(userDAO.getUserById(new Integer(1)));
+		design.setCopyTypeID(new Integer(1));
+		design.setCreateDateTime(new Date());		
+		learningDesignDAO.insert(design);		
 	}
 	/* (non-Javadoc)
 	 * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()