Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/authoring/HashtableUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/authoring/LDWDDXValueObjectFactory.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/authoring/LDWDDXValueObjectStorer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/authoring/WDDXTAGS.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/AuthoringService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IAuthoringService.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/learningdesign/web/AuthoringAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/BaseTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/BaseTestCase.java,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/BaseTestCase.java	28 Jan 2005 04:21:00 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/BaseTestCase.java	2 Feb 2005 02:27:12 -0000	1.2
@@ -18,7 +18,7 @@
 	protected ApplicationContext context;
 	
 	public BaseTestCase(){
-		String path ="/com/lamsinternational/lams/learningdesign/learningDesignApplicationContext.xml";
+		String path ="/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml";
 		context = new ClassPathXmlApplicationContext(path);		
 	}
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dbConnection.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/dbConnection.properties,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dbConnection.properties	28 Jan 2005 04:21:00 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dbConnection.properties	2 Feb 2005 02:27:12 -0000	1.2
@@ -6,10 +6,10 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://localhost/lams11
 jdbc.username=root
-jdbc.password=rootpwd
+jdbc.password=
 
 #Hibernate configuration
-hibernate.show_sql=false
+hibernate.show_sql=true
 hibernate.dialect=net.sf.hibernate.dialect.MySQLDialect
 
 #Connection Pooling configuration
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/Attic/learningDesignApplicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	28 Jan 2005 04:21:00 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml	2 Feb 2005 02:27:12 -0000	1.2
@@ -12,7 +12,7 @@
 	<!-- (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>/com/lamsinternational/lams/learningdesign/dbConnection.properties</value></property>
+		<property name="location"><value>/org/lamsfoundation/lams/learningdesign/dbConnection.properties</value></property>
 	</bean>
 
 	<!-- Message source for this context, loaded from localized "messages_xx" files -->
@@ -39,44 +39,36 @@
 		<property name="mappingResources">
 			<list>	
 				<!-- learning design related mapping files -->
-				<value>com/lamsinternational/lams/learningdesign/Activity.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/ActivityType.hbm.xml</value>				
-				<value>com/lamsinternational/lams/learningdesign/Group.hbm.xml</value>				
-				<value>com/lamsinternational/lams/learningdesign/Grouping.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/GroupingType.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/GateActivityLevel.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/LearningDesign.hbm.xml</value>
-				<value>com/lamsinternational/lams/learningdesign/LearningLibrary.hbm.xml</value>	
-				<value>com/lamsinternational/lams/learningdesign/Transition.hbm.xml</value>	
+				<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>com/lamsinternational/lams/lesson/LearnerProgress.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/Lesson.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/LessonLearner.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/LessonState.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/ProgressCompleted.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/ProgressCurrent.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/UserGroup.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/UserToolSession.hbm.xml</value>
-				<value>com/lamsinternational/lams/lesson/UserToolSessionState.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>				
 				
 				<!-- Tool related mapping files-->
-				<value>com/lamsinternational/lams/tool/Tool.hbm.xml</value>
-				<value>com/lamsinternational/lams/tool/ToolSession.hbm.xml</value>
-				<value>com/lamsinternational/lams/tool/ToolsessionState.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSessionState.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
 				
+				
 				<!-- usermanagement related mapping files-->
-				<value>com/lamsinternational/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Organisation.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/OrganisationType.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Role.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/User.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/UserOrganisation.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/Workspace.hbm.xml</value>
-				<value>com/lamsinternational/lams/usermanagement/WorkspaceFolder.hbm.xml</value>				
+				<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>
@@ -101,28 +93,6 @@
 
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
 	
-	<bean id="authoringServiceTarget" class ="org.lamsfoundation.lams.learningdesign.service.AuthoringService">
-		<property name="learningDesignDAO">
-			<ref local="learningDesignDAO"/>
-		</property>
-	</bean>
-	
-	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager">
-			<ref local ="transactionManager"/>
-		</property>
-		<property name ="target">
-			<ref local="authoringServiceTarget"/>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="insert*">PROPAGATION_REQUIRED</prop>
-				<prop key="delete*">PROPAGATION_REQUIRED</prop>
-				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
-			</props>
-		</property>
-	</bean>
-
 	<!-- Learning Design related beans-->
 	
 	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
@@ -134,6 +104,9 @@
 	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
 		<property name="sessionFactory"><ref local="sessionFactory"/></property>
 	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="sessionFactory"/></property>
+	</bean>
 	
 	<!-- Usermanagement realted beans -->
 	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestActivityDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	28 Jan 2005 04:20:59 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	2 Feb 2005 02:29:05 -0000	1.2
@@ -1,10 +1,14 @@
 package org.lamsfoundation.lams.learningdesign.dao;
 
-import java.util.Date;
+import java.util.List;
 
 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,11 +26,21 @@
 
 	protected ActivityDAO activityDAO;
 	protected Activity activity;
+	protected LearningDesignDAO learningDesignDAO;
+	protected LearningLibraryDAO learningLibraryDAO;
+	protected GroupingDAO groupingDAO;
 	
 	public void setUp() throws Exception {
 		super.setUp();
-		activityDAO =(ActivityDAO) context.getBean("activityDAO");	
+		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));
+		System.out.print("SIZE:" + list.size());
+	}
 
 	/*protected void tearDown() throws Exception {
 		super.tearDown();
@@ -35,8 +49,7 @@
 	public void testGetActivityById() {
 	}
 
-	public void testGetActivityByParentActivityId() {
-	}
+	
 
 	public void testGetAllActivities() {
 	}
@@ -70,28 +83,57 @@
 		//activity.setOrderId(new Integer(2));
 		//assertNotNull("Primary Key assigned",optActivity.getActivityId());		
 	}*/
-	public void testInsertActivity() {
+	/*public void testInsertActivity() {
 		OptionsActivity optActivity = new OptionsActivity();		
 		
-		optActivity.setDefineLater(new Boolean(false));		
-		
+		optActivity.setOrderId(new Integer(123));
+		optActivity.setDefineLater(new Boolean(false));
 		optActivity.setDescription("Optional Activity Description");
 		optActivity.setTitle("Optional Activity Title");
+		optActivity.setActivityTypeId(new Integer(8));
 		
-		LearningDesign ld = new LearningDesign();
-		ld.setLearningDesignId(new Long(1));
-		optActivity.setLearningDesign(ld);
+		LearningDesign design = learningDesignDAO.getLearningDesignById(new Long(1));
+		optActivity.setLearningDesign(design);
 		
-		LearningLibrary lb = new LearningLibrary();
-		lb.setLearningLibraryId(new Long(1));
-		optActivity.setLearningLibrary(lb);
+		LearningLibrary library = learningLibraryDAO.getLearningLibraryById(new Long(1));
+		optActivity.setLearningLibrary(library);
 		
 		optActivity.setCreateDateTime(new Date());
+		optActivity.setParentActivity(activityDAO.getActivityById(new Long(1)));
 		
 		activityDAO.insertActivity(optActivity);
 		//activity.setOrderId(new Integer(2));
 		//assertNotNull("Primary Key assigned",optActivity.getActivityId());		
-	}
+	}*/
+	/*public void testInsertOptionsActivity(){
+		OptionsActivity options = new OptionsActivity();
+		
+		options.setId(new Integer(26));
+		//options.setTitle("Trial Options Activity");
+		//options.setDescription("This is an Optional Activity");
+		options.setDefineLater(new Boolean(false));
+		options.setActivityTypeId(new Integer(8));
+		options.setCreateDateTime(new Date());
+		options.setMaxNumberOfOptions(new Integer(5));
+		options.setMinNumberOfOptions(new Integer(3));
+		
+		/*LearningDesign design = learningDesignDAO.getLearningDesignById(new Long(1));
+		options.setLearningDesign(design);
+		
+		LearningLibrary library = learningLibraryDAO.getLearningLibraryById(new Long(1));
+		options.setLearningLibrary(library);
+		
+		options.setLibraryActivityUiImage("image");
+		options.setOfflineInstructions("Offline Instructions for Optional Activity");
+		options.setXcoord(new Integer(0));
+		options.setYcoord(new Integer(0));
+		options.setOrderId(new Integer(1));
+		options.setParentActivity(activityDAO.getActivityById(new Long(1)));
+		options.setGrouping(groupingDAO.getGroupingById(new Long(1)));
+		activityDAO.insertOptActivity(options);
+		//activityDAO.insertActivity(options);
+		
+	}*/
 
 	/*public void testUpdateActivity() {
 	}
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestGroupingDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	28 Jan 2005 04:20:59 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java	2 Feb 2005 02:29:05 -0000	1.2
@@ -6,12 +6,29 @@
  */
 package org.lamsfoundation.lams.learningdesign.dao;
 import org.lamsfoundation.lams.learningdesign.BaseTestCase;
+import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO;
 /**
  * @author MMINHAS
  *
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TestGroupingDAO extends BaseTestCase {
+	
+	protected GroupingDAO groupingDAO;
+	protected Grouping grouping;
+	
+	public void setUp()throws Exception {
+		super.setUp();
+		groupingDAO = (GroupingDAO)context.getBean("groupingDAO");
+		
+	}
+	public void testGetGroupingByID(){
+		//grouping =(Grouping) groupingDAO.find(Grouping.class,new Long(1));
+		grouping = groupingDAO.getGroupingById(new Long(1));
+		System.out.println("grouping:" + grouping);
+		//assertNotNull(grouping.getMaxNumberOfGroups());
+	}
 
 }
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningLibraryDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	28 Jan 2005 04:20:59 -0000	1.1
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java	2 Feb 2005 02:29:05 -0000	1.2
@@ -6,8 +6,6 @@
  */
 package org.lamsfoundation.lams.learningdesign.dao;
 import org.lamsfoundation.lams.learningdesign.BaseTestCase;
-import java.util.Date;
-import java.util.List;
 
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
@@ -24,18 +22,7 @@
 	public void setUp() throws Exception{
 		libraryDAO =(LearningLibraryDAO) context.getBean("learningLibraryDAO");
 	}
-	
-	/*public void testInsert(){
-		library = new LearningLibrary();		
-		library.setDescription("Description for 2nd Trial");
-		library.setTitle("Title for 2nd Trial");
-		library.setCreateDateTime(new Date("20040111"));
-		
-		libraryDAO.insert(library);
-		//assertNotNull(libraryDAO.getLearningLibraryByTitle("Title for 1st Trial"));
-	}*/
 	public void testGetAllLibraries(){
-		//List list = libraryDAO.getAllLearningLibraries();
 		LearningLibrary lib = libraryDAO.getLearningLibraryById(new Long(8));
 		assertNotNull(lib.getTitle());
 		System.out.println(lib.getTitle());		
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestTransitionDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/test/java/org/lamsfoundation/lams/learningdesign/service/TestAuthoringService.java'.
Fisheye: No comparison available.  Pass `N' to diff?