diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java index 01e15193ab..5ce3db65c3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java @@ -38,7 +38,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic; -import org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.ClassificationEnforcementException; +import org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.AccessDeniedException; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.content.ContentServicePolicies; @@ -687,7 +687,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon return true; } } - catch (ClassificationEnforcementException cee) + catch (AccessDeniedException ade) { return false; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ClassificationEnforcementException.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/AccessDeniedException.java similarity index 84% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ClassificationEnforcementException.java rename to rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/AccessDeniedException.java index c9fe05d107..5893883947 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/ClassificationEnforcementException.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/AccessDeniedException.java @@ -21,12 +21,12 @@ package org.alfresco.module.org_alfresco_module_rm.classification.interceptor.pr import org.alfresco.error.AlfrescoRuntimeException; /** - * Classification enforcement exception + * Access denied exception thrown when a user tries to execute a method call on an uncleared node. * * @author Tuna Aksoy * @since 3.0 */ -public class ClassificationEnforcementException extends AlfrescoRuntimeException +public class AccessDeniedException extends AlfrescoRuntimeException { /** Serial version uid */ private static final long serialVersionUID = -1546218007029075883L; @@ -36,7 +36,7 @@ public class ClassificationEnforcementException extends AlfrescoRuntimeException * * @param key The key of the exception to be localized */ - public ClassificationEnforcementException(String key) + public AccessDeniedException(String key) { super(key); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PreMethodInvocationProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PreMethodInvocationProcessor.java index 9e1305fa27..fa1e12f786 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PreMethodInvocationProcessor.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PreMethodInvocationProcessor.java @@ -228,8 +228,8 @@ public class PreMethodInvocationProcessor implements ApplicationContextAware String methodName = method.getName(); String name = className + "." + methodName; - throw new ClassificationEnforcementException("The user '" + getFullyAuthenticatedUser() + "' called the method '" - + name + "' for the node '" + nodeRef + "' but is not cleared to see it."); + throw new AccessDeniedException("Access is denied for the user '" + getFullyAuthenticatedUser() + + "' to call the method '" + name + "' for the node '" + nodeRef + "'."); } } } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/ClassificationEnforcementPreMethodInvocationTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/ClassificationEnforcementPreMethodInvocationTest.java index 44bf61a98a..3b74a77f33 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/ClassificationEnforcementPreMethodInvocationTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/ClassificationEnforcementPreMethodInvocationTest.java @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.ClassificationEnforcementException; +import org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor.AccessDeniedException; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; @@ -92,7 +92,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest @Override public void when() throws Exception { - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() throws Exception @@ -101,7 +101,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest } }, testUser); - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() @@ -111,7 +111,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest } }, testUser); - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() throws Exception @@ -120,7 +120,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest } }, testUser); - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() throws Exception @@ -129,7 +129,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest } }, testUser); - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() throws Exception @@ -138,7 +138,7 @@ public class ClassificationEnforcementPreMethodInvocationTest extends BaseRMTest } }, testUser); - doTestInTransaction(new FailureTest(ClassificationEnforcementException.class) + doTestInTransaction(new FailureTest(AccessDeniedException.class) { @Override public void run() throws Exception