inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59013: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58856: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58845: ALF-18922 : Remove non empty emailserver:alias aspect results in orphaned alias
         Changed the policy binding for remove alias.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:33:07 +00:00
parent bb1be40563
commit f7f14fd0d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/email/server/AliasableAspect.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -28,7 +28,7 @@ import org.alfresco.repo.copy.CopyServicePolicies;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
import org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy;
import org.alfresco.repo.node.NodeServicePolicies.OnRemoveAspectPolicy;
import org.alfresco.repo.node.NodeServicePolicies.BeforeRemoveAspectPolicy;
import org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.policy.JavaBehaviour;
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFactory;
* @since 2.2
*/
public class AliasableAspect implements NodeServicePolicies.OnAddAspectPolicy,
NodeServicePolicies.OnRemoveAspectPolicy,
NodeServicePolicies.BeforeRemoveAspectPolicy,
NodeServicePolicies.OnUpdatePropertiesPolicy,
NodeServicePolicies.BeforeDeleteNodePolicy,
CopyServicePolicies.OnCopyNodePolicy
@@ -103,9 +103,9 @@ public class AliasableAspect implements NodeServicePolicies.OnAddAspectPolicy,
EmailServerModel.ASPECT_ALIASABLE,
new JavaBehaviour(this, "onAddAspect", NotificationFrequency.FIRST_EVENT));
policyComponent.bindClassBehaviour(OnRemoveAspectPolicy.QNAME,
policyComponent.bindClassBehaviour(BeforeRemoveAspectPolicy.QNAME,
EmailServerModel.ASPECT_ALIASABLE,
new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.FIRST_EVENT));
new JavaBehaviour(this, "beforeRemoveAspect", NotificationFrequency.FIRST_EVENT));
policyComponent.bindClassBehaviour(OnUpdatePropertiesPolicy.QNAME,
EmailServerModel.ASPECT_ALIASABLE,
@@ -235,7 +235,7 @@ public class AliasableAspect implements NodeServicePolicies.OnAddAspectPolicy,
}
@Override
public void onRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
public void beforeRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
{
String alias = (String)nodeService.getProperty(nodeRef, EmailServerModel.PROP_ALIAS);
if(alias != null)