Index: lams_learning/lib/lams/lams.jar =================================================================== diff -u -r61ab8aad9c6a33202b47ca6089e89653b5131b09 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 Binary files differ Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java =================================================================== diff -u -rf73c3d7878d6f6c013a43da96353e4e0983e1a61 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision f73c3d7878d6f6c013a43da96353e4e0983e1a61) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (.../ILearnerService.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -97,12 +97,14 @@ /** - * Marks an activity as complete and calculates the next URL. This method is for - * tools to redirect the client on complete. + * Marks an tool session as complete and calculates the next activity against + * the learning design. This method is for tools to redirect the client on + * complete. * @param toolSessionId, session ID for completed tool + * @param learner TODO * @return the URL for the next activity * @throws LearnerServiceException in case of problems. */ - public String completeToolActivity(long toolSessionId); + public String completeToolSession(long toolSessionId, User learner); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -r61ab8aad9c6a33202b47ca6089e89653b5131b09 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 61ab8aad9c6a33202b47ca6089e89653b5131b09) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -22,6 +22,7 @@ package org.lamsfoundation.lams.learning.service; +import java.io.UnsupportedEncodingException; import java.util.Iterator; import java.util.List; @@ -176,7 +177,8 @@ /** - * Calculates learner progress and returns the data required to be displayed to the learner (including URL(s)). + * Calculates learner progress and returns the data required to be displayed + * to the learner. * @param completedActivityID identifies the activity just completed * @param learner the Learner * @param lesson the Lesson in progress. @@ -196,25 +198,32 @@ return learnerProgress; } - - public String completeToolActivity(long toolSessionId) { - // get learner, lesson and activity using toolSessionId - User learner = null; - Lesson lesson = null; - Activity activity = null; + /** + * + * @see org.lamsfoundation.lams.learning.service.ILearnerService#completeToolSession(long, User) + */ + public String completeToolSession(long toolSessionId, User learner) + { + //update tool session state in lams + ToolSession toolSession = lamsToolService.getToolSessionById(new Long(toolSessionId)); - String url = null; - try { - LearnerProgress nextLearnerProgress = calculateProgress(activity, learner, lesson); - Activity nextActivity = nextLearnerProgress.getNextActivity(); - url = activityMappings.getActivityURL(nextActivity, nextLearnerProgress); + toolSession.setToolSessionStateId(ToolSession.ENDED_STATE); + + lamsToolService.updateToolSession(toolSession); + //build up the url for next activity. + try + { + LearnerProgress nextLearnerProgress = calculateProgress(toolSession.getToolActivity(), learner, toolSession.getLesson()); + return activityMappings.getProgressURL(nextLearnerProgress); } - catch (ProgressException e) { - // log e + catch (ProgressException e) + { throw new LearnerServiceException(e.getMessage()); } - - return url; + catch (UnsupportedEncodingException e) + { + throw new LearnerServiceException(e.getMessage()); + } } //--------------------------------------------------------------------- Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java =================================================================== diff -u -rec41df86451fb6307b8f9600958646ab4f4774bd -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (.../ActivityAction.java) (revision ec41df86451fb6307b8f9600958646ab4f4774bd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (.../ActivityAction.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -112,13 +112,14 @@ * @param learnerProgress, the current LearerProgress * @return Activity in request */ - protected Activity getActivity(HttpServletRequest request, ActivityForm form, LearnerProgress learnerProgress) { + protected Activity getActivity(HttpServletRequest request, ActivityForm form, LearnerProgress learnerProgress) + { Activity activity = (Activity)request.getAttribute(ActivityAction.ACTIVITY_REQUEST_ATTRIBUTE); - if (activity == null) { + if (activity == null) + { Long activityId = form.getActivityId(); - if (activityId != null) { + if (activityId != null) activity = getActivity(activityId.longValue(), learnerProgress); - } } return activity; } @@ -129,7 +130,8 @@ * @param request * @param activity */ - protected void setActivity(HttpServletRequest request, Activity activity) { + protected void setActivity(HttpServletRequest request, Activity activity) + { request.setAttribute(ActivityAction.ACTIVITY_REQUEST_ATTRIBUTE, activity); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java =================================================================== diff -u -rec41df86451fb6307b8f9600958646ab4f4774bd -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision ec41df86451fb6307b8f9600958646ab4f4774bd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -22,6 +22,7 @@ package org.lamsfoundation.lams.learning.web.util; import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import org.apache.struts.action.ActionForward; @@ -31,7 +32,6 @@ import org.lamsfoundation.lams.learningdesign.ParallelActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; -import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.tool.service.LamsToolServiceException; @@ -137,20 +137,10 @@ * @param activity, the Activity to be displayed * @param progress, the LearnerProgress associated with the Activity and learner */ - public String getActivityURL(Activity activity, LearnerProgress progress) { - String activityURL = null; - - if (activity instanceof ToolActivity) { - activityURL = getToolURL((ToolActivity)activity, progress); - } - else { - // use LAMS action - String strutsAction = null; - strutsAction = this.activityMappingStrategy.getActivityAction(activity, progress); - activityURL = strutsActionToURL(strutsAction, activity, true); - } - - return activityURL; + public String getActivityURL(Activity activity, LearnerProgress progress) + { + String strutsAction = this.activityMappingStrategy.getActivityAction(activity, progress); + return strutsActionToURL(strutsAction, activity, true); } /** @@ -160,36 +150,40 @@ * the URL will be the action for displaying the tool. * Note that the URL could also be a wait message or a jsp to clear the frames. * @param progress, the current LearnerProgress. + * @throws UnsupportedEncodingException */ - public String getProgressURL(LearnerProgress progress) { + public String getProgressURL(LearnerProgress progress) throws UnsupportedEncodingException { String activityURL = null; // TODO: lesson complete - if (progress.isLessonComplete()) { + if (progress.isLessonComplete()) + { // If lesson complete forward to lesson complete action. This action will // cause a client request to clear ALL frames. String strutsAction = this.getActivityMappingStrategy().getLessonCompleteAction(); activityURL = strutsActionToURL(strutsAction, null, true); } - else { - Activity nextActivity = progress.getNextActivity(); - Activity previousActivity = progress.getPreviousActivity(); - Activity currentActivity = progress.getCurrentActivity(); + else + { + //Activity currentActivity = progress.getCurrentActivity(); - if (progress.isParallelWaiting()) { + if (progress.isParallelWaiting()) + { // progress is waiting, goto waiting page String strutsAction = this.getActivityMappingStrategy().getWaitingAction(); activityURL = strutsActionToURL(strutsAction, null, true); } - else { + else + { // display next activity - activityURL = this.getActivityURL(nextActivity, progress); - if (previousActivity instanceof ParallelActivity) { + activityURL = this.getActivityURL(progress.getNextActivity(), progress); + if (progress.getPreviousActivity() instanceof ParallelActivity) + { // if previous activity was a parallel activity then we need to // clear frames. String strutsAction = "/requestDisplay.do"; String redirectURL = strutsActionToURL(strutsAction, null, true); - activityURL = URLEncoder.encode(activityURL); + activityURL = URLEncoder.encode(activityURL,"UTF-8"); activityURL = redirectURL+"?url="+activityURL; } } @@ -207,24 +201,19 @@ * @param progress, the current LearnerProgress, used to get activity status */ public String getToolURL(ToolActivity activity, LearnerProgress progress) { - Tool tool = activity.getTool(); - String url = tool.getLearnerUrl(); ToolSession toolSession; - try { + try + { // Get tool session using learner and activity - toolSession = toolService.getToolSession(progress.getUser(), activity); + toolSession = toolService.getToolSessionByLearner(progress.getUser(), activity); } catch (LamsToolServiceException e) { // TODO: should throw exception here return null; } - - // Append toolSessionId to tool URL - Long toolSessionId = toolSession.getToolSessionId(); - url += "?toolSessionId="+toolSessionId; - - return url; + // Append toolSessionId to tool URL + return activity.getTool().getLearnerUrl()+"?toolSessionId="+toolSession.getToolSessionId(); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java =================================================================== diff -u -rec41df86451fb6307b8f9600958646ab4f4774bd -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (.../ActivityMappingStrategy.java) (revision ec41df86451fb6307b8f9600958646ab4f4774bd) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (.../ActivityMappingStrategy.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -65,8 +65,8 @@ } if (activity instanceof ToolActivity) { // get tool URL - //strutsAction = "/DisplayLoadToolActivity.do"; - strutsAction = "/DisplayToolActivity.do"; + strutsAction = "/DisplayLoadToolActivity.do"; + //strutsAction = "/DisplayToolActivity.do"; } } return strutsAction; Index: lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml =================================================================== diff -u -r61ab8aad9c6a33202b47ca6089e89653b5131b09 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 61ab8aad9c6a33202b47ca6089e89653b5131b09) +++ lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -29,6 +29,7 @@ PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED + PROPAGATION_REQUIRES_NEW,ISOLATION_READ_COMMITTED @@ -41,6 +42,7 @@ + http://localhost:8080/lams_learning/ Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java =================================================================== diff -u -rb518266b001deca868eb67fedbbb9fc079f9bd58 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java (.../DummyLearnerService.java) (revision b518266b001deca868eb67fedbbb9fc079f9bd58) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java (.../DummyLearnerService.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -21,6 +21,7 @@ package org.lamsfoundation.lams.learning.service; +import java.io.UnsupportedEncodingException; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -30,7 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.lamsfoundation.lams.learning.web.bean.ActivityURL; import org.lamsfoundation.lams.learning.web.util.ActivityMapping; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator; @@ -41,8 +41,6 @@ import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.lesson.LessonCompleteActivity; -import org.lamsfoundation.lams.lesson.ParallelWaitActivity; import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.usermanagement.User; @@ -191,18 +189,25 @@ return progress; } - public String completeToolActivity(long toolSessionId) { + public String completeToolSession(long toolSessionId, User learner) { // get learner, lesson and activity using toolSessionId - User learner = null; + //User learner = null; Lesson lesson = null; //Activity activity = null; LearnerProgress progress = getProgress(); Activity activity = getActivity(toolSessionId, progress); progress = calculateProgress(activity, learner, lesson); - String url = activityMapping.getProgressURL(progress); - - return url; + try + { + return activityMapping.getProgressURL(progress); + } + catch (UnsupportedEncodingException e) + { + e.printStackTrace(); + return null; + } + } Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== diff -u -r61ab8aad9c6a33202b47ca6089e89653b5131b09 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 61ab8aad9c6a33202b47ca6089e89653b5131b09) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -33,6 +33,9 @@ import org.lamsfoundation.lams.lesson.dao.ILessonDAO; import org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO; import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO; +import org.lamsfoundation.lams.tool.ToolSession; +import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; +import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO; import org.lamsfoundation.lams.tool.service.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -49,31 +52,35 @@ private IUserManagementService usermanageService; private ILessonDAO lessonDao; private ILearnerProgressDAO learnerProgressDao; + private IToolSessionDAO toolSessionDao; //--------------------------------------------------------------------- // Testing Data - Constants //--------------------------------------------------------------------- private final Integer TEST_USER_ID = new Integer(2); - private final Long Test_Lesson_ID = new Long(1); + private final Long Test_Lesson_ID = new Long(2); + private final long TEST_TOOL_SESSION_ID = 1; //--------------------------------------------------------------------- // Testing Data - Instance Variables //--------------------------------------------------------------------- private User testUser; private Lesson testLesson; private static LearnerProgress testProgress; - private static final long TEST_NB_ACTIVITY_ID = 15; - private static final long TEST_RGRP_ACTIVITY_ID = 23; - private static final long TEST_CHAT_ACTIVITY_ID = 21; - private static final long TEST_QNA_ACTIVITY_ID = 24; - private static final long TEST_OPTIONS_ACTIVITY_ID = 12; - private static final long TEST_CNB_ACTIVITY_ID = 16; - private static final long TEST_PARALLEL_ACTIVITY_ID = 13; - private static final long TEST_CQNA_ACTIVITY_ID = 18; + private static final long TEST_NB_ACTIVITY_ID = 26; + private static final long TEST_RGRP_ACTIVITY_ID = 31; + private static final long TEST_CHAT_ACTIVITY_ID = 30; + private static final long TEST_QNA_ACTIVITY_ID = 35; + private static final long TEST_OPTIONS_ACTIVITY_ID = 37; + private static final long TEST_CNB_ACTIVITY_ID = 39; + private static final long TEST_PARALLEL_ACTIVITY_ID = 27; + private static final long TEST_CQNA_ACTIVITY_ID = 28; private static final long TEST_WAITING_ACTIVITY_ID = -1; - private static final long TEST_MB_ACTIVITY_ID = 19; - private static final long TEST_SEQUENCE_ACTIVITY_ID = 14; - private static final long TEST_SR_ACTIVITY_ID = 22; - private static final long TEST_SQNA_ACTIVITY_ID = 25; - + private static final long TEST_MB_ACTIVITY_ID = 29; + private static final long TEST_SEQUENCE_ACTIVITY_ID = 32; + private static final long TEST_SR_ACTIVITY_ID = 34; + private static final long TEST_SQNA_ACTIVITY_ID = 33; + private static final String HOST="http://localhost:8080/lams_learning/"; + private static final String LOAD_TOOL_URL="/DisplayLoadToolActivity.do"; + private static final String PARAM_ACTIVITY_ID="?activityId="; /* * @see TestCase#setUp() */ @@ -84,6 +91,7 @@ usermanageService = (IUserManagementService)this.context.getBean("userManagementService"); lessonDao = (LessonDAO)this.context.getBean("lessonDAO"); learnerProgressDao = (LearnerProgressDAO)this.context.getBean("learnerProgressDAO"); + toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO"); testUser = usermanageService.getUserById(TEST_USER_ID); testLesson = lessonDao.getLesson(Test_Lesson_ID); @@ -123,9 +131,9 @@ assertNotNull(testProgress); assertNotNull("verify next activity",testProgress.getNextActivity()); - assertEquals("verify id of next activity-survey",20,testProgress.getNextActivity().getActivityId().longValue()); + assertEquals("verify id of next activity-survey",36,testProgress.getNextActivity().getActivityId().longValue()); assertNotNull("verify current activity",testProgress.getCurrentActivity()); - assertEquals("verify id of current activity-survey",20,testProgress.getCurrentActivity().getActivityId().longValue()); + assertEquals("verify id of current activity-survey",36,testProgress.getCurrentActivity().getActivityId().longValue()); assertEquals("verify attempted activity",1,testProgress.getAttemptedActivities().size()); assertEquals("verify completed activity",0,testProgress.getCompletedActivities().size()); assertNotNull("verify correspondent tool session for next activity", @@ -221,8 +229,20 @@ assertTrue("verify lesson complete",testProgress.isLessonComplete()); } + public void testCompleteToolSession() + { + String urlForNextActivity = learnerService.completeToolSession(TEST_TOOL_SESSION_ID,testUser); + + ToolSession toolSession = toolSessionDao.getToolSession(new Long(TEST_TOOL_SESSION_ID)); + + assertNotNull("verify the existance of tool session",toolSession); + assertEquals("verify tool session state",ToolSession.ENDED_STATE,toolSession.getToolSessionStateId()); + + assertEquals("verify the returned url",HOST+LOAD_TOOL_URL+PARAM_ACTIVITY_ID+TEST_NB_ACTIVITY_ID,urlForNextActivity); + + } /** - * @param numberOfAttemptedAct TODO + * @param numberOfAttemptedAct * @param testCompletedActivity */ private void assertLearnerProgress(Activity testRootPreviousActivity, Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java =================================================================== diff -u -rec41df86451fb6307b8f9600958646ab4f4774bd -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java (.../DummyToolAction.java) (revision ec41df86451fb6307b8f9600958646ab4f4774bd) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/DummyToolAction.java (.../DummyToolAction.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -33,10 +33,10 @@ import org.lamsfoundation.lams.learning.service.LearnerServiceProxy; import org.lamsfoundation.lams.learning.service.DummyLearnerService; import org.lamsfoundation.lams.learning.web.form.DummyToolForm; -import org.lamsfoundation.lams.learning.web.util.ActivityMapping; -import org.lamsfoundation.lams.learning.web.util.ActivityMappingWithToolWait; + + /** * * XDoclet definition: @@ -80,7 +80,7 @@ DummyLearnerService learnerService = (DummyLearnerService)LearnerServiceProxy.getLearnerService(this.getServlet().getServletContext()); learnerService.setRequest(request); - String url = learnerService.completeToolActivity(toolSessionId); + String url = learnerService.completeToolSession(toolSessionId, null); try { response.sendRedirect(url); } Index: lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java =================================================================== diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java (.../DummyToolService.java) (revision 36c2ed010b8a3893b895d781be1a219f2380e62d) +++ lams_learning/test/java/org/lamsfoundation/lams/tool/service/DummyToolService.java (.../DummyToolService.java) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -24,6 +24,8 @@ import java.util.List; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.NonGroupedToolSession; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.usermanagement.User; @@ -38,14 +40,37 @@ return null; } - public ToolSession createToolSession(User learner, Activity activity) throws LamsToolServiceException { - return null; - } - public ToolSession getToolSession(User learner, Activity activity) throws LamsToolServiceException { ToolSession toolSession = new NonGroupedToolSession(); toolSession.setToolSessionId(activity.getActivityId()); return toolSession; } + /** + * @see org.lamsfoundation.lams.tool.service.ILamsToolService#createToolSession(org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.learningdesign.ToolActivity, org.lamsfoundation.lams.lesson.Lesson) + */ + public ToolSession createToolSession(User learner, ToolActivity activity, Lesson lesson) throws LamsToolServiceException + { + // TODO Auto-generated method stub + return null; + } + + /** + * @see org.lamsfoundation.lams.tool.service.ILamsToolService#notifyToolsToCreateSession(java.lang.Long, org.lamsfoundation.lams.learningdesign.ToolActivity) + */ + public void notifyToolsToCreateSession(Long toolSessionId, ToolActivity activity) + { + // TODO Auto-generated method stub + + } + + /** + * @see org.lamsfoundation.lams.tool.service.ILamsToolService#copyToolContent(org.lamsfoundation.lams.learningdesign.ToolActivity) + */ + public Long copyToolContent(ToolActivity toolActivity) + { + // TODO Auto-generated method stub + return null; + } + } Index: lams_learning/web/WEB-INF/lib/antlr.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/aopalliance.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/ehcache-1.0.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/hibernate2.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/lams.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/mysql-connector-java-3.1.7-bin.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/lib/spring.jar =================================================================== diff -u Binary files differ Index: lams_learning/web/WEB-INF/spring/learningApplicationContext.xml =================================================================== diff -u -rdff12756a175de59fb0e8ea5d44e9fc1a3bc7f24 -r2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1 --- lams_learning/web/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision dff12756a175de59fb0e8ea5d44e9fc1a3bc7f24) +++ lams_learning/web/WEB-INF/spring/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 2ca1fa90ed42cdcd0438bad1b8282f39c995d2b1) @@ -39,7 +39,7 @@ - http://127.0.0.1:8080/lams_learning/ + http://localhost:8080/lams_learning/