From f7f14fd0d2013e9785ca2d1828085cc4e2b04007 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 00:33:07 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    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
---
 .../org/alfresco/email/server/AliasableAspect.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/email/server/AliasableAspect.java b/source/java/org/alfresco/email/server/AliasableAspect.java
index 0233d35f53..ba9b058fd3 100644
--- a/source/java/org/alfresco/email/server/AliasableAspect.java
+++ b/source/java/org/alfresco/email/server/AliasableAspect.java
@@ -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)