Index: lams_monitoring/.classpath =================================================================== diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -r164d09c521fb680d3380608d768c08643db0f22d --- lams_monitoring/.classpath (.../.classpath) (revision 62a9d980560721c476979fc695ce1e9a5508dc75) +++ lams_monitoring/.classpath (.../.classpath) (revision 164d09c521fb680d3380608d768c08643db0f22d) @@ -8,13 +8,27 @@ - + + + + + + + + + + + + + + + Index: lams_monitoring/lib/lams/lams-authoring.jar =================================================================== diff -u -rdcc613dc7ad9b9d782dda5cf647417a0b21118af -r164d09c521fb680d3380608d768c08643db0f22d Binary files differ Index: lams_monitoring/lib/lams/lams.jar =================================================================== diff -u -r09b65e403c9fcb6cc894e6af85c408e654b46f8c -r164d09c521fb680d3380608d768c08643db0f22d Binary files differ Index: lams_monitoring/lib/lams/src/lams_authoring_src.zip =================================================================== diff -u Binary files differ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r09b65e403c9fcb6cc894e6af85c408e654b46f8c -r164d09c521fb680d3380608d768c08643db0f22d --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 09b65e403c9fcb6cc894e6af85c408e654b46f8c) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 164d09c521fb680d3380608d768c08643db0f22d) @@ -119,7 +119,10 @@ { LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId)); //copy the current learning design - LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign); + LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign, + new Integer(LearningDesign.COPY_TYPE_LESSON), + user, + originalLearningDesign.getWorkspaceFolder()); //copy the tool content for (Iterator i = copiedLearningDesign.getActivities().iterator(); i.hasNext();) Index: lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java =================================================================== diff -u -r9618589c0aa5eb2d26007e8c14adb13e47747a49 -r164d09c521fb680d3380608d768c08643db0f22d --- lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java (.../MockAuthoringService.java) (revision 9618589c0aa5eb2d26007e8c14adb13e47747a49) +++ lams_monitoring/test/java/org/lamsfoundation/lams/authoring/service/MockAuthoringService.java (.../MockAuthoringService.java) (revision 164d09c521fb680d3380608d768c08643db0f22d) @@ -9,11 +9,13 @@ package org.lamsfoundation.lams.authoring.service; +import java.io.IOException; import java.util.List; 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; /** @@ -117,4 +119,39 @@ return null; } + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign, java.lang.Integer, org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.usermanagement.WorkspaceFolder) + */ + public LearningDesign copyLearningDesign(LearningDesign learningDesign, Integer arg1, User arg2, WorkspaceFolder arg3) + { + return learningDesign; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningLibraryWDDX(java.lang.Long) + */ + public String requestLearningLibraryWDDX(Long arg0) + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#requestLearningLibraryListWDDX() + */ + public String requestLearningLibraryListWDDX() throws IOException + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#storeWDDXData(java.lang.String) + */ + public String storeWDDXData(String arg0) throws Exception + { + // TODO Auto-generated method stub + return null; + } + } Index: lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java =================================================================== diff -u -r09b65e403c9fcb6cc894e6af85c408e654b46f8c -r164d09c521fb680d3380608d768c08643db0f22d --- lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision 09b65e403c9fcb6cc894e6af85c408e654b46f8c) +++ lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java (.../TestMonitoringService.java) (revision 164d09c521fb680d3380608d768c08643db0f22d) @@ -51,8 +51,9 @@ //--------------------------------------------------------------------- private final Integer TEST_USER_ID = new Integer(1); private final Integer TEST_LEARNER_ID = new Integer(2); - private final Integer TEST_STAFF_ID = new Integer(3); + private final Integer TEST_STAFF_ID = new Integer(3); private final long TEST_LEARNING_DESIGN_ID = 1; + private final long TEST_COPIED_LEARNING_DESIGN_ID = 2; private final Integer TEST_ORGANIZATION_ID = new Integer(1); //it might be different because it is automatically generated by database //TODO create a get lesson by design method in lesson dao. @@ -102,7 +103,7 @@ "/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml", "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", "/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", - "/org/lamsfoundation/lams/authoring/mockAuthoringApplicationContext.xml", + "/WEB-INF/authoringApplicationContext.xml", "/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml", "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml", "applicationContext.xml"}; @@ -123,7 +124,7 @@ TEST_LESSON_ID=testLesson.getLessonId(); Lesson createdLesson = lessonDao.getLesson(TEST_LESSON_ID); assertNotNull(createdLesson); - assertEquals("verify the design",TEST_LEARNING_DESIGN_ID,createdLesson.getLearningDesign().getLearningDesignId().longValue()); + assertEquals("verify the design",TEST_COPIED_LEARNING_DESIGN_ID,createdLesson.getLearningDesign().getLearningDesignId().longValue()); assertEquals("verify the user", TEST_USER_ID,createdLesson.getUser().getUserId()); assertEquals("verify the organization",TEST_ORGANIZATION_ID,createdLesson.getOrganisation().getOrganisationId()); assertEquals("verify the lesson state",Lesson.CREATED,createdLesson.getLessonStateId());