Index: lams_central/.classpath =================================================================== diff -u -r96f14f440726936ee35b0547416534e59d3db24c -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_central/.classpath (.../.classpath) (revision 96f14f440726936ee35b0547416534e59d3db24c) +++ lams_central/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -3,7 +3,6 @@ - Index: lams_tool_assessment/.classpath =================================================================== diff -u -r387158ca81bf0a55eb075729ad4cce577b7dc26e -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_assessment/.classpath (.../.classpath) (revision 387158ca81bf0a55eb075729ad4cce577b7dc26e) +++ lams_tool_assessment/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -4,7 +4,6 @@ - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java (.../AssessmentConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,8 +28,6 @@ public static final String ASSESSMENT_SERVICE = "laasseAssessmentService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "laasseAssessmentToolContentHandler"; - public static final int COMPLETED = 1; public static final int INITIAL_OPTIONS_NUMBER = 3; Index: lams_tool_bbb/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_bbb/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_bbb/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -5,7 +5,6 @@ - Index: lams_tool_chat/.classpath =================================================================== diff -u -rab2b6923490ce38dc647ea66d6768966fbc40cfd -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_chat/.classpath (.../.classpath) (revision ab2b6923490ce38dc647ea66d6768966fbc40cfd) +++ lams_tool_chat/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java (.../ChatPedagogicalPlannerForm.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java (.../ChatPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.chat.web.forms; import org.lamsfoundation.lams.tool.chat.model.Chat; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_daco/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_daco/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -14,7 +14,6 @@ - Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java (.../DacoConstants.java) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java (.../DacoConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -32,8 +32,6 @@ public static final String DACO_SERVICE = "dacoService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "dacoToolContentHandler"; - public static final int SESSION_COMPLETED = 1; // question types Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -70,9 +70,6 @@ - - - Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 64ee69765400783a3e284e7856aa91cdd01f4831) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -38,17 +38,9 @@ import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.contentrepository.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -108,9 +100,6 @@ private MessageService messageService; - // system services - private IRepositoryService repositoryService; - private ILamsToolService toolService; private ILearnerService learnerService; @@ -187,17 +176,6 @@ } @Override - public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws DacoApplicationException { - ITicket ticket = getRepositoryLoginTicket(); - try { - repositoryService.deleteVersion(ticket, fileUuid, fileVersionId); - } catch (Exception e) { - throw new DacoApplicationException( - "Exception occured while deleting files from" + " the repository " + e.getMessage()); - } - } - - @Override public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { Daco toolContentObj = dacoDao.getByContentId(toolContentId); if (toolContentObj == null) { @@ -369,55 +347,8 @@ // ******************************************************************************* // Service method // ******************************************************************************* - /** - * Try to get the file. If forceLogin = false and an access denied exception occurs, call this method again to get a - * new ticket and retry file lookup. If forceLogin = true and it then fails then throw exception. - * - * @param uuid - * @param versionId - * @param relativePath - * @param attemptCount - * @return file node - * @throws ImscpApplicationException - */ - private IVersionedNode getFile(Long uuid, Long versionId, String relativePath) throws DacoApplicationException { - ITicket tic = getRepositoryLoginTicket(); - - try { - - return repositoryService.getFileItem(tic, uuid, versionId, relativePath); - - } catch (AccessDeniedException e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "."; - - error = error + "AccessDeniedException: " + e.getMessage() + " Unable to retry further."; - DacoServiceImpl.log.error(error); - throw new DacoApplicationException(error, e); - - } catch (Exception e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "." + " Exception: " + e.getMessage(); - DacoServiceImpl.log.error(error); - throw new DacoApplicationException(error, e); - - } - } - @Override - public IVersionedNode getFileNode(Long answerUid, String relPathString) throws DacoApplicationException { - DacoAnswer answer = (DacoAnswer) dacoAnswerDao.getObject(DacoQuestion.class, answerUid); - if (answer == null) { - throw new DacoApplicationException("Reource question " + answerUid + " not found."); - } - - return getFile(answer.getFileUuid(), answer.getFileVersionId(), relPathString); - } - - @Override public Integer getGroupRecordCount(Long sessionId) { List users = dacoUserDao.getBySessionId(sessionId); @@ -604,31 +535,6 @@ eventNotificationService.notifyLessonMonitors(sessionId, message, false); } - /** - * This method verifies the credentials of the Daco Tool and gives it the Ticket to login and access - * the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws DacoApplicationException - */ - private ITicket getRepositoryLoginTicket() throws DacoApplicationException { - ICredentials credentials = new SimpleCredentials(dacoToolContentHandler.getRepositoryUser(), - dacoToolContentHandler.getRepositoryId()); - try { - ITicket ticket = repositoryService.login(credentials, dacoToolContentHandler.getRepositoryWorkspaceName()); - return ticket; - } catch (AccessDeniedException ae) { - throw new DacoApplicationException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new DacoApplicationException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new DacoApplicationException("Login failed." + e.getMessage()); - } - } - @Override public DacoSession getSessionBySessionId(Long sessionId) { return dacoSessionDao.getSessionBySessionId(sessionId); @@ -989,10 +895,6 @@ this.messageService = messageService; } - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public void setToolService(ILamsToolService toolService) { this.toolService = toolService; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java (.../IDacoService.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java (.../IDacoService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -27,7 +27,6 @@ import java.util.List; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.daco.dao.DacoAnswerDAO; import org.lamsfoundation.lams.tool.daco.dto.MonitoringSummarySessionDTO; @@ -46,16 +45,6 @@ public interface IDacoService { /** - * Get file IVersiondNode by given package id and path. - * - * @param packageId - * @param relPathString - * @return - * @throws DacoApplicationException - */ - IVersionedNode getFileNode(Long packageId, String relPathString) throws DacoApplicationException; - - /** * Get Daco by toolContentID. * * @param contentId @@ -105,11 +94,6 @@ */ DacoUser getUserByUserIdAndSessionId(Long long1, Long sessionId); - // ********** Repository methods *********************** - /** - * Delete file from repository. - */ - void deleteFromRepository(Long fileUuid, Long fileVersionId) throws DacoApplicationException; /** * Save or update daco into database. Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java (.../DacoToolContentHandler.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java (.../DacoToolContentHandler.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -71,7 +71,7 @@ */ @Override public char[] getRepositoryId() { - return DacoToolContentHandler.repositoryId; + return repositoryId; } -} +} \ No newline at end of file Index: lams_tool_doku/.classpath =================================================================== diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_doku/.classpath (.../.classpath) (revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9) +++ lams_tool_doku/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_eadventure/.classpath =================================================================== diff -u -r588fe01186ff8c7c5b215e15f5ac4763137e0284 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_eadventure/.classpath (.../.classpath) (revision 588fe01186ff8c7c5b215e15f5ac4763137e0284) +++ lams_tool_eadventure/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -4,7 +4,6 @@ - Index: lams_tool_forum/.classpath =================================================================== diff -u -ra5a78350fbcdf234dcc739c2fc7cb3fa4bed58ba -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_forum/.classpath (.../.classpath) (revision a5a78350fbcdf234dcc739c2fc7cb3fa4bed58ba) +++ lams_tool_forum/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -9,7 +9,6 @@ - Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== diff -u -rd71c8a085fb0ea3c341f2cf46df958c356d88ec7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision d71c8a085fb0ea3c341f2cf46df958c356d88ec7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -112,9 +112,6 @@ - - - Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 64ee69765400783a3e284e7856aa91cdd01f4831) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -46,16 +46,9 @@ 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.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learning.service.ILearnerService; @@ -146,8 +139,6 @@ private ForumToolContentHandler forumToolContentHandler; - private IRepositoryService repositoryService; - private ILearnerService learnerService; private IAuditService auditService; @@ -751,31 +742,6 @@ return node; } - /** - * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and - * access the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws SubmitFilesException - */ - private ITicket getRepositoryLoginTicket() throws ForumException { - ICredentials credentials = new SimpleCredentials(forumToolContentHandler.getRepositoryUser(), - forumToolContentHandler.getRepositoryId()); - try { - ITicket ticket = repositoryService.login(credentials, forumToolContentHandler.getRepositoryWorkspaceName()); - return ticket; - } catch (AccessDeniedException ae) { - throw new ForumException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new ForumException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new ForumException("Login failed." + e.getMessage()); - } - } - private Forum getDefaultForum() { Long defaultForumId = new Long(toolService.getToolDefaultContentIdBySignature(ForumConstants.TOOL_SIGNATURE)); if (defaultForumId.equals(0L)) { @@ -1326,14 +1292,6 @@ this.forumUserDao = forumUserDao; } - public IRepositoryService getRepositoryService() { - return repositoryService; - } - - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public ForumToolContentHandler getForumToolContentHandler() { return forumToolContentHandler; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 60d9a173d5590295376322fc3e857ae2dca37717) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -32,8 +32,6 @@ public interface ForumConstants { public static final String TOOL_SIGNATURE = "lafrum11"; - public static final String TOOL_CONTENT_HANDLER_NAME = "forumToolContentHandler"; - public static final int SORT_BY_NO = 0; public static final int SORT_BY_USER_NAME_ASC = 1; public static final int SORT_BY_USER_NAME_DESC = 2; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java (.../ForumPedagogicalPlannerForm.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java (.../ForumPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -34,7 +34,7 @@ import org.lamsfoundation.lams.tool.forum.persistence.Forum; import org.lamsfoundation.lams.tool.forum.persistence.Message; import org.lamsfoundation.lams.tool.forum.util.MessageComparator; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_gmap/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_gmap/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_gmap/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -16,7 +16,6 @@ - Index: lams_tool_images/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_images/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_images/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -3,11 +3,8 @@ - - - Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r1783f39beaef59b68da9b1f1fe51004326254e16 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 1783f39beaef59b68da9b1f1fe51004326254e16) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -560,7 +560,7 @@ String fileName = file.getFileName(); - InputStream originalIS = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile(); + InputStream originalIS = imageGalleryToolContentHandler.getFileInputStream(nodeKey.getUuid()); BufferedImage originalImage = ImageIO.read(originalIS); //throw exception if image was not successfully read if (originalImage == null) { @@ -578,14 +578,14 @@ "image/jpeg"); image.setMediumFileUuid(mediumNodeKey.getUuid()); //store MediumImageWidth and MediumImageHeight - InputStream mediumIS2 = imageGalleryToolContentHandler.getFileNode(mediumNodeKey.getUuid()).getFile(); + InputStream mediumIS2 = imageGalleryToolContentHandler.getFileInputStream(mediumNodeKey.getUuid()); BufferedImage mediumImage = ImageIO.read(mediumIS2); image.setMediumImageWidth(mediumImage.getWidth(null)); image.setMediumImageHeight(mediumImage.getHeight(null)); mediumIS2.close(); // prepare thumbnail image - InputStream originalIS2 = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile(); + InputStream originalIS2 = imageGalleryToolContentHandler.getFileInputStream(nodeKey.getUuid()); InputStream thumbnailIS = ResizePictureUtil.resize(originalIS2, thumbnailImageDimensions); String thumbnailFileName = ImageGalleryServiceImpl.THUMBNAIL_FILENAME_PREFIX + fileName.substring(0, fileName.indexOf('.')) + ".jpg"; Index: lams_tool_imscc/.classpath =================================================================== diff -u -rb16c3ac5e9748ee9abe4d9f4e502c643a9b3fb96 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/.classpath (.../.classpath) (revision b16c3ac5e9748ee9abe4d9f4e502c643a9b3fb96) +++ lams_tool_imscc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -5,7 +5,6 @@ - Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java (.../CommonCartridgeConstants.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java (.../CommonCartridgeConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,8 +28,6 @@ public static final String RESOURCE_SERVICE = "commonCartridgeService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "commonCartridgeToolContentHandler"; - public static final int COMPLETED = 1; // commonCartridge type; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -74,9 +74,6 @@ - - - Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 64ee69765400783a3e284e7856aa91cdd01f4831) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -42,14 +42,8 @@ import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; -import org.lamsfoundation.lams.contentrepository.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -120,7 +114,6 @@ private MessageService messageService; // system services - private IRepositoryService repositoryService; private ILamsToolService toolService; @@ -138,85 +131,10 @@ private ILessonService lessonService; - @Override - public IVersionedNode getFileNode(Long itemUid, String relPathString) throws CommonCartridgeApplicationException { - CommonCartridgeItem item = (CommonCartridgeItem) commonCartridgeItemDao.getObject(CommonCartridgeItem.class, - itemUid); - if (item == null) { - throw new CommonCartridgeApplicationException("Reource item " + itemUid + " not found."); - } - - return getFile(item.getFileUuid(), item.getFileVersionId(), relPathString); - } - // ******************************************************************************* // Service method // ******************************************************************************* - /** - * Try to get the file. If forceLogin = false and an access denied exception occurs, call this method again to get a - * new ticket and retry file lookup. If forceLogin = true and it then fails then throw exception. - * - * @param uuid - * @param versionId - * @param relativePath - * @param attemptCount - * @return file node - * @throws ImscpApplicationException - */ - private IVersionedNode getFile(Long uuid, Long versionId, String relativePath) - throws CommonCartridgeApplicationException { - ITicket tic = getRepositoryLoginTicket(); - - try { - - return repositoryService.getFileItem(tic, uuid, versionId, relativePath); - - } catch (AccessDeniedException e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "."; - - error = error + "AccessDeniedException: " + e.getMessage() + " Unable to retry further."; - CommonCartridgeServiceImpl.log.error(error); - throw new CommonCartridgeApplicationException(error, e); - - } catch (Exception e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "." + " Exception: " + e.getMessage(); - CommonCartridgeServiceImpl.log.error(error); - throw new CommonCartridgeApplicationException(error, e); - - } - } - - /** - * This method verifies the credentials of the CommonCartridge Tool and gives it the Ticket to login - * and access the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws CommonCartridgeApplicationException - */ - private ITicket getRepositoryLoginTicket() throws CommonCartridgeApplicationException { - ICredentials credentials = new SimpleCredentials(commonCartridgeToolContentHandler.getRepositoryUser(), - commonCartridgeToolContentHandler.getRepositoryId()); - try { - ITicket ticket = repositoryService.login(credentials, - commonCartridgeToolContentHandler.getRepositoryWorkspaceName()); - return ticket; - } catch (AccessDeniedException ae) { - throw new CommonCartridgeApplicationException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new CommonCartridgeApplicationException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new CommonCartridgeApplicationException("Login failed." + e.getMessage()); - } - } - @Override public CommonCartridge getCommonCartridgeByContentId(Long contentId) { CommonCartridge rs = commonCartridgeDao.getByContentId(contentId); @@ -263,14 +181,8 @@ } @Override - public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws CommonCartridgeApplicationException { - ITicket ticket = getRepositoryLoginTicket(); - try { - repositoryService.deleteVersion(ticket, fileUuid, fileVersionId); - } catch (Exception e) { - throw new CommonCartridgeApplicationException( - "Exception occured while deleting files from" + " the repository " + e.getMessage()); - } + public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws InvalidParameterException, RepositoryCheckedException { + commonCartridgeToolContentHandler.deleteFile(fileUuid); } @Override @@ -616,10 +528,6 @@ this.messageService = messageService; } - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public void setCommonCartridgeDao(CommonCartridgeDAO commonCartridgeDao) { this.commonCartridgeDao = commonCartridgeDao; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java (.../ICommonCartridgeService.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java (.../ICommonCartridgeService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -29,7 +29,8 @@ import java.util.SortedSet; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.commonCartridge.dto.ReflectDTO; @@ -49,16 +50,6 @@ public interface ICommonCartridgeService { /** - * Get file IVersiondNode by given package id and path. - * - * @param packageId - * @param relPathString - * @return - * @throws CommonCartridgeApplicationException - */ - IVersionedNode getFileNode(Long packageId, String relPathString) throws CommonCartridgeApplicationException; - - /** * Get CommonCartridge by toolContentID. * * @param contentId @@ -122,8 +113,10 @@ // ********** Repository methods *********************** /** * Delete file from repository. + * @throws RepositoryCheckedException + * @throws InvalidParameterException */ - void deleteFromRepository(Long fileUuid, Long fileVersionId) throws CommonCartridgeApplicationException; + void deleteFromRepository(Long fileUuid, Long fileVersionId) throws CommonCartridgeApplicationException, InvalidParameterException, RepositoryCheckedException; /** * Save or update commonCartridge into database. Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -813,7 +813,7 @@ CommonCartridgePedagogicalPlannerForm plannerForm = (CommonCartridgePedagogicalPlannerForm) form; Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); CommonCartridge taskList = getCommonCartridgeService().getCommonCartridgeByContentId(toolContentID); - String command = WebUtil.readStrParam(request, AttributeNames.PARAM_COMMAND, true); + String command = WebUtil.readStrParam(request, "command", true); if (command == null) { plannerForm.fillForm(taskList); String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java (.../CommonCartridgePedagogicalPlannerForm.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java (.../CommonCartridgePedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -35,7 +35,7 @@ import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItem; import org.lamsfoundation.lams.util.FileValidatorUtil; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_kaltura/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_kaltura/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_kaltura/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java (.../KalturaPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java (.../KalturaPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.kaltura.web.forms; import org.lamsfoundation.lams.tool.kaltura.model.Kaltura; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_lamc/.classpath =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_lamc/.classpath (.../.classpath) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_lamc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java =================================================================== diff -u -r4170df8bc66e658ef4dcd47e99eceddec3c2673a -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision 4170df8bc66e658ef4dcd47e99eceddec3c2673a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -41,7 +41,7 @@ import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.util.AuthoringUtil; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; public class McPedagogicalPlannerForm extends PedagogicalPlannerActivityForm { private static Logger logger = Logger.getLogger(McPedagogicalPlannerForm.class); Index: lams_tool_laqa/.classpath =================================================================== diff -u -r0441b6caf440e4a40163c2aa4ba1f4002051fc81 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_laqa/.classpath (.../.classpath) (revision 0441b6caf440e4a40163c2aa4ba1f4002051fc81) +++ lams_tool_laqa/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java (.../QaPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java (.../QaPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -32,7 +32,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; public class QaPedagogicalPlannerForm extends PedagogicalPlannerActivityForm { private List question; Index: lams_tool_larsrc/.classpath =================================================================== diff -u -r71012b6f2ac523d8faaef475332dbad1338c448d -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_larsrc/.classpath (.../.classpath) (revision 71012b6f2ac523d8faaef475332dbad1338c448d) +++ lams_tool_larsrc/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -70,9 +70,6 @@ - - - Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java =================================================================== diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java (.../IResourceService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,7 +28,8 @@ import java.util.SortedSet; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.rating.RatingException; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -49,16 +50,6 @@ public interface IResourceService { /** - * Get file IVersiondNode by given package id and path. - * - * @param packageId - * @param relPathString - * @return - * @throws ResourceApplicationException - */ - IVersionedNode getFileNode(Long packageId, String relPathString) throws ResourceApplicationException; - - /** * Get Resource by toolContentID. * * @param contentId @@ -119,8 +110,10 @@ // ********** Repository methods *********************** /** * Delete file from repository. + * @throws RepositoryCheckedException + * @throws InvalidParameterException */ - void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ResourceApplicationException; + void deleteFromRepository(Long fileUuid, Long fileVersionId) throws InvalidParameterException, RepositoryCheckedException; /** * Save or update resource into database. Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r1bf70a335f5b30a1907ccae506908b05374c6c8c -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 1bf70a335f5b30a1907ccae506908b05374c6c8c) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -49,17 +49,9 @@ 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.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; @@ -94,7 +86,6 @@ import org.lamsfoundation.lams.tool.rsrc.dto.ResourceItemDTO; import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO; import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO; -import org.lamsfoundation.lams.tool.rsrc.ims.ImscpApplicationException; import org.lamsfoundation.lams.tool.rsrc.ims.SimpleContentPackageConverter; import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; @@ -138,7 +129,6 @@ private MessageService messageService; // system services - private IRepositoryService repositoryService; private ILamsToolService toolService; @@ -158,83 +148,10 @@ private ResourceOutputFactory resourceOutputFactory; - @Override - public IVersionedNode getFileNode(Long itemUid, String relPathString) throws ResourceApplicationException { - ResourceItem item = (ResourceItem) resourceItemDao.getObject(ResourceItem.class, itemUid); - if (item == null) { - throw new ResourceApplicationException("Reource item " + itemUid + " not found."); - } - - return getFile(item.getFileUuid(), item.getFileVersionId(), relPathString); - } - // ******************************************************************************* // Service method // ******************************************************************************* - /** - * Try to get the file. If forceLogin = false and an access denied exception occurs, call this method again to get a - * new ticket and retry file lookup. If forceLogin = true and it then fails then throw exception. - * - * @param uuid - * @param versionId - * @param relativePath - * @param attemptCount - * @return file node - * @throws ImscpApplicationException - */ - private IVersionedNode getFile(Long uuid, Long versionId, String relativePath) throws ResourceApplicationException { - ITicket tic = getRepositoryLoginTicket(); - - try { - - return repositoryService.getFileItem(tic, uuid, versionId, relativePath); - - } catch (AccessDeniedException e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "."; - - error = error + "AccessDeniedException: " + e.getMessage() + " Unable to retry further."; - ResourceServiceImpl.log.error(error); - throw new ResourceApplicationException(error, e); - - } catch (Exception e) { - - String error = "Unable to access repository to get file uuid " + uuid + " version id " + versionId - + " path " + relativePath + "." + " Exception: " + e.getMessage(); - ResourceServiceImpl.log.error(error); - throw new ResourceApplicationException(error, e); - - } - } - - /** - * This method verifies the credentials of the Share Resource Tool and gives it the Ticket to login and - * access the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws ResourceApplicationException - */ - private ITicket getRepositoryLoginTicket() throws ResourceApplicationException { - ICredentials credentials = new SimpleCredentials(resourceToolContentHandler.getRepositoryUser(), - resourceToolContentHandler.getRepositoryId()); - try { - ITicket ticket = repositoryService.login(credentials, - resourceToolContentHandler.getRepositoryWorkspaceName()); - return ticket; - } catch (AccessDeniedException ae) { - throw new ResourceApplicationException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new ResourceApplicationException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new ResourceApplicationException("Login failed." + e.getMessage()); - } - } - @Override public Resource getResourceByContentId(Long contentId) { Resource rs = resourceDao.getByContentId(contentId); @@ -281,14 +198,8 @@ } @Override - public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws ResourceApplicationException { - ITicket ticket = getRepositoryLoginTicket(); - try { - repositoryService.deleteVersion(ticket, fileUuid, fileVersionId); - } catch (Exception e) { - throw new ResourceApplicationException( - "Exception occured while deleting files from" + " the repository " + e.getMessage()); - } + public void deleteFromRepository(Long fileUuid, Long fileVersionId) throws InvalidParameterException, RepositoryCheckedException { + resourceToolContentHandler.deleteFile(fileUuid); } @Override @@ -1148,10 +1059,6 @@ this.messageService = messageService; } - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public void setResourceDao(ResourceDAO resourceDao) { this.resourceDao = resourceDao; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java (.../ResourcePedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -35,7 +35,7 @@ import org.lamsfoundation.lams.tool.rsrc.model.Resource; import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem; import org.lamsfoundation.lams.util.FileValidatorUtil; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_leader/.classpath =================================================================== diff -u -rac8b64b03ce6d8c718e55823f23fd995159b7ca0 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_leader/.classpath (.../.classpath) (revision ac8b64b03ce6d8c718e55823f23fd995159b7ca0) +++ lams_tool_leader/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml =================================================================== diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -38,7 +38,6 @@ - Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java (.../Leaderselection.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -229,8 +229,7 @@ return result; } - public static Leaderselection newInstance(Leaderselection fromContent, Long toContentId, - IToolContentHandler leaderselectionToolContentHandler) { + public static Leaderselection newInstance(Leaderselection fromContent, Long toContentId) { Leaderselection toContent = new Leaderselection(); toContent = (Leaderselection) fromContent.clone(); toContent.setToolContentId(toContentId); Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 64ee69765400783a3e284e7856aa91cdd01f4831) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -34,14 +34,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.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -67,7 +60,6 @@ import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser; import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionConstants; import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionException; -import org.lamsfoundation.lams.tool.leaderselection.util.LeaderselectionToolContentHandler; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -95,8 +87,6 @@ private IToolContentHandler leaderselectionToolContentHandler = null; - private IRepositoryService repositoryService = null; - private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; @@ -194,8 +184,7 @@ // create the fromContent using the default tool content fromContent = getDefaultContent(); } - Leaderselection toContent = Leaderselection.newInstance(fromContent, toContentId, - leaderselectionToolContentHandler); + Leaderselection toContent = Leaderselection.newInstance(fromContent, toContentId); leaderselectionDAO.saveOrUpdate(toContent); } @@ -267,9 +256,7 @@ throw new DataMissingException("Unable to find default content for the leaderselection tool"); } - // set ResourceToolContentHandler as null to avoid copy file node in - // repository again. - content = Leaderselection.newInstance(content, toolContentId, null); + content = Leaderselection.newInstance(content, toolContentId); content.setLeaderselectionSessions(null); try { exportContentService.exportToolContent(toolContentId, content, leaderselectionToolContentHandler, rootPath); @@ -424,7 +411,7 @@ Leaderselection defaultContent = getDefaultContent(); // create new leaderselection using the newContentID Leaderselection newContent = new Leaderselection(); - newContent = Leaderselection.newInstance(defaultContent, newContentID, leaderselectionToolContentHandler); + newContent = Leaderselection.newInstance(defaultContent, newContentID); leaderselectionDAO.saveOrUpdate(newContent); return newContent; } @@ -480,32 +467,6 @@ return leaderselectionUser; } - /** - * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and - * access the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws SubmitFilesException - */ - private ITicket getRepositoryLoginTicket() throws LeaderselectionException { - ICredentials credentials = new SimpleCredentials(LeaderselectionToolContentHandler.repositoryUser, - LeaderselectionToolContentHandler.repositoryId); - try { - ITicket ticket = repositoryService.login(credentials, - LeaderselectionToolContentHandler.repositoryWorkspaceName); - return ticket; - } catch (AccessDeniedException ae) { - throw new LeaderselectionException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new LeaderselectionException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new LeaderselectionException("Login failed." + e.getMessage()); - } - } - // ========================================================================================= /* ********** Used by Spring to "inject" the linked objects ************* */ @@ -573,14 +534,6 @@ this.coreNotebookService = coreNotebookService; } - public IRepositoryService getRepositoryService() { - return repositoryService; - } - - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public LeaderselectionOutputFactory getLeaderselectionOutputFactory() { return leaderselectionOutputFactory; } Index: lams_tool_mindmap/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_mindmap/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_mindmap/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -4,7 +4,6 @@ - Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java (.../MindmapPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java (.../MindmapPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.mindmap.web.forms; import org.lamsfoundation.lams.tool.mindmap.model.Mindmap; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_nb/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_nb/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_nb/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java (.../NbPedagogicalPlannerAction.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java (.../NbPedagogicalPlannerAction.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -40,21 +40,14 @@ import org.lamsfoundation.lams.tool.noticeboard.web.form.NbPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction; import org.lamsfoundation.lams.web.util.AttributeNames; /** - * @author - * @version - * - * - * - * - * + * */ public class NbPedagogicalPlannerAction extends LamsDispatchAction { - private static Logger logger = Logger.getLogger(PedagogicalPlannerAction.class); + private static Logger logger = Logger.getLogger(NbPedagogicalPlannerAction.class); public INoticeboardService noticeboardService; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java =================================================================== diff -u -r983160690fed1d94b51c2ea9206c58093a29040d -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 983160690fed1d94b51c2ea9206c58093a29040d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java (.../NbPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.noticeboard.web.form; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_notebook/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_notebook/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_notebook/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java (.../NotebookPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java (.../NotebookPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.notebook.web.forms; import org.lamsfoundation.lams.tool.notebook.model.Notebook; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_pixlr/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_pixlr/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_pixlr/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_preview/.classpath =================================================================== diff -u -r9fc998daa072351bbb64ed9d16a1c571c8136b64 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_preview/.classpath (.../.classpath) (revision 9fc998daa072351bbb64ed9d16a1c571c8136b64) +++ lams_tool_preview/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -5,7 +5,6 @@ - Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java =================================================================== diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java (.../PeerreviewConstants.java) (revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java (.../PeerreviewConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,8 +28,6 @@ public static final String PEERREVIEW_SERVICE = "peerreviewService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "peerreviewToolContentHandler"; - public static final int COMPLETED = 1; public static final int SORT_BY_NO = 0; Index: lams_tool_sbmt/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_sbmt/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -14,7 +14,6 @@ - Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -30,7 +30,6 @@ import java.util.SortedMap; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.events.IEventNotificationService; @@ -143,8 +142,10 @@ * @param reportID * @param markFileUUID * @param markFileVersionID + * @throws RepositoryCheckedException + * @throws InvalidParameterException */ - public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID); + public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID) throws InvalidParameterException, RepositoryCheckedException; /** * Mark the original file uploaded by a learner as deleted. Does not delete the file @@ -169,8 +170,6 @@ */ public SubmitFilesSession getSessionById(Long sessionID); - public IVersionedNode downloadFile(Long uuid, Long versionID); - /** * Release marks and comments information to learners, for a special session. * @@ -179,8 +178,6 @@ */ public boolean releaseMarksForSession(Long sessionID); - public void deleteFromRepository(Long uuid, Long versionID); - /** * When learner finish submission, it invokes this function and will remark the finished field. * Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r160dbb3543d48c28016c41a003d265b1195cad47 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 160dbb3543d48c28016c41a003d265b1195cad47) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -47,20 +47,10 @@ 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.ICredentials; -import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; -import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.exception.FileException; import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.exception.LoginException; import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; -import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learning.service.ILearnerService; @@ -94,7 +84,6 @@ import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO; import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; -import org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler; import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; @@ -130,8 +119,6 @@ private ILearnerService learnerService; - private IRepositoryService repositoryService; - private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; @@ -419,43 +406,7 @@ return submitFilesReportDAO.getReportByID(reportID); } - /** - * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and - * access the Content Repository. - * - * A valid ticket is needed in order to access the content from the repository. This method would be called evertime - * the tool needs to upload/download files from the content repository. - * - * @return ITicket The ticket for repostory access - * @throws SubmitFilesException - */ - private ITicket getRepositoryLoginTicket() throws SubmitFilesException { - ICredentials credentials = new SimpleCredentials(SbmtToolContentHandler.repositoryUser, - SbmtToolContentHandler.repositoryId); - try { - ITicket ticket = repositoryService.login(credentials, SbmtToolContentHandler.repositoryWorkspaceName); - return ticket; - } catch (AccessDeniedException ae) { - throw new SubmitFilesException("Access Denied to repository." + ae.getMessage()); - } catch (WorkspaceNotFoundException we) { - throw new SubmitFilesException("Workspace not found." + we.getMessage()); - } catch (LoginException e) { - throw new SubmitFilesException("Login failed." + e.getMessage()); - } - } - @Override - public void deleteFromRepository(Long uuid, Long versionID) throws SubmitFilesException { - ITicket ticket = getRepositoryLoginTicket(); - try { - repositoryService.deleteVersion(ticket, uuid, versionID); - } catch (Exception e) { - throw new SubmitFilesException( - "Exception occured while deleting files from" + " the repository " + e.getMessage()); - } - } - - @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) { // pre-condition validation if ((toolSessionId == null) || (toolContentId == null)) { @@ -542,7 +493,11 @@ Iterator fileIterator = filesUploaded.iterator(); while (fileIterator.hasNext()) { SubmissionDetails details = (SubmissionDetails) fileIterator.next(); - deleteFromRepository(details.getUuid(), details.getVersionID()); + try { + sbmtToolContentHandler.deleteFile(details.getUuid()); + } catch (RepositoryCheckedException e) { + log.error("Exception was thrown on trying to remove file with uiid=" + details.getUuid(), e); + } submissionDetailsDAO.delete(details); } } @@ -803,10 +758,10 @@ } @Override - public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID) { + public void removeMarkFile(Long reportID, Long markFileUUID, Long markFileVersionID) throws InvalidParameterException, RepositoryCheckedException { SubmitFilesReport report = submitFilesReportDAO.getReportByID(reportID); if (report != null) { - deleteFromRepository(markFileUUID, markFileVersionID); + sbmtToolContentHandler.deleteFile(markFileUUID); report.setMarkFileName(null); report.setMarkFileUUID(null); report.setMarkFileVersionID(null); @@ -858,25 +813,7 @@ auditService.log(SbmtConstants.AUDIT_LOG_MODULE_NAME, auditMsg); } - @Override - public IVersionedNode downloadFile(Long uuid, Long versionID) throws SubmitFilesException { - ITicket ticket = getRepositoryLoginTicket(); - try { - IVersionedNode node = repositoryService.getFileItem(ticket, uuid, null); - return node; - } catch (AccessDeniedException ae) { - throw new SubmitFilesException( - "AccessDeniedException occured while trying to download file " + ae.getMessage()); - } catch (FileException fe) { - throw new SubmitFilesException("FileException occured while trying to download file " + fe.getMessage()); - } catch (ItemNotFoundException ie) { - throw new SubmitFilesException( - "ItemNotFoundException occured while trying to download file " + ie.getMessage()); - } - } - - @Override public SubmitFilesSession getSessionById(Long sessionID) { return submitFilesSessionDAO.getSessionByID(sessionID); } @@ -1230,14 +1167,6 @@ this.learnerService = learnerService; } - public IRepositoryService getRepositoryService() { - return repositoryService; - } - - public void setRepositoryService(IRepositoryService repositoryService) { - this.repositoryService = repositoryService; - } - public ILamsToolService getToolService() { return toolService; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -55,7 +55,6 @@ - Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java =================================================================== diff -u -r1688016bbb43db756bca9b93361c2a3833089d12 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision 1688016bbb43db756bca9b93361c2a3833089d12) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -49,15 +49,6 @@ /** * @author lfoxton - * - * - * - * - * - * - * - * - * */ public class MarkAction extends LamsDispatchAction { @@ -183,9 +174,11 @@ * @param request * @param response * @return + * @throws RepositoryCheckedException + * @throws InvalidParameterException */ public ActionForward removeMarkFile(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) throws InvalidParameterException, RepositoryCheckedException { MarkForm markForm = (MarkForm) form; if (submitFilesService == null) { Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java (.../SubmitFilesPedagogicalPlannerAction.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java (.../SubmitFilesPedagogicalPlannerAction.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -41,21 +41,14 @@ import org.lamsfoundation.lams.tool.sbmt.web.form.SubmitFilesPedagogicalPlannerForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerAction; import org.lamsfoundation.lams.web.util.AttributeNames; /** - * @author - * @version - * - * - * - * - * + * */ public class SubmitFilesPedagogicalPlannerAction extends LamsDispatchAction { - private static Logger logger = Logger.getLogger(PedagogicalPlannerAction.class); + private static Logger logger = Logger.getLogger(SubmitFilesPedagogicalPlannerAction.class); public ISubmitFilesService submitFilesService; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java (.../SubmitFilesPedagogicalPlannerForm.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java (.../SubmitFilesPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.sbmt.web.form; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_scratchie/.classpath =================================================================== diff -u -r63ff5aaa19e3fb53810266ade4fc2e9433c09d44 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_scratchie/.classpath (.../.classpath) (revision 63ff5aaa19e3fb53810266ade4fc2e9433c09d44) +++ lams_tool_scratchie/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -19,7 +19,6 @@ - Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java =================================================================== diff -u -r3a8732a27caaa2eda8712c7a2f24f5788c7d110a -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 3a8732a27caaa2eda8712c7a2f24f5788c7d110a) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java (.../ScratchieConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,8 +28,6 @@ public static final String SCRATCHIE_SERVICE = "scratchieService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "scratchieToolContentHandler"; - public static final int COMPLETED = 1; public static final int INITIAL_ANSWERS_NUMBER = 4; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java (.../ScratchiePedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java (.../ScratchiePedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -24,7 +24,7 @@ package org.lamsfoundation.lams.tool.scratchie.web.form; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_scribe/.classpath =================================================================== diff -u -re1312708b95d2a0343c95cadbf03432d65c7657c -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_scribe/.classpath (.../.classpath) (revision e1312708b95d2a0343c95cadbf03432d65c7657c) +++ lams_tool_scribe/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java (.../ScribePedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java (.../ScribePedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -30,7 +30,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.scribe.model.Scribe; import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_spreadsheet/.classpath =================================================================== diff -u -r55a6c39f478a170c3efe15e3749b952fdb6c5710 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_spreadsheet/.classpath (.../.classpath) (revision 55a6c39f478a170c3efe15e3749b952fdb6c5710) +++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java (.../SpreadsheetConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -26,7 +26,6 @@ public class SpreadsheetConstants { public static final String TOOL_SIGNATURE = "lasprd10"; public static final String RESOURCE_SERVICE = "spreadsheetService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "spreadsheetToolContentHandler"; public static final int COMPLETED = 1; Index: lams_tool_survey/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_survey/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_survey/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ - Index: lams_tool_task/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_task/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_task/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -6,21 +6,17 @@ - + - - - - Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -26,7 +26,6 @@ public class TaskListConstants { public static final String TOOL_SIGNATURE = "latask10"; public static final String TASKLIST_SERVICE = "lataskTaskListService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "lataskTaskListToolContentHandler"; public static final int COMPLETED = 1; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java (.../TaskListPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java (.../TaskListPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -32,7 +32,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.taskList.model.TaskList; import org.lamsfoundation.lams.tool.taskList.model.TaskListItem; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_videorecorder/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_videorecorder/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_videorecorder/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,10 +15,8 @@ - - Index: lams_tool_vote/.classpath =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_vote/.classpath (.../.classpath) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_vote/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ > - Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java =================================================================== diff -u -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -31,7 +31,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivityForm { /** Index: lams_tool_wiki/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_wiki/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_wiki/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -9,7 +9,6 @@ - Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java (.../WikiPedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java (.../WikiPedagogicalPlannerForm.java) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -28,7 +28,7 @@ import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.wiki.model.Wiki; import org.lamsfoundation.lams.tool.wiki.model.WikiPage; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.planner.PedagogicalPlannerActivityForm; /** * Index: lams_tool_wookie/.classpath =================================================================== diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r4ee1866ff667d5130621844d9667ed91bfdccf93 --- lams_tool_wookie/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf) +++ lams_tool_wookie/.classpath (.../.classpath) (revision 4ee1866ff667d5130621844d9667ed91bfdccf93) @@ -15,7 +15,6 @@ -