Index: lams_build/lib/lams/lams-contentrepository.jar =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 Binary files differ Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/util/CentralToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java =================================================================== diff -u -r34afd44fc6deb2b8c3e68c601968a09f76fa4537 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision 34afd44fc6deb2b8c3e68c601968a09f76fa4537) +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -39,13 +39,13 @@ import org.apache.struts.action.ActionMessages; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.contentrepository.NodeKey; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.CentralToolContentHandler; import org.lamsfoundation.lams.util.CommonConstants; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; @@ -66,7 +66,7 @@ private static IUserManagementService service; private static ILogEventService logEventService; private static MessageService messageService; - private static CentralToolContentHandler centralToolContentHandler; + private static IToolContentHandler centralToolContentHandler; private static final String PORTRAIT_DELETE_AUDIT_KEY = "audit.delete.portrait"; /** @@ -204,11 +204,11 @@ return null; } - private CentralToolContentHandler getCentralToolContentHandler() { + private IToolContentHandler getCentralToolContentHandler() { if (centralToolContentHandler == null) { WebApplicationContext wac = WebApplicationContextUtils .getRequiredWebApplicationContext(getServlet().getServletContext()); - centralToolContentHandler = (CentralToolContentHandler) wac.getBean("centralToolContentHandler"); + centralToolContentHandler = (IToolContentHandler) wac.getBean("centralToolContentHandler"); } return centralToolContentHandler; } Index: lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml =================================================================== diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml (.../webApplicationContext.xml) (revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1) +++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml (.../webApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -4,9 +4,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - - - + + + centralworkspace + central + lams-central + org.lamsfoundation.lams.central.ApplicationResources Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r5caa0c70153ab564c5d8e347c4af4baf53b01fd0 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 5caa0c70153ab564c5d8e347c4af4baf53b01fd0) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -38,7 +38,6 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.authoring.service.IAuthoringFullService; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; @@ -74,7 +73,6 @@ protected ILearningDesignDAO learningDesignDAO; protected IAuthoringFullService authoringFullService; - protected IRepositoryService repositoryService; protected IUserManagementService userMgmtService; protected MessageService messageService; @@ -121,14 +119,6 @@ } /** - * @param repositoryService - * The repositoryService to set. - */ - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - - /** * @param learningDesignDAO * The learningDesignDAO to set. */ Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml (.../workspaceApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml (.../workspaceApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -22,7 +22,6 @@ - Index: lams_common/.classpath =================================================================== diff -u -r8236da64800893104429c9b88f89d500c505a9a1 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_common/.classpath (.../.classpath) (revision 8236da64800893104429c9b88f89d500c505a9a1) +++ lams_common/.classpath (.../.classpath) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -4,7 +4,6 @@ - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -54,8 +54,11 @@ - - + + + sharedassessmentworkspace + sharedassessment + lams-sharedresources Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -53,6 +53,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -100,7 +101,6 @@ import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils; import org.lamsfoundation.lams.tool.assessment.util.AssessmentQuestionResultComparator; import org.lamsfoundation.lams.tool.assessment.util.AssessmentSessionComparator; -import org.lamsfoundation.lams.tool.assessment.util.AssessmentToolContentHandler; import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -134,7 +134,7 @@ private AssessmentResultDAO assessmentResultDao; // tool service - private AssessmentToolContentHandler assessmentToolContentHandler; + private IToolContentHandler assessmentToolContentHandler; private MessageService messageService; @@ -2484,7 +2484,7 @@ this.assessmentSessionDao = assessmentSessionDao; } - public void setAssessmentToolContentHandler(AssessmentToolContentHandler assessmentToolContentHandler) { + public void setAssessmentToolContentHandler(IToolContentHandler assessmentToolContentHandler) { this.assessmentToolContentHandler = assessmentToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -66,9 +66,12 @@ - - - - + + + bbbworkspace + bbb + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -78,9 +78,12 @@ - - - - + + + chatworkspace + chat + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -43,9 +43,12 @@ - - - + + + dacoworkspace + daco + lams-daco + Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -39,6 +39,7 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.NodeKey; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; @@ -69,7 +70,6 @@ import org.lamsfoundation.lams.tool.daco.model.DacoQuestion; import org.lamsfoundation.lams.tool.daco.model.DacoSession; import org.lamsfoundation.lams.tool.daco.model.DacoUser; -import org.lamsfoundation.lams.tool.daco.util.DacoToolContentHandler; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -95,7 +95,7 @@ private DacoAnswerDAO dacoAnswerDao; // tool service - private DacoToolContentHandler dacoToolContentHandler; + private IToolContentHandler dacoToolContentHandler; private MessageService messageService; @@ -872,7 +872,7 @@ this.dacoSessionDao = dacoSessionDao; } - public void setDacoToolContentHandler(DacoToolContentHandler dacoToolContentHandler) { + public void setDacoToolContentHandler(IToolContentHandler dacoToolContentHandler) { this.dacoToolContentHandler = dacoToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml (.../dokumaranApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml (.../dokumaranApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -40,8 +40,11 @@ - - + + + dokumaranworkspace + dokumaran + lams-dokumaran Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -43,6 +43,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -70,7 +71,6 @@ import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranConfigItem; import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession; import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranUser; -import org.lamsfoundation.lams.tool.dokumaran.util.DokumaranToolContentHandler; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -98,7 +98,7 @@ private DokumaranConfigItemDAO dokumaranConfigItemDAO; // tool service - private DokumaranToolContentHandler dokumaranToolContentHandler; + private IToolContentHandler dokumaranToolContentHandler; private MessageService messageService; @@ -1071,7 +1071,7 @@ this.dokumaranConfigItemDAO = dokumaranConfigItemDAO; } - public void setDokumaranToolContentHandler(DokumaranToolContentHandler dokumaranToolContentHandler) { + public void setDokumaranToolContentHandler(IToolContentHandler dokumaranToolContentHandler) { this.dokumaranToolContentHandler = dokumaranToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/util/DokumaranToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -70,11 +70,11 @@ - - - - + + + forumworkspace + forumw + lams-forum - - - - + + + gmapworkspace + gmap + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -58,9 +58,12 @@ - - - + + + sharedimageGalleryworkspace + sharedimageGallery + lams-sharedresources + Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -48,6 +48,7 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.NodeKey; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; @@ -90,7 +91,6 @@ import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote; import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryItemComparator; -import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler; import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; @@ -125,7 +125,7 @@ private ImageGalleryConfigItemDAO imageGalleryConfigItemDAO; // tool service - private ImageGalleryToolContentHandler imageGalleryToolContentHandler; + private IToolContentHandler imageGalleryToolContentHandler; private MessageService messageService; @@ -675,7 +675,7 @@ this.imageGallerySessionDao = imageGallerySessionDao; } - public void setImageGalleryToolContentHandler(ImageGalleryToolContentHandler imageGalleryToolContentHandler) { + public void setImageGalleryToolContentHandler(IToolContentHandler imageGalleryToolContentHandler) { this.imageGalleryToolContentHandler = imageGalleryToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -48,9 +48,12 @@ - - - + + + sharedcommonCartridgeworkspace + sharedcommonCartridge + lams-sharedresources + Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -42,6 +42,7 @@ import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; @@ -75,7 +76,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemVisitLog; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser; -import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeToolContentHandler; import org.lamsfoundation.lams.tool.commonCartridge.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -108,7 +108,7 @@ private CommonCartridgeConfigItemDAO commonCartridgeConfigItemDao; // tool service - private CommonCartridgeToolContentHandler commonCartridgeToolContentHandler; + private IToolContentHandler commonCartridgeToolContentHandler; private MessageService messageService; @@ -533,8 +533,7 @@ this.commonCartridgeSessionDao = commonCartridgeSessionDao; } - public void setCommonCartridgeToolContentHandler( - CommonCartridgeToolContentHandler commonCartridgeToolContentHandler) { + public void setCommonCartridgeToolContentHandler(IToolContentHandler commonCartridgeToolContentHandler) { this.commonCartridgeToolContentHandler = commonCartridgeToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/CommonCartridgeToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.service.CommonCartridgeServiceProxy; import org.lamsfoundation.lams.tool.commonCartridge.service.ICommonCartridgeService; import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator; -import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeToolContentHandler; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -53,7 +52,6 @@ public class CompleteItemServlet extends HttpServlet { private static Logger log = Logger.getLogger(CompleteItemServlet.class); - private CommonCartridgeToolContentHandler handler; private ICommonCartridgeService service; @Override Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -99,9 +99,12 @@ - - - - + + + kalturaworkspace + kaltura + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/util/KalturaToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -43,11 +43,14 @@ + + + + lamc11 + lamc11 + lamc_11 + - - - - Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -53,9 +53,12 @@ - - - + + + + qaworkspace + qa_user + lams-qa Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -47,9 +47,12 @@ - - - + + + sharedresourcesworkspace + sharedresources + lams-sharedresources + Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -50,6 +50,7 @@ import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.NodeKey; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; @@ -94,7 +95,6 @@ import org.lamsfoundation.lams.tool.rsrc.model.ResourceSession; import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser; import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; -import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -123,7 +123,7 @@ private ResourceItemVisitDAO resourceItemVisitDao; // tool service - private ResourceToolContentHandler resourceToolContentHandler; + private IToolContentHandler resourceToolContentHandler; private MessageService messageService; @@ -1102,7 +1102,7 @@ this.resourceSessionDao = resourceSessionDao; } - public void setResourceToolContentHandler(ResourceToolContentHandler resourceToolContentHandler) { + public void setResourceToolContentHandler(IToolContentHandler resourceToolContentHandler) { this.resourceToolContentHandler = resourceToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -36,7 +36,6 @@ import org.lamsfoundation.lams.tool.rsrc.service.IResourceService; import org.lamsfoundation.lams.tool.rsrc.service.ResourceServiceProxy; import org.lamsfoundation.lams.tool.rsrc.util.ResourceItemComparator; -import org.lamsfoundation.lams.tool.rsrc.util.ResourceToolContentHandler; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -51,7 +50,6 @@ public class CompleteItemServlet extends HttpServlet { private static Logger log = Logger.getLogger(CompleteItemServlet.class); - private ResourceToolContentHandler handler; private IResourceService service; @Override Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -72,9 +72,12 @@ - - - - + + + leaderselectionworkspace + leaderselection + lams-ex + + Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java =================================================================== diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -29,13 +29,11 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.leaderselection.service.LeaderselectionService; /** * */ - public class Leaderselection implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 579733009969321015L; Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/util/LeaderselectionToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -87,9 +87,12 @@ - - - + + + + mindmapworkspace + mindmap + lams-ex Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -66,9 +66,12 @@ - - - - + + + nbworkspace + noticeboard + lams-nb + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -75,9 +75,12 @@ - - - - + + + notebookworkspace + notebook + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -75,12 +75,15 @@ - - - - + + + + pixlrworkspace + pixlr + lams-ex + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/util/PixlrToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -33,9 +33,12 @@ - - - + + + peerreviewworkspace + peerreview + lams-peerreview + Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -45,6 +45,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -77,7 +78,6 @@ import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; import org.lamsfoundation.lams.tool.peerreview.util.EmailAnalysisBuilder; -import org.lamsfoundation.lams.tool.peerreview.util.PeerreviewToolContentHandler; import org.lamsfoundation.lams.tool.peerreview.util.SpreadsheetBuilder; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; @@ -102,7 +102,7 @@ private PeerreviewSessionDAO peerreviewSessionDao; // tool service - private PeerreviewToolContentHandler peerreviewToolContentHandler; + private IToolContentHandler peerreviewToolContentHandler; private MessageService messageService; @@ -910,7 +910,7 @@ this.peerreviewSessionDao = peerreviewSessionDao; } - public void setPeerreviewToolContentHandler(PeerreviewToolContentHandler peerreviewToolContentHandler) { + public void setPeerreviewToolContentHandler(IToolContentHandler peerreviewToolContentHandler) { this.peerreviewToolContentHandler = peerreviewToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/PeerreviewToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -95,8 +95,12 @@ - - - + + + + SubmitFilesWorkspace + SubmitFilesLogin + SubmitFilesPassword + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -63,9 +63,12 @@ - - - + + + sharedscratchieworkspace + sharedscratchie + lams-sharedresources + Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -50,6 +50,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -94,7 +95,6 @@ import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator; import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator; -import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -130,7 +130,7 @@ private ScratchieConfigItemDAO scratchieConfigItemDao; // tool service - private ScratchieToolContentHandler scratchieToolContentHandler; + private IToolContentHandler scratchieToolContentHandler; private MessageService messageService; @@ -1827,7 +1827,7 @@ this.scratchieSessionDao = scratchieSessionDao; } - public void setScratchieToolContentHandler(ScratchieToolContentHandler scratchieToolContentHandler) { + public void setScratchieToolContentHandler(IToolContentHandler scratchieToolContentHandler) { this.scratchieToolContentHandler = scratchieToolContentHandler; } Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -67,9 +67,12 @@ - - - - + + + scribeworkspace + scribe + lams-ex + + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -35,6 +35,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; @@ -65,7 +66,6 @@ import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.util.ReflectDTOComparator; -import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetToolContentHandler; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -84,7 +84,7 @@ private UserModifiedSpreadsheetDAO userModifiedSpreadsheetDao; private SpreadsheetMarkDAO spreadsheetMarkDao; // tool service - private SpreadsheetToolContentHandler spreadsheetToolContentHandler; + private IToolContentHandler spreadsheetToolContentHandler; private MessageService messageService; // system services private ILamsToolService toolService; @@ -383,7 +383,7 @@ this.spreadsheetSessionDao = spreadsheetSessionDao; } - public void setSpreadsheetToolContentHandler(SpreadsheetToolContentHandler spreadsheetToolContentHandler) { + public void setSpreadsheetToolContentHandler(IToolContentHandler spreadsheetToolContentHandler) { this.spreadsheetToolContentHandler = spreadsheetToolContentHandler; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== diff -u -rde5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -46,9 +46,12 @@ - - - + + + sharedspreadsheetworkspace + sharedspreadsheet + lams-sharedresources + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/util/SpreadsheetToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -42,6 +42,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -78,7 +79,6 @@ import org.lamsfoundation.lams.tool.survey.util.QuestionsComparator; import org.lamsfoundation.lams.tool.survey.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.survey.util.SurveySessionComparator; -import org.lamsfoundation.lams.tool.survey.util.SurveyToolContentHandler; import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -104,7 +104,7 @@ private SurveySessionDAO surveySessionDao; // tool service - private SurveyToolContentHandler surveyToolContentHandler; + private IToolContentHandler surveyToolContentHandler; private MessageService messageService; @@ -885,7 +885,7 @@ this.surveySessionDao = surveySessionDao; } - public void setSurveyToolContentHandler(SurveyToolContentHandler surveyToolContentHandler) { + public void setSurveyToolContentHandler(IToolContentHandler surveyToolContentHandler) { this.surveyToolContentHandler = surveyToolContentHandler; } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -47,9 +47,12 @@ - - - + + + lasruvSurveyWorkspace + lasruvSurveys + lams-survey + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -40,6 +40,7 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.NodeKey; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -77,7 +78,6 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog; import org.lamsfoundation.lams.tool.taskList.model.TaskListSession; import org.lamsfoundation.lams.tool.taskList.model.TaskListUser; -import org.lamsfoundation.lams.tool.taskList.util.TaskListToolContentHandler; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -100,7 +100,7 @@ private TaskListItemAttachmentDAO taskListItemAttachmentDao; private TaskListItemCommentDAO taskListItemCommentDAO; // tool service - private TaskListToolContentHandler taskListToolContentHandler; + private IToolContentHandler taskListToolContentHandler; private MessageService messageService; private TaskListOutputFactory taskListOutputFactory; // system services @@ -515,7 +515,7 @@ this.taskListSessionDao = taskListSessionDao; } - public void setTaskListToolContentHandler(TaskListToolContentHandler taskListToolContentHandler) { + public void setTaskListToolContentHandler(IToolContentHandler taskListToolContentHandler) { this.taskListToolContentHandler = taskListToolContentHandler; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -54,9 +54,12 @@ - - - + + + sharedtaskListworkspace + sharedtaskList + lams-sharedresources + Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/util/TaskListToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml =================================================================== diff -u -r471b903caa3365758fbdec0a22440b1b0b3f2947 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision 471b903caa3365758fbdec0a22440b1b0b3f2947) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -40,11 +40,14 @@ + + + + vote11 + vote11 + vote_11 + - - - - Fisheye: Tag e2ab99460f405e52267d81c35ddb19b37edff7f3 refers to a dead (removed) revision in file `lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiToolContentHandler.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml =================================================================== diff -u -r02b9b123b891e60b57f7081ef284da2d41bc1253 -re2ab99460f405e52267d81c35ddb19b37edff7f3 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision 02b9b123b891e60b57f7081ef284da2d41bc1253) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml (.../wikiApplicationContext.xml) (revision e2ab99460f405e52267d81c35ddb19b37edff7f3) @@ -80,11 +80,14 @@ + + + + wikiworkspace + wiki + lams-ex + - - - -