Index: lams_build/lib/lams/lams-central.jar =================================================================== diff -u -r64cedc718771cb006126f6eb336ceef69728a40e -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b Binary files differ Index: lams_build/lib/lams/lams-contentrepository.jar =================================================================== diff -u -r6a2e3c93508c73e6d5c35d457f495557da8ac194 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b Binary files differ Index: lams_build/lib/lams/lams-learning.jar =================================================================== diff -u -r64cedc718771cb006126f6eb336ceef69728a40e -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b Binary files differ Index: lams_build/lib/lams/lams-monitoring.jar =================================================================== diff -u -r64cedc718771cb006126f6eb336ceef69728a40e -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r57cd145a5ab0648d910fd52acbb0ee69892edb44 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b Binary files differ Index: lams_learning/build.xml =================================================================== diff -u -r7f80ba8587932005ce6285ea17c4f91f94b6e02c -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/build.xml (.../build.xml) (revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c) +++ lams_learning/build.xml (.../build.xml) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -53,8 +53,7 @@ - + @@ -292,8 +291,8 @@ - + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java =================================================================== diff -u -rf5b9c3f37781361190fe2a02de680d20681efdc2 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision f5b9c3f37781361190fe2a02de680d20681efdc2) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (.../ExportPortfolioService.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -27,43 +27,34 @@ */ package org.lamsfoundation.lams.learning.export.service; -import java.util.Set; -import java.util.Iterator; -import java.util.List; -import java.util.TreeSet; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import java.util.Vector; -import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.lesson.LearnerProgress; - +import org.lamsfoundation.lams.learning.export.ExportPortfolioException; +import org.lamsfoundation.lams.learning.export.Portfolio; +import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator; import org.lamsfoundation.lams.learningdesign.LearningDesign; -import org.lamsfoundation.lams.learningdesign.SimpleActivity; -import org.lamsfoundation.lams.learningdesign.ComplexActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; - +import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.Tool; -import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; +import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; -import org.lamsfoundation.lams.tool.ToolAccessMode; - -import org.lamsfoundation.lams.util.WebUtil; - -import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; - -import org.lamsfoundation.lams.learning.export.Portfolio; -import org.lamsfoundation.lams.learning.export.ExportPortfolioException; -import org.lamsfoundation.lams.learning.service.ILearnerService; - +import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; +import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileUtilException; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; @@ -129,7 +120,9 @@ return portfolios; } - /** returns a Portfolio array , change from void to Portfolio[]*/ + /* returns a Portfolio array , change from void to Portfolio[] + * Not used currently - was having problems with lazy initialisation. Delete once export + * portfolio is working. public Portfolio[] exportPortfolioForStudent(LearnerProgress learnerProgress, User user, boolean anonymity) { if (learnerProgress == null || user == null) @@ -153,7 +146,9 @@ } - + */ + /* Not used currently - was having problems with lazy initialisation. Delete once export + * portfolio is working. public Portfolio[] exportPortfolioForStudent(Lesson lesson, User user, boolean anonymity) { if (lesson == null || user == null) @@ -178,7 +173,7 @@ } - + */ public Portfolio[] exportPortfolioForStudent(Long learnerProgressId, User user, boolean anonymity) { if (learnerProgressId == null || user == null) @@ -305,45 +300,36 @@ } HashMap activityTree = learningDesign.getActivityTree(); Vector v = new Vector(); - Activity firstActivity = learningDesign.getFirstActivity(); - if(firstActivity.isComplexActivity()){ - ComplexActivity complexActivity = (ComplexActivity)firstActivity; - Iterator childIterator = complexActivity.getActivities().iterator(); - while(childIterator.hasNext()){ - //SimpleActivity simpleActivity= (SimpleActivity)childIterator.next(); - //v.add(simpleActivity); - - Activity simpleActivity= (Activity)childIterator.next(); - v.add(simpleActivity); - } - }else{ - SimpleActivity simpleActivity = (SimpleActivity)firstActivity; - v.add(simpleActivity); - } + Activity nextActivity = learningDesign.getFirstActivity(); - Activity nextActivity = transitionDAO.getNextActivity(firstActivity.getActivityId()); while(nextActivity!=null){ - Set childActivities = (Set) activityTree.get(nextActivity.getActivityId()); - if(childActivities.size()!=0){ - Iterator iterator = childActivities.iterator(); - while(iterator.hasNext()){ - /*SimpleActivity simpleActivity= (SimpleActivity)iterator.next(); - v.add(simpleActivity);*/ - Activity simpleActivity= (Activity)iterator.next(); - v.add(simpleActivity); - } - }else{ - /*SimpleActivity simpleActivity = (SimpleActivity)nextActivity; - v.add(simpleActivity);*/ - - v.add(nextActivity); - } - + addActivityToVector(activityTree, v, nextActivity); nextActivity = transitionDAO.getNextActivity(nextActivity.getActivityId()); } return v; } + + /** + * Used by getOrderedActivityList(LearningDesign) + * + * @param activityTree + * @param v + * @param nextActivity + */ + private void addActivityToVector(HashMap activityTree, Vector v, Activity activity) { + Set childActivities = (Set) activityTree.get(activity.getActivityId()); + if(childActivities.size()!=0){ + // must have been a complex activity + v.addAll(childActivities); + }else{ + // must be a simple activity + v.add(activity); + } + } + + /* Not used currently - was having problems with lazy initialisation. Delete once export + * portfolio is working. public Vector getOrderedActivityList(LearnerProgress learnerProgress) { if (learnerProgress == null) @@ -352,11 +338,11 @@ throw new ExportPortfolioException(error); } Set activitySet = learnerProgress.getCompletedActivities(); - /* if (activitySet.size() == 0) - { - String error="Cannot export your portfolio. You have not completed any activities yet."; - throw new ExportPortfolioException(error); - } */ + //if (activitySet.size() == 0) + //{ + // String error="Cannot export your portfolio. You have not completed any activities yet."; + // throw new ExportPortfolioException(error); + //} TreeSet sortedActivities = new TreeSet(new ActivityOrderComparator()); sortedActivities.addAll(activitySet); @@ -377,7 +363,9 @@ return v; } + */ + public Vector getOrderedActivityList(Long learnerProgressId) { if (learnerProgressId == null) Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java =================================================================== diff -u -rf5b9c3f37781361190fe2a02de680d20681efdc2 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java (.../IExportPortfolioService.java) (revision f5b9c3f37781361190fe2a02de680d20681efdc2) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java (.../IExportPortfolioService.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -30,18 +30,15 @@ package org.lamsfoundation.lams.learning.export.service; import java.util.Map; -import java.util.Set; -import java.util.SortedSet; import java.util.Vector; -import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.learning.export.Portfolio; +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.learning.export.Portfolio; -import org.lamsfoundation.lams.learningdesign.ToolActivity; -import org.lamsfoundation.lams.learningdesign.LearningDesign; /** * @author mtruong * @@ -69,9 +66,9 @@ public Portfolio[] exportPortfolioForTeacher(Lesson lesson); - public Portfolio[] exportPortfolioForStudent(LearnerProgress learnerProgress, User user, boolean anonymity); + //public Portfolio[] exportPortfolioForStudent(LearnerProgress learnerProgress, User user, boolean anonymity); - public Portfolio[] exportPortfolioForStudent(Lesson lesson, User user, boolean anonymity); + //public Portfolio[] exportPortfolioForStudent(Lesson lesson, User user, boolean anonymity); public Portfolio[] exportPortfolioForStudent(Long learnerProgressId, User user, boolean anonymity); @@ -83,7 +80,7 @@ public Vector getOrderedActivityList(LearningDesign learningDesign); - public Vector getOrderedActivityList(LearnerProgress learnerProgress); + //public Vector getOrderedActivityList(LearnerProgress learnerProgress); /** * Returns the ordered activity list containing the list of activities Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java =================================================================== diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision 35d5350252748108494c7cb4bfc2e7d5f2271cba) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (.../ProgressEngine.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -167,14 +167,17 @@ if (parent != null) { - if(!(parent instanceof ComplexActivity)) + if(!(parent.isComplexActivity())) throw new ProgressException("Parent activity is always expected" + " to the complex activity. But activity type"+ parent.getActivityTypeId()+" has been found"); //move to next activity within parent if not all children are completed. - if (!((ComplexActivity)parent).areChildrenCompleted(learnerProgress)) + + // TODO make sure we really have a complex activity, not a CGLIB proxy of activity. + ComplexActivity complexParent = (ComplexActivity)parent; + if (!complexParent.areChildrenCompleted(learnerProgress)) { - Activity nextActivity = ((ComplexActivity)parent).getNextActivityByParent(completedActivity); + Activity nextActivity = complexParent.getNextActivityByParent(completedActivity); if (!isNextActivityValid(nextActivity)) Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java =================================================================== diff -u -r2be42c6e48f5cdb13f0e6634b52d36ac732eca09 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 2be42c6e48f5cdb13f0e6634b52d36ac732eca09) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.learning.service.LearnerServiceException; import org.lamsfoundation.lams.learning.web.action.ActivityAction; import org.lamsfoundation.lams.learningdesign.Activity; -import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.ParallelActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; @@ -82,7 +81,7 @@ //String strutsAction = getActivityAction(activity, progress); String strutsAction = this.activityMappingStrategy.getActivityAction(activity, progress); - if (activity instanceof ToolActivity) + if (activity.isToolActivity()) { // always use redirect false for a ToolActivity as ToolDisplayActivity // does it's own redirect @@ -216,7 +215,7 @@ // display next activity activityURL = this.getActivityURL(progress.getNextActivity(), progress); - if (progress.getPreviousActivity() instanceof ParallelActivity) + if (progress.getPreviousActivity().isParallelActivity()) { // if previous activity was a parallel activity then we need to // clear frames. @@ -327,11 +326,11 @@ Activity activity) { - if (activity instanceof ToolActivity) + if (activity.isToolActivity()) { return getLearnerToolURL(((ToolActivity) activity), learner); } - else if (activity instanceof GroupingActivity) + else if (activity.isGroupingActivity()) //TODO need to be changed when group action servlet is done return getActivityURL(activity, null); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java =================================================================== diff -u -rfdfe33f9febbb6d1b96a2f84b6902f7f8f628ad9 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (.../ActivityMappingStrategy.java) (revision fdfe33f9febbb6d1b96a2f84b6902f7f8f628ad9) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (.../ActivityMappingStrategy.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -24,13 +24,6 @@ import java.io.Serializable; import org.lamsfoundation.lams.learningdesign.Activity; -import org.lamsfoundation.lams.learningdesign.ComplexActivity; -import org.lamsfoundation.lams.learningdesign.GateActivity; -import org.lamsfoundation.lams.learningdesign.GroupingActivity; -import org.lamsfoundation.lams.learningdesign.OptionsActivity; -import org.lamsfoundation.lams.learningdesign.ParallelActivity; -import org.lamsfoundation.lams.learningdesign.SimpleActivity; -import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.LearnerProgress; /** @@ -48,28 +41,29 @@ protected String getActivityAction(Activity activity, LearnerProgress progress) { String strutsAction = null; - if (activity instanceof ComplexActivity) - { - if (activity instanceof ParallelActivity) + if ( activity.isComplexActivity() ) { + if ( activity.isParallelActivity() ) strutsAction = "/DisplayParallelActivity.do"; - else if (activity instanceof OptionsActivity) + else if (activity.isOptionsActivity()) strutsAction = "/DisplayOptionsActivity.do"; } - else if (activity instanceof SimpleActivity) + else // should be a simple activity { - if (activity instanceof GroupingActivity) + if ( activity.isGroupingActivity()) { strutsAction = "/grouping.do?"; - if (activity instanceof GateActivity) { + } + else if (activity.isGateActivity()) { strutsAction = "/gate.do"; // not completed so return wait URL } - if (activity instanceof ToolActivity) + else if (activity.isToolActivity()) { strutsAction = "/LoadToolActivity.do"; //strutsAction = "/DisplayToolActivity.do"; + } } return strutsAction; } - + /** * Returns the struts action for displaying the parallel wait. */ Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java =================================================================== diff -u -r6faa51252d8f8117db65e0a58ff295def4cf7af9 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 6faa51252d8f8117db65e0a58ff295def4cf7af9) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (.../TestLearnerService.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -24,8 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.test.AbstractLamsTestCase; - import org.lamsfoundation.lams.learning.progress.ProgressException; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.GateActivity; @@ -34,12 +32,14 @@ import org.lamsfoundation.lams.learningdesign.OptionsActivity; import org.lamsfoundation.lams.learningdesign.ParallelActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; 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.test.AbstractLamsTestCase; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO; @@ -66,6 +66,7 @@ private IUserManagementService usermanageService; private ILessonDAO lessonDao; private ILearnerProgressDAO learnerProgressDao; + private IActivityDAO activityDao; private IToolSessionDAO toolSessionDao; //--------------------------------------------------------------------- // Testing Data - Constants @@ -101,7 +102,7 @@ private static final long TEST_SQNA_ACTIVITY_UIID = 25; private static final long TEST_SCHEDULE_GATE_ACTIVITY_UIID = 27; private static final long TEST_PERMISSION_GATE_ACTIVITY_UIID = 28; - private static final String HOST="http://localhost:8080/lams_learning"; + private static final String HOST="http://localhost:8080/lams/learning"; private static final String LOAD_TOOL_URL="/LoadToolActivity.do"; private static final String GATE_URL="/gate.do"; private static final String PARAM_ACTIVITY_ID="?activityId="; @@ -117,6 +118,7 @@ lessonDao = (LessonDAO)this.context.getBean("lessonDAO"); learnerProgressDao = (LearnerProgressDAO)this.context.getBean("learnerProgressDAO"); toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO"); + activityDao = (IActivityDAO)this.context.getBean("activityDAO"); testUser = usermanageService.getUserById(TEST_USER_ID); testLesson = lessonDao.getLesson(Test_Lesson_ID); @@ -140,38 +142,36 @@ } protected String[] getContextConfigLocation() { - return new String[] { "classpath:/org/lamsfoundation/lams/localApplicationContext.xml", - "classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml", - "classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml", - "classpath:/org/lamsfoundation/lams/tool/survey/applicationContext.xml"}; - -/* return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", - "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", - "/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", - "/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml", - "/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml", - "applicationContext.xml", - "/WEB-INF/spring/learningApplicationContext.xml"}; */ + return new String[] { + "/org/lamsfoundation/lams/localApplicationContext.xml", + "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", + "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", + "/org/lamsfoundation/lams/tool/survey/applicationContext.xml", + "/org/lamsfoundation/lams/learning/learningApplicationContext.xml"}; } public void testJoinLesson() throws ProgressException,LamsToolServiceException { learnerService.joinLesson(testUser,testLesson); testProgress=learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson); - assertNotNull(testProgress); - assertNotNull("verify next activity",testProgress.getNextActivity()); - assertEquals("verify id of next activity-survey",6,testProgress.getNextActivity().getActivityUIID().intValue()); - assertNotNull("verify current activity",testProgress.getCurrentActivity()); - assertEquals("verify id of current activity-survey",6,testProgress.getCurrentActivity().getActivityUIID().intValue()); + + // get the next activity, and get it by its proper class so we can analyse it! + Activity nextActivity = testProgress.getNextActivity(); + Activity currentActivity = testProgress.getCurrentActivity(); + assertNotNull("verify next activity",nextActivity); + assertEquals("verify id of next activity-survey",6,nextActivity.getActivityUIID().intValue()); + assertNotNull("verify current activity",currentActivity); + assertEquals("verify id of current activity-survey",6,currentActivity.getActivityUIID().intValue()); assertEquals("verify attempted activity",1,testProgress.getAttemptedActivities().size()); assertEquals("verify completed activity",0,testProgress.getCompletedActivities().size()); + + ToolActivity nextToolActivity = (ToolActivity) activityDao.getActivityByActivityId(nextActivity.getActivityId()); assertNotNull("verify correspondent tool session for next activity", - ((ToolActivity)testProgress.getNextActivity()).getToolSessions()); + nextToolActivity.getToolSessions()); assertEquals("verify number of tool sessions created",1, - ((ToolActivity)testProgress.getNextActivity()).getToolSessions().size()); + nextToolActivity.getToolSessions().size()); } @@ -184,6 +184,8 @@ assertNotNull("verify the existance of tool session",toolSession); assertEquals("verify tool session state",ToolSession.ENDED_STATE,toolSession.getToolSessionStateId()); + System.out.println("HOST+GATE_URL+PARAM_ACTIVITY_ID+TEST_SYNCHGATE_ACTIVITY_ID+&progressId=1: "+HOST+GATE_URL+PARAM_ACTIVITY_ID+TEST_SYNCHGATE_ACTIVITY_ID+"&progressId=1"); + System.out.println("urlForNextActivity: "+urlForNextActivity); assertEquals("verify the returned url",HOST+GATE_URL+PARAM_ACTIVITY_ID+TEST_SYNCHGATE_ACTIVITY_ID+"&progressId=1",urlForNextActivity); } Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java =================================================================== diff -u -r6faa51252d8f8117db65e0a58ff295def4cf7af9 -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java (.../AbstractTestAction.java) (revision 6faa51252d8f8117db65e0a58ff295def4cf7af9) +++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java (.../AbstractTestAction.java) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -44,9 +44,7 @@ { return "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml " +"/org/lamsfoundation/lams/tool/toolApplicationContext.xml " - +"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml " - +"/org/lamsfoundation/lams/localapplicationContext.xml " - +"/WEB-INF/spring/learningApplicationContext.xml"; + +"/org/lamsfoundation/lams/localApplicationContext.xml "; } /** * @see org.lamsfoundation.lams.AbstractLamsStrutsTestCase#getHibernateSessionFactoryBeanName() Fisheye: Tag 4e143f1522cf63a2c32a7cb22a3c1ea57853284b refers to a dead (removed) revision in file `lams_learning/test/web/WEB-INF/spring/applicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4e143f1522cf63a2c32a7cb22a3c1ea57853284b refers to a dead (removed) revision in file `lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4e143f1522cf63a2c32a7cb22a3c1ea57853284b refers to a dead (removed) revision in file `lams_learning/test/web/WEB-INF/spring/dbConnection.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 4e143f1522cf63a2c32a7cb22a3c1ea57853284b refers to a dead (removed) revision in file `lams_learning/test/web/WEB-INF/spring/learningApplicationContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/test/web/WEB-INF/web.xml =================================================================== diff -u -r7f80ba8587932005ce6285ea17c4f91f94b6e02c -r4e143f1522cf63a2c32a7cb22a3c1ea57853284b --- lams_learning/test/web/WEB-INF/web.xml (.../web.xml) (revision 7f80ba8587932005ce6285ea17c4f91f94b6e02c) +++ lams_learning/test/web/WEB-INF/web.xml (.../web.xml) (revision 4e143f1522cf63a2c32a7cb22a3c1ea57853284b) @@ -31,10 +31,18 @@ contextConfigLocation - /WEB-INF/spring/dataAccessContext.xml /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml - /WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath*:applicationContext.xml + + + org.springframework.web.context.ContextLoaderListener + +