Index: lams_build/lib/lams/lams-contentrepository.jar =================================================================== diff -u -rf56236d1da6c247b7f44b83924f01f92438f8843 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -r60e44b19b8de02a00faa437fba8117928baa3d73 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision 60e44b19b8de02a00faa437fba8117928baa3d73) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -48,7 +48,7 @@ import org.apache.struts.actions.DispatchAction; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learningdesign.GroupUser; import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO; import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService; Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java =================================================================== diff -u -rd2b195b0508f24b2b70237ae4f5ca25ed73298f9 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java (.../OrganisationGroupAction.java) (revision d2b195b0508f24b2b70237ae4f5ca25ed73298f9) +++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java (.../OrganisationGroupAction.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -47,7 +47,7 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; import org.lamsfoundation.lams.integration.dto.ExtGroupDTO; import org.lamsfoundation.lams.integration.service.IIntegrationService; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; Index: lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java =================================================================== diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java (.../LtiAction.java) (revision 11b64f81e406ff277c7c35988304b0064300de57) +++ lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java (.../LtiAction.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -17,7 +17,7 @@ import org.apache.struts.action.ActionRedirect; import org.apache.tomcat.util.json.JSONException; import org.imsglobal.lti.BasicLTIConstants; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.integration.ExtCourseClassMap; import org.lamsfoundation.lams.integration.ExtServerLessonMap; import org.lamsfoundation.lams.integration.ExtServer; Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== diff -u -rfebc5ec394566f98439ce776a0be320b34310b0a -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision febc5ec394566f98439ce776a0be320b34310b0a) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -77,7 +77,7 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.authoring.service.IAuthoringService; import org.lamsfoundation.lams.authoring.web.AuthoringConstants; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.BranchingActivity; import org.lamsfoundation.lams.learningdesign.Grouping; Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 11b64f81e406ff277c7c35988304b0064300de57) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -25,7 +25,7 @@ import javax.xml.transform.stream.StreamResult; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.integration.ExtServer; import org.lamsfoundation.lams.integration.ExtUserUseridMap; import org.lamsfoundation.lams.integration.UserInfoFetchException; Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java =================================================================== diff -u -r3750d4ca838633d6f19b1f4e1a8e13d9fc41d7c7 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision 3750d4ca838633d6f19b1f4e1a8e13d9fc41d7c7) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java (.../IWorkspaceManagementService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -27,7 +27,7 @@ import java.util.Vector; import org.apache.tomcat.util.json.JSONException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignException; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r1c5e72208fa9b19bd30b0379bd26ab2c63754009 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 1c5e72208fa9b19bd30b0379bd26ab2c63754009) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -38,7 +38,7 @@ import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.authoring.service.IAuthoringService; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.LearningDesign; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -r2f02ea654f2380229d55ffd2483ba21ac48856d8 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 2f02ea654f2380229d55ffd2483ba21ac48856d8) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -58,9 +58,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; +import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/AccessDeniedException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CheckCredentialTicketBeforeAdvice.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CheckCredentialTicketBeforeAdvice.java (.../CheckCredentialTicketBeforeAdvice.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CheckCredentialTicketBeforeAdvice.java (.../CheckCredentialTicketBeforeAdvice.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -27,6 +27,8 @@ import java.lang.reflect.Method; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryAdmin; import org.springframework.aop.MethodBeforeAdvice; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java (.../CrNodeVersion.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -33,6 +33,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; /** * Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java (.../CrNodeVersionProperty.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -35,6 +35,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; /** * Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/FileException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IValue.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IValue.java (.../IValue.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IValue.java (.../IValue.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -26,6 +26,8 @@ import java.util.Calendar; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; + /** * A value is an object which is explicitly marked with a type. This type can * be used for hints to the persistence layer as to how to store/retrieve Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java (.../IVersionedNode.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNode.java (.../IVersionedNode.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -29,6 +29,9 @@ import java.util.Set; import java.util.SortedSet; +import org.lamsfoundation.lams.contentrepository.exception.FileException; +import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; + /** * The IVersionedNode interface represents a particular version of a node * in the hierarchy that makes up the repository. This interface represents Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNodeAdmin.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNodeAdmin.java (.../IVersionedNodeAdmin.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IVersionedNodeAdmin.java (.../IVersionedNodeAdmin.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -28,6 +28,13 @@ import java.util.Calendar; import java.util.List; +import org.lamsfoundation.lams.contentrepository.exception.AccessDeniedException; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; + /** * IVersionedNodeAdmin represents the full functionality for a versioned node. * Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/InvalidParameterException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ItemExistsException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ItemNotFoundException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/LoginException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/PropertyType.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/PropertyType.java (.../PropertyType.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/PropertyType.java (.../PropertyType.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -24,6 +24,8 @@ package org.lamsfoundation.lams.contentrepository; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; + /** * LAMS property types. */ Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/RepositoryCheckedException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/RepositoryRuntimeException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java (.../SimpleVersionDetail.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java (.../SimpleVersionDetail.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -29,6 +29,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; /** * Describes the version details - for displaying a version Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ValidationException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ValueFormatException.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b67c428939ed96f08f56192d54b8ee55d8ab89d2 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/WorkspaceNotFoundException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java =================================================================== diff -u -r651ce2e8afb443e6877e1c566f61aa5821289c56 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision 651ce2e8afb443e6877e1c566f61aa5821289c56) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -36,14 +36,14 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IValue; import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.NodeType; import org.lamsfoundation.lams.contentrepository.PropertyName; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; +import org.lamsfoundation.lams.contentrepository.exception.FileException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java =================================================================== diff -u -rf56236d1da6c247b7f44b83924f01f92438f8843 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java (.../IToolContentHandler.java) (revision f56236d1da6c247b7f44b83924f01f92438f8843) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java (.../IToolContentHandler.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -28,13 +28,13 @@ import java.io.InputStream; import java.util.Set; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +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.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; /** Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java =================================================================== diff -u -rf56236d1da6c247b7f44b83924f01f92438f8843 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java (.../ToolContentHandler.java) (revision f56236d1da6c247b7f44b83924f01f92438f8843) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java (.../ToolContentHandler.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -29,15 +29,15 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +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.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java (.../ToolDownload.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java (.../ToolDownload.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -25,7 +25,7 @@ package org.lamsfoundation.lams.contentrepository.client; import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java (.../ICredentialDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/ICredentialDAO.java (.../ICredentialDAO.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -27,7 +27,7 @@ import org.lamsfoundation.lams.contentrepository.CrCredential; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.IWorkspace; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; import org.lamsfoundation.lams.dao.IBaseDAO; public interface ICredentialDAO extends IBaseDAO { Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java (.../IFileDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/IFileDAO.java (.../IFileDAO.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -26,7 +26,7 @@ import java.io.InputStream; -import org.lamsfoundation.lams.contentrepository.FileException; +import org.lamsfoundation.lams.contentrepository.exception.FileException; /** * Manages the reading and writing of files to the repository directories. Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -33,8 +33,8 @@ import java.io.OutputStream; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.dao.IFileDAO; +import org.lamsfoundation.lams.contentrepository.exception.FileException; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/CredentialDAO.java (.../CredentialDAO.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -32,8 +32,8 @@ import org.lamsfoundation.lams.contentrepository.CrCredential; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.IWorkspace; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.springframework.stereotype.Repository; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java =================================================================== diff -u -r42e6c9c7220f8baf3b245d73b57aca9be08191ea -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision 42e6c9c7220f8baf3b245d73b57aca9be08191ea) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/WorkspaceDAO.java (.../WorkspaceDAO.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -30,8 +30,8 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.springframework.stereotype.Repository; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/AccessDeniedException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/AccessDeniedException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/AccessDeniedException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,73 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * The current ticket doesn't have sufficient rights for the requested action. + */ +public class AccessDeniedException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public AccessDeniedException() { + this("The current ticket doesn't have sufficient rights for the requested action."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public AccessDeniedException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public AccessDeniedException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public AccessDeniedException(Throwable cause) { + this("The current ticket doesn't have sufficient rights for the requested action.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Some error was generated reading or writing the files + * to disk. + */ +public class FileException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public FileException() { + this("File error occured."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public FileException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public FileException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public FileException(Throwable cause) { + this("File error occured.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,73 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Generic exception thrown whenever a parameter is missing. + */ +public class InvalidParameterException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public InvalidParameterException() { + this("A required parameter is null."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public InvalidParameterException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public InvalidParameterException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public InvalidParameterException(Throwable cause) { + this("A required parameter is null.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemExistsException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemExistsException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemExistsException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,73 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * An item already exists with the given id or path. + */ +public class ItemExistsException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public ItemExistsException() { + this("An item already exists with the given id or path."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public ItemExistsException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public ItemExistsException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public ItemExistsException(Throwable cause) { + this("An item already exists with the given id or path.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Item requested does not exist. + */ +public class ItemNotFoundException extends RepositoryCheckedException { + + /** + * Constructs a new instance of this class. + */ + public ItemNotFoundException() { + this("Item requested does not exist."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public ItemNotFoundException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public ItemNotFoundException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public ItemNotFoundException(Throwable cause) { + this("Item requested does not exist.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/LoginException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/LoginException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/LoginException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,73 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Login failed. + */ +public class LoginException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public LoginException() { + this("Content Repository Login Failed."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public LoginException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public LoginException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public LoginException(Throwable cause) { + this("Content Repository Login Failed.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryCheckedException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryCheckedException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryCheckedException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,93 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Main exception thrown by content repository classes. All exceptions thrown by the content + * repository (except RepositoryRuntimeException) are based on this class, so calling code + * can catch this exception and catch all of the repository exceptions, if it doesn't want to + * catch particular exceptions. + * + * @see RepositoryRuntimeException + */ +public class RepositoryCheckedException extends Exception { + + /** + * Constructs a new instance of this class. + */ + public RepositoryCheckedException() { + this("Content Repository Error."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public RepositoryCheckedException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public RepositoryCheckedException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public RepositoryCheckedException(Throwable cause) { + this("Content Repository Error.", cause); + } + + @Override + public String getMessage() { + + String s1 = super.getMessage(); + if (s1 == null) { + s1 = ""; + } + + Throwable cause = getCause(); + String s2 = cause != null ? cause.getMessage() : null; + return s2 != null ? s1 + ":" + s2 : s1; + + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryRuntimeException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryRuntimeException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/RepositoryRuntimeException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,92 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Main runtime exception thrown by content repository classes. This is only + * used for unexpected internal errors, such that the calling code could + * never recover. + * + * @see RepositoryCheckedException + */ +public class RepositoryRuntimeException extends RuntimeException { + + /** + * Constructs a new instance of this class. + */ + public RepositoryRuntimeException() { + this("Content Repository Runtime Error."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public RepositoryRuntimeException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public RepositoryRuntimeException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public RepositoryRuntimeException(Throwable cause) { + this("Content Repository Runtime Error.", cause); + } + + @Override + public String getMessage() { + + String s1 = super.getMessage(); + if (s1 == null) { + s1 = ""; + } + + Throwable cause = getCause(); + String s2 = cause != null ? cause.getMessage() : null; + return s2 != null ? s1 + ":" + s2 : s1; + + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValidationException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValidationException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValidationException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * The node is invalid for some reason. The reason should be given in + * the exception message. + */ +public class ValidationException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public ValidationException() { + this("The node is invalid."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public ValidationException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public ValidationException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public ValidationException(Throwable cause) { + this("The node is invalid.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValueFormatException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValueFormatException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/ValueFormatException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Thrown when value is assigned to a propery of the wrong type, or some + * other formatting type problem. + */ +public class ValueFormatException extends RepositoryCheckedException { + /** + * Constructs a new instance of this class. + */ + public ValueFormatException() { + this("Value assigned to wrong type or other formatting error."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public ValueFormatException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public ValueFormatException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public ValueFormatException(Throwable cause) { + this("Value assigned to wrong type or other formatting error.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/WorkspaceNotFoundException.java =================================================================== diff -u --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/WorkspaceNotFoundException.java (revision 0) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/exception/WorkspaceNotFoundException.java (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -0,0 +1,74 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.contentrepository.exception; + +/** + * Requested workspace not found. + */ +public class WorkspaceNotFoundException extends RepositoryCheckedException { + + /** + * Constructs a new instance of this class. + */ + public WorkspaceNotFoundException() { + this("Requested workspace not found."); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure cause. + * + * @param s + * description + */ + public WorkspaceNotFoundException(String s) { + super(s); + } + + /** + * Constructs a new instance of this class given a message describing the + * failure and a root throwable. + * + * @param s + * description + * @param cause + * root throwable cause + */ + public WorkspaceNotFoundException(String s, Throwable cause) { + super(s, cause); + + } + + /** + * Constructs a new instance of this class given a root throwable. + * + * @param cause + * root failure cause + */ + public WorkspaceNotFoundException(Throwable cause) { + this("Requested workspace not found.", cause); + } + +} Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java (.../INodeFactory.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java (.../INodeFactory.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -28,12 +28,12 @@ import org.lamsfoundation.lams.contentrepository.CrNode; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.contentrepository.FileException; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; import org.lamsfoundation.lams.contentrepository.dao.INodeDAO; +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.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; public interface INodeFactory { @@ -47,42 +47,42 @@ * @param relPath * The path of the new Node that is to be created, * the last item of this path will be the name of the new Node. - * @throws org.lamsfoundation.lams.contentrepository.InvalidParameterException + * @throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException * if the file parameters are invalid * @throws RepositoryRuntimeException * if an internal error occurs. */ public abstract SimpleVersionedNode createFileNode(CrWorkspace workspace, SimpleVersionedNode parentNode, String relPath, InputStream istream, String filename, String mimeType, String versionDescription, - Integer userId) throws org.lamsfoundation.lams.contentrepository.InvalidParameterException; + Integer userId) throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; /** * Create a new package node (which is assumed to be a newly created Spring * bean) with the default file and node type. Package node cannot have a parent node. * * @param initialPath * The path of the default content. - * @throws org.lamsfoundation.lams.contentrepository.InvalidParameterException + * @throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException * if the file parameters are invalid * @throws RepositoryRuntimeException * if an internal error occurs. */ public abstract SimpleVersionedNode createPackageNode(CrWorkspace workspace, String initialPath, String versionDescription, Integer userId) - throws org.lamsfoundation.lams.contentrepository.InvalidParameterException; + throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; /** * Create a new data node (which is assumed to be a newly created Spring * bean). This node may have a parent node. * - * @throws org.lamsfoundation.lams.contentrepository.InvalidParameterException + * @throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException * if the file parameters are invalid * @throws RepositoryRuntimeException * if an internal error occurs. */ public abstract SimpleVersionedNode createDataNode(CrWorkspace workspace, SimpleVersionedNode parentNode, String versionDescription, Integer userId) - throws org.lamsfoundation.lams.contentrepository.InvalidParameterException; + throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; /** * Build a SimpleVersionedNode, given a CrNode from the database. If versionId == null Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java (.../IRepositoryAdmin.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryAdmin.java (.../IRepositoryAdmin.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -27,8 +27,8 @@ import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; /** * Administrative interface to the Repository. "Protects" Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java =================================================================== diff -u -r5af735c7b7eded85eca276fe808a667175910267 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java (.../IRepositoryService.java) (revision 5af735c7b7eded85eca276fe808a667175910267) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java (.../IRepositoryService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -29,22 +29,22 @@ import java.util.SortedMap; import java.util.SortedSet; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemExistsException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; -import org.lamsfoundation.lams.contentrepository.ValidationException; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +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.ItemExistsException; +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.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.ValidationException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; +import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; /** * Tool access to the repository. Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java (.../NodeFactory.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java (.../NodeFactory.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -34,14 +34,14 @@ import org.lamsfoundation.lams.contentrepository.CrNodeVersion; import org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.IValue; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeType; import org.lamsfoundation.lams.contentrepository.PropertyName; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; import org.lamsfoundation.lams.contentrepository.dao.INodeDAO; +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.ValueFormatException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -76,7 +76,7 @@ @Override public SimpleVersionedNode createFileNode(CrWorkspace workspace, SimpleVersionedNode parentNode, String relPath, InputStream istream, String filename, String mimeType, String versionDescription, Integer userId) - throws org.lamsfoundation.lams.contentrepository.InvalidParameterException { + throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException { SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.FILENODE, workspace, parentNode, relPath, versionDescription, userId); @@ -93,7 +93,7 @@ */ @Override public SimpleVersionedNode createPackageNode(CrWorkspace workspace, String initialPath, String versionDescription, - Integer userId) throws org.lamsfoundation.lams.contentrepository.InvalidParameterException { + Integer userId) throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException { SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.PACKAGENODE, workspace, null, null, versionDescription, userId); @@ -112,7 +112,7 @@ @Override public SimpleVersionedNode createDataNode(CrWorkspace workspace, SimpleVersionedNode parentNode, String versionDescription, Integer userId) - throws org.lamsfoundation.lams.contentrepository.InvalidParameterException { + throws org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException { SimpleVersionedNode initialNodeVersion = createBasicNode(NodeType.DATANODE, workspace, parentNode, null, versionDescription, userId); Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java (.../RepositoryProxy.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/RepositoryProxy.java (.../RepositoryProxy.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -25,7 +25,7 @@ package org.lamsfoundation.lams.contentrepository.service; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryRuntimeException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java =================================================================== diff -u -r5af735c7b7eded85eca276fe808a667175910267 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 5af735c7b7eded85eca276fe808a667175910267) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -41,31 +41,31 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.CrCredential; import org.lamsfoundation.lams.contentrepository.CrNode; import org.lamsfoundation.lams.contentrepository.CrWorkspace; import org.lamsfoundation.lams.contentrepository.CrWorkspaceCredential; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IValue; import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.IVersionedNodeAdmin; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemExistsException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.NodeType; import org.lamsfoundation.lams.contentrepository.PropertyName; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; -import org.lamsfoundation.lams.contentrepository.ValidationException; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; +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.ItemExistsException; +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.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.ValidationException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; +import org.lamsfoundation.lams.contentrepository.exception.WorkspaceNotFoundException; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileUtilException; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleVersionedNode.java (.../SimpleVersionedNode.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -45,22 +45,22 @@ import org.lamsfoundation.lams.contentrepository.CrNodeVersion; import org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty; import org.lamsfoundation.lams.contentrepository.CrWorkspace; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IValue; import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.IVersionedNodeAdmin; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.NodeType; import org.lamsfoundation.lams.contentrepository.PropertyName; import org.lamsfoundation.lams.contentrepository.PropertyType; -import org.lamsfoundation.lams.contentrepository.RepositoryRuntimeException; -import org.lamsfoundation.lams.contentrepository.ValidationException; -import org.lamsfoundation.lams.contentrepository.ValueFormatException; import org.lamsfoundation.lams.contentrepository.dao.IFileDAO; import org.lamsfoundation.lams.contentrepository.dao.INodeDAO; +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.RepositoryRuntimeException; +import org.lamsfoundation.lams.contentrepository.exception.ValidationException; +import org.lamsfoundation.lams.contentrepository.exception.ValueFormatException; import org.lamsfoundation.lams.util.FileUtil; /** Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -37,15 +37,15 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +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; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -rd71c8a085fb0ea3c341f2cf46df958c356d88ec7 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision d71c8a085fb0ea3c341f2cf46df958c356d88ec7) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -45,14 +45,14 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +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; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rc0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision c0799c23f6d6b6be5ca5b740b85c72e3cc89a5b1) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -46,9 +46,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +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; Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -41,12 +41,12 @@ import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.LoginException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +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.events.IEventNotificationService; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -49,15 +49,15 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; +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; Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -rf06669784fcf047185a7f9c48587b3096474aa2a -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision f06669784fcf047185a7f9c48587b3096474aa2a) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -33,12 +33,12 @@ import org.apache.log4j.Logger; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.LoginException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; 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; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java (.../NoticeboardContent.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java (.../NoticeboardContent.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -29,8 +29,8 @@ import java.util.HashSet; import java.util.Set; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; /** *

Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java =================================================================== diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java (.../NoticeboardService.java) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java (.../NoticeboardService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -34,9 +34,9 @@ import org.apache.log4j.Logger; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; +import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -31,8 +31,8 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +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.sbmt.SubmissionDetails; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -46,18 +46,18 @@ import org.apache.struts.upload.FormFile; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; -import org.lamsfoundation.lams.contentrepository.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; 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; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java =================================================================== diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision f98151f6d4d6f66f3d8e482481aa198076133e71) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java (.../MarkAction.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -36,8 +36,8 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService; import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision b67c428939ed96f08f56192d54b8ee55d8ab89d2) @@ -38,9 +38,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.InvalidParameterException; import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; +import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException; +import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;