Merged methods from the EmailMappingKeyService to CustomEmailMappingService and deleted the EMailMappingKeyService.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@44324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml

@@ -116,7 +116,7 @@
       abstract="true"
       class="org.alfresco.module.org_alfresco_module_rm.email.CustomisableEmailMappingKeyBootstrap"
       init-method="init">
-      <property name="emailMappingKeyService" ref="emailMappingKeyService"/>
+      <property name="customEmailMappingService" ref="customEmailMappingService"/>
    </bean>
 
    <bean id="customEmailMappingKey"

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -793,10 +793,10 @@
                 <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.initialiseCustomModel=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomisable=RM_ALLOW
-				org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.isCustomisable=RM_ALLOW
-				org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.makeCustomisable=RM_ALLOW
-				org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.unmakeCustomisable=RM_ALLOW
-				org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.existsCustomProperty=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.isCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.makeCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.unmakeCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.existsCustomProperty=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomPropertyDefinitions=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomPropertyDefinition=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.updateCustomPropertyDefinitionName=RM_ALLOW
@@ -1038,7 +1038,16 @@
       </property>
       <property name="policyComponent"><ref bean="policyComponent" /></property>
       <property name="transactionService"><ref bean="transactionService" /></property>
-
+      <property name="emailMappingKeys">
+         <list>
+            <value>Thread-Index</value>
+            <value>messageFrom</value>
+            <value>messageTo</value>
+            <value>messageCc</value>
+            <value>messageSubject</value>
+            <value>messageSent</value>
+         </list>
+      </property>
    </bean>
 
 
@@ -1069,6 +1078,7 @@
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.getCustomMappings=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.addCustomMapping=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.deleteCustomMapping=RM_ALLOW
+                    org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.getEmailMappingKeys=RM_ALLOW
                     org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService.*=RM_DENY
                 ]]>
             </value>
@@ -1094,71 +1104,6 @@
         </property>
     </bean>
 
-   <!-- EMail Mapping Key Service -->
-
-   <bean id="emailMappingKeyService"
-      class="org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyServiceImpl" >
-      <property name="emailMappingKeys">
-         <list>
-            <value>Thread-Index</value>
-            <value>messageFrom</value>
-            <value>messageTo</value>
-            <value>messageCc</value>
-            <value>messageSubject</value>
-            <value>messageSent</value>
-         </list>
-      </property>
-   </bean>
-
-   <bean id="EmailMappingKeyService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-      <property name="transactionManager">
-         <ref bean="transactionManager"/>
-      </property>
-      <property name="transactionAttributes">
-         <props>
-            <prop key="*">${server.transaction.mode.default}</prop>
-         </props>
-      </property>
-   </bean>
-
-   <bean id="EmailMappingKeyService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
-      <property name="authenticationManager">
-         <ref bean="authenticationManager"/>
-      </property>
-      <property name="accessDecisionManager">
-         <ref bean="accessDecisionManager"/>
-      </property>
-      <property name="afterInvocationManager">
-         <ref bean="afterInvocationManager"/>
-      </property>
-      <property name="objectDefinitionSource">
-         <value>
-            <![CDATA[
-               org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService.getEmailMappingKeys=RM_ALLOW
-               org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService.*=RM_DENY
-            ]]>
-         </value>
-      </property>
-   </bean>
-
-   <bean id="EmailMappingKeyService" class="org.springframework.aop.framework.ProxyFactoryBean">
-      <property name="proxyInterfaces">
-         <list>
-            <value>org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService</value>
-         </list>
-      </property>
-      <property name="targetName">
-         <value>emailMappingKeyService</value>
-      </property>
-      <property name="interceptorNames">
-         <list>
-            <idref local="EmailMappingKeyService_transaction"/>
-            <idref local="EmailMappingKeyService_security"/>
-            <idref bean="exceptionTranslator"/>
-         </list>
-      </property>
-   </bean>
-
     <!--  RM Notification Helper -->
 
     <bean id="recordsManagementNotificationHelper" class="org.alfresco.module.org_alfresco_module_rm.notification.RecordsManagementNotificationHelper" >

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml

@@ -501,6 +501,6 @@
    <bean id="webscript.org.alfresco.rma.admin.emailmapkeys.get"
       class="org.alfresco.module.org_alfresco_module_rm.script.EmailMapKeysGet"
       parent="webscript">
-      <property name="emailMappingKeyService" ref="EmailMappingKeyService" />
+      <property name="customEmailMappingService" ref="CustomEmailMappingService" />
    </bean>
 </beans>

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java

@@ -18,6 +18,7 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.email;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -47,4 +48,18 @@ public interface CustomEmailMappingService
      * @param to
      */
     public void deleteCustomMapping(String from, String to);
+
+    /**
+     * Gets the list of email mapping keys
+     *
+     * @return Email mapping keys
+     */
+    public List<String> getEmailMappingKeys();
+
+    /**
+     * Registers an email mapping key with the existing list of email mapping keys
+     *
+     * @param emailMappingKey  emailMappingKey to register
+     */
+    public void registerEMailMappingKey(String emailMappingKey);
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java

@@ -21,6 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.email;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -43,6 +44,7 @@ import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ParameterCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -91,6 +93,9 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
     /** Transient set of custom mappings */
     private Set<CustomMapping> customMappings;
 
+    /** List of email mapping keys */
+    private List<String> emailMappingKeys;
+
     /**
      * @param policyComponent   policy component
      */
@@ -139,6 +144,14 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
         this.transactionService = transactionService;
     }
 
+    /**
+     * @param emailMappingKeys    email mapping keys
+     */
+    public void setEmailMappingKeys(List<String> emailMappingKeys)
+    {
+        this.emailMappingKeys = emailMappingKeys;
+    }
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService#getCustomMappings()
      */
@@ -245,6 +258,26 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme
         }
     }
 
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService#getEmailMappingKeys()
+     */
+    @Override
+    public List<String> getEmailMappingKeys()
+    {
+        return emailMappingKeys;
+    }
+
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService#registerEMailMappingKey(java.lang.String)
+     */
+    @Override
+    public void registerEMailMappingKey(String emailMappingKey)
+    {
+        ParameterCheck.mandatoryString("emailMappingKey", emailMappingKey);
+
+        emailMappingKeys.add(emailMappingKey);
+    }
+
     /**
      * Updates the extractor with the custom configuration.
      */

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomisableEmailMappingKeyBootstrap.java

@@ -31,8 +31,8 @@ public class CustomisableEmailMappingKeyBootstrap
     /** List of mappings to register as customisable */
     private List<String> customisable;
 
-    /** Email mapping key service */
-    private EmailMappingKeyService emailMappingKeyService;
+    /** Custom email mapping service */
+    private CustomEmailMappingService customEmailMappingService;
 
     /**
      * @param customizable  list of mappings to register as customisable
@@ -43,13 +43,13 @@ public class CustomisableEmailMappingKeyBootstrap
     }
 
     /**
-     * Email mapping key service
+     * Custom email mapping service
      *
-     * @param emailMappingKeyService the email mapping key service
+     * @param customEmailMappingService the custom email mapping service
      */
-    public void setEmailMappingKeyService(EmailMappingKeyService emailMappingKeyService)
+    public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
     {
-        this.emailMappingKeyService = emailMappingKeyService;
+        this.customEmailMappingService = customEmailMappingService;
     }
 
     /**
@@ -59,7 +59,7 @@ public class CustomisableEmailMappingKeyBootstrap
     {
         for (String customEmailMappingKey : customisable)
         {
-            emailMappingKeyService.makeCustomisable(customEmailMappingKey);
+            customEmailMappingService.registerEMailMappingKey(customEmailMappingKey);
         }
     }
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/EmailMappingKeyService.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2005-2012 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.email;
-
-import java.util.List;
-
-/**
- * EMail Mapping Key Service
- *
- * @author Tuna Aksoy
- * @since @2.1
- */
-public interface EmailMappingKeyService
-{
-    /**
-     * Gets the list of email mapping keys
-     *
-     * @return Email mapping keys
-     */
-    public List<String> getEmailMappingKeys();
-
-    /**
-     * Makes a email mapping key customisable.
-     *
-     * @param emailMappingKey  emailMappingKey to make customisable
-     */
-    public void makeCustomisable(String emailMappingKey);
-}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/EmailMappingKeyServiceImpl.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2005-2012 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.email;
-
-import java.util.List;
-
-import org.alfresco.util.ParameterCheck;
-
-/**
- * EMail Mapping Key Service
- *
- * @author Tuna Aksoy
- * @since 2.1
- */
-public class EmailMappingKeyServiceImpl implements EmailMappingKeyService
-{
-    List<String> emailMappingKeys;
-
-    public void setEmailMappingKeys(List<String> emailMappingKeys)
-    {
-        this.emailMappingKeys = emailMappingKeys;
-    }
-
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService#getEmailMappingKeys()
-     */
-    @Override
-    public List<String> getEmailMappingKeys()
-    {
-        return emailMappingKeys;
-    }
-
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService#makeCustomisable(java.lang.String)
-     */
-    @Override
-    public void makeCustomisable(String emailMappingKey)
-    {
-        ParameterCheck.mandatoryString("emailMappingKey", emailMappingKey);
-
-        emailMappingKeys.add(emailMappingKey);
-    }
-}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java

@@ -21,7 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.email.EmailMappingKeyService;
+import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
@@ -35,17 +35,17 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
  */
 public class EmailMapKeysGet extends DeclarativeWebScript
 {
-    /** Email mapping key service */
-    private EmailMappingKeyService emailMappingKeyService;
+    /** Custom email mapping service */
+    private CustomEmailMappingService customEmailMappingService;
 
     /**
-     * Email mapping key service
+     * Custom email mapping service
      *
-     * @param emailMappingKeyService the email mapping key service
+     * @param customEmailMappingService the custom email mapping service
      */
-    public void setEmailMappingKeyService(EmailMappingKeyService emailMappingKeyService)
+    public void setCustomEmailMappingService(CustomEmailMappingService customEmailMappingService)
     {
-        this.emailMappingKeyService = emailMappingKeyService;
+        this.customEmailMappingService = customEmailMappingService;
     }
 
     @Override
@@ -53,7 +53,7 @@ public class EmailMapKeysGet extends DeclarativeWebScript
     {
         // Create model object with the lists of email mapping keys
         Map<String, Object> model = new HashMap<String, Object>(1);
-        model.put("emailmapkeys", emailMappingKeyService.getEmailMappingKeys());
+        model.put("emailmapkeys", customEmailMappingService.getEmailMappingKeys());
         return model;
     }
 }