RM: Admin service refactor

* move admin service and associated classed into 'admin' package
  * move deprecated origionals and move to compatibility structure
  * update references and spring config
  * fix build



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

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

@@ -77,6 +77,7 @@
        <property name="sinceVersion" value="2.0"/>
        <property name="appliesFromVersion" value="2.0"/>
        <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
+       <property name="siteService" ref="SiteService" />
    </bean>
 
    <bean id="org_alfresco_module_rm_RMv21InPlacePatch"

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

@@ -849,7 +849,7 @@
 
     <!-- Records Management Admin Service -->
 
-    <bean id="recordsManagementAdminService" class="org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminServiceImpl" init-method="init">
+    <bean id="recordsManagementAdminService" class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl" init-method="init">
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="namespaceService" ref="NamespaceService"/>
         <property name="nodeService" ref="NodeService"/>
@@ -868,7 +868,7 @@
 
     <bean id="RecordsManagementAdminService" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces">
-            <value>org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService</value>
+            <value>org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService</value>
         </property>
         <property name="target">
             <ref bean="recordsManagementAdminService"/>
@@ -907,38 +907,38 @@
         <property name="objectDefinitionSource">
             <value>
                 <![CDATA[
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.initialiseCustomModel=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.initialiseCustomModel=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomisable=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.isCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.isCustomisable=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.makeCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.makeCustomisable=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.unmakeCustomisable=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.unmakeCustomisable=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.existsCustomProperty=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.existsCustomProperty=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomPropertyDefinitions=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomPropertyDefinitions=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomPropertyDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.addCustomPropertyDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.updateCustomPropertyDefinitionName=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.updateCustomPropertyDefinitionName=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.setCustomPropertyDefinitionLabel=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.setCustomPropertyDefinitionLabel=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.setCustomPropertyDefinitionConstraint=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.setCustomPropertyDefinitionConstraint=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.removeCustomPropertyDefinitionConstraints=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.removeCustomPropertyDefinitionConstraints=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.removeCustomPropertyDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.removeCustomPropertyDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomAssocDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.addCustomAssocDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomChildAssocDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.addCustomChildAssocDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.updateCustomAssocDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.updateCustomAssocDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.updateCustomChildAssocDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.updateCustomChildAssocDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomReferenceDefinitions=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomReferenceDefinitions=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomReferencesFrom=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomReferencesFrom=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomReferencesTo=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomReferencesTo=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomChildReferences=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomChildReferences=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomParentReferences=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomParentReferences=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomReference=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.addCustomReference=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.removeCustomReference=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.removeCustomReference=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCustomConstraintDefinitions=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCustomConstraintDefinitions=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.addCustomConstraintDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.addCustomConstraintDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.removeCustomConstraintDefinition=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.removeCustomConstraintDefinition=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.changeCustomConstraintValues=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.changeCustomConstraintValues=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getQNameForClientId=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getQNameForClientId=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.splitSourceTargetId=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.splitSourceTargetId=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.getCompoundIdFor=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.getCompoundIdFor=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService.*=RM_DENY
+                org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService.*=RM_DENY
                 ]]>
             </value>
         </property>
@@ -1319,18 +1319,7 @@
  	 	
  	 <!-- The cross-transaction shared cache for in-memory CaveatConfig -->
  	 	
- 	 <bean name="caveatConfigSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+ 	 <bean name="caveatConfigSharedCache" class="org.alfresco.repo.cache.DefaultSimpleCache"/>
-        <property name="cache">
-            <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
-                <property name="cacheManager">
-                    <ref bean="internalEHCacheManager" />
-                </property>
-                <property name="cacheName">
-                    <value>org.alfresco.cache.caveatConfigCache</value>
-                </property>
-            </bean>
-        </property>
-    </bean>
 
     <!-- The transactional cache for in-memory CaveatConfig -->
 

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CannotApplyConstraintMetadataException.java

@@ -21,6 +21,9 @@ package org.alfresco.module.org_alfresco_module_rm;
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CannotApplyConstraintMetadataException}
+ */
 public class CannotApplyConstraintMetadataException extends CustomMetadataException
 {
     private static final long serialVersionUID = -6194867814140009959L;

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/CustomMetadataException.java

@@ -18,6 +18,9 @@
  */
 package org.alfresco.module.org_alfresco_module_rm;
 
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException}
+ */
 public abstract class CustomMetadataException extends Exception
 {
     private static final long serialVersionUID = -6676112294794381360L;

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/InvalidCustomAspectMetadataException.java

@@ -21,6 +21,9 @@ package org.alfresco.module.org_alfresco_module_rm;
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.I18NUtil;
 
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.InvalidCustomAspectMetadataException}
+ */
 public class InvalidCustomAspectMetadataException extends CustomMetadataException
 {
     private static final long serialVersionUID = -6194867814140009959L;

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/NotCustomisableMetadataException.java

@@ -20,6 +20,9 @@ package org.alfresco.module.org_alfresco_module_rm;
 
 import org.springframework.extensions.surf.util.I18NUtil;
 
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.NotCustomisableMetadataException}
+ */
 public class NotCustomisableMetadataException extends CustomMetadataException
 {
     private static final long serialVersionUID = -6194867814140009959L;

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/PropertyAlreadyExistsMetadataException.java

@@ -20,6 +20,9 @@ package org.alfresco.module.org_alfresco_module_rm;
 
 import org.springframework.extensions.surf.util.I18NUtil;
 
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.PropertyAlreadyExistsMetadataException}
+ */
 public class PropertyAlreadyExistsMetadataException extends CustomMetadataException
 {
     private static final long serialVersionUID = -6194867814140009959L;

rm-server/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminService.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2005-2011 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;
+
+
+/**
+ * @deprecated as of 2.1 see {@link org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService}
+ */
+public interface RecordsManagementAdminService 
+       extends org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService
+{
+	
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java

@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java

@@ -41,10 +41,7 @@ import org.alfresco.service.namespace.QName;
  */
 public class CompleteEventAction extends RMActionExecuterAbstractBase
 {
-    /** I18N */
+	public static final String PARAM_EVENT_NAME = "eventName";
-    private static final String MSG_EVENT_NO_DISP_LC = "rm.action.event-no-disp-lc";
-    
-    public static final String PARAM_EVENT_NAME = "eventName";
     public static final String PARAM_EVENT_COMPLETED_BY = "eventCompletedBy";
     public static final String PARAM_EVENT_COMPLETED_AT = "eventCompletedAt";
     

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CannotApplyConstraintMetadataException.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005-2011 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.admin;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Custom metadata exception.
+ * 
+ * @author Roy Wethearll
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.CannotApplyConstraintMetadataException
+ */
+public class CannotApplyConstraintMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_CANNOT_APPLY_CONSTRAINT = "rm.admin.cannot-apply-constraint";
+    
+    public CannotApplyConstraintMetadataException(QName lovConstraint, String propIdAsString, QName dataType)
+    {
+        super(I18NUtil.getMessage(CannotApplyConstraintMetadataException.MSG_CANNOT_APPLY_CONSTRAINT, lovConstraint, propIdAsString, dataType));
+    }
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/CustomMetadataException.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2005-2011 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.admin;
+
+/**
+ * Custom metadata exception.
+ * 
+ * @author Roy Wethearll
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.CustomMetadataException
+ */
+public abstract class CustomMetadataException extends Exception
+{
+    private static final long serialVersionUID = -6676112294794381360L;
+    
+    public CustomMetadataException(String msg)
+    {
+        super(msg);
+    }
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/InvalidCustomAspectMetadataException.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005-2011 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.admin;
+
+import org.alfresco.service.namespace.QName;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Custom metadata exception.
+ * 
+ * @author Roy Wethearll
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.InvalidCustomAspectMetadataException
+ */
+public class InvalidCustomAspectMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_INVALID_CUSTOM_ASPECT = "rm.admin.invalid-custom-aspect";
+    
+    public InvalidCustomAspectMetadataException(QName customAspect, String aspectName)
+    {
+        super(I18NUtil.getMessage(MSG_INVALID_CUSTOM_ASPECT, customAspect, aspectName));
+    }
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/NotCustomisableMetadataException.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2011 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.admin;
+
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Custom metadata exception.
+ * 
+ * @author Roy Wethearll
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.NotCustomisableMetadataException
+ */
+public class NotCustomisableMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+    public static final String MSG_NOT_CUSTOMISABLE = "rm.admin.not-customisable";
+    
+    public NotCustomisableMetadataException(String aspectName)
+    {
+        super(I18NUtil.getMessage(MSG_NOT_CUSTOMISABLE, aspectName));
+    }
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/PropertyAlreadyExistsMetadataException.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2005-2011 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.admin;
+
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Custom metadata exception.
+ * 
+ * @author Roy Wethearll
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.PropertyAlreadyExistsMetadataException
+ */
+public class PropertyAlreadyExistsMetadataException extends CustomMetadataException
+{
+    private static final long serialVersionUID = -6194867814140009959L;
+
+    public static final String MSG_PROPERTY_ALREADY_EXISTS = "rm.admin.property-already-exists";
+    
+    public PropertyAlreadyExistsMetadataException(String propIdAsString)
+    {
+        super(I18NUtil.getMessage(MSG_PROPERTY_ALREADY_EXISTS, propIdAsString));
+    }
+}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminService.java

@@ -16,7 +16,7 @@
  * 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;
+package org.alfresco.module.org_alfresco_module_rm.admin;
 
 import java.util.List;
 import java.util.Map;
@@ -37,6 +37,8 @@ import org.alfresco.service.namespace.QName;
  * for the creation and maintenance of RM-related custom properties and custom associations.
  * 
  * @author Neil McErlean, janv
+ * @since 2.1
+ * @see org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService
  */
 public interface RecordsManagementAdminService
 {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java

@@ -16,7 +16,7 @@
  * 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;
+package org.alfresco.module.org_alfresco_module_rm.admin;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -33,6 +33,7 @@ import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
+import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPoliciesUtil;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.BeforeCreateReference;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.BeforeRemoveReference;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.OnCreateReference;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java

@@ -18,7 +18,7 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.bootstrap;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.action.impl.SplitEmailAction;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
 import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java

@@ -89,21 +89,33 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
         return (FilePlanRoleService)applicationContext.getBean("FilePlanRoleService");        
     }
     
+    /**
+     * @return	permission service
+     */
     protected PermissionService getPermissionService()
     {
         return (PermissionService)applicationContext.getBean("permissionService"); 
     }
     
+    /**
+     * @return	node DAO
+     */
     protected NodeDAO getNodeDAO()
     {
         return (NodeDAO)applicationContext.getBean("nodeDAO"); 
     }
     
+    /**
+     * @return	internal node service
+     */
     protected NodeService getInternalNodeService()
     {
         return (NodeService)applicationContext.getBean("nodeService"); 
     }
     
+    /**
+     * @return	site service
+     */
     protected SiteService getSiteService()
     {
         return (SiteService)applicationContext.getBean("SiteService"); 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementFormFilter.java

@@ -22,7 +22,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/CustomisableTypesBootstrap.java

@@ -20,7 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.model;
 
 import java.util.List;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv2SavedSearchPatch.java

@@ -25,6 +25,7 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetails;
 import org.alfresco.repo.module.AbstractModuleComponent;
+import org.alfresco.service.cmr.site.SiteService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanNameAware;
@@ -47,6 +48,9 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
     /** Records management search service */
     private RecordsManagementSearchService recordsManagementSearchService;
     
+    /** Site service */
+    private SiteService siteService;
+    
     /**
      * @param recordsManagementSearchService    records management search service
      */
@@ -55,6 +59,14 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
         this.recordsManagementSearchService = recordsManagementSearchService;
     }
     
+    /**
+     * @param siteService   site service
+     */
+    public void setSiteService(SiteService siteService)
+    {
+        this.siteService = siteService;
+    }
+    
     /**
      * @see org.alfresco.repo.module.AbstractModuleComponent#executeInternal()
      */
@@ -66,30 +78,32 @@ public class RMv2SavedSearchPatch extends AbstractModuleComponent
             logger.debug("RM Module RMv2SavedSearchPatch ...");
         }
         
-        // get the saved searches
+        if (siteService.getSite(RM_SITE_ID) != null)
-        List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
-        
-        if (logger.isDebugEnabled() == true)
         {
-            logger.debug("   ... updating " + savedSearches.size() + " saved searches");
+            // get the saved searches
-        }
+            List<SavedSearchDetails> savedSearches = recordsManagementSearchService.getSavedSearches(RM_SITE_ID);
             
-        for (SavedSearchDetails savedSearchDetails : savedSearches)
+            if (logger.isDebugEnabled() == true)
-        {
+            {
-            // re-save each search so that the query is regenerated correctly
+                logger.debug("   ... updating " + savedSearches.size() + " saved searches");
-            recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName());
+            }
-            recordsManagementSearchService.saveSearch(RM_SITE_ID, 
+            
-                                                      savedSearchDetails.getName(), 
+            for (SavedSearchDetails savedSearchDetails : savedSearches)
-                                                      savedSearchDetails.getDescription(), 
+            {
-                                                      savedSearchDetails.getSearch(), 
+                // re-save each search so that the query is regenerated correctly
-                                                      savedSearchDetails.getSearchParameters(), 
+                recordsManagementSearchService.deleteSavedSearch(RM_SITE_ID, savedSearchDetails.getName());
-                                                      savedSearchDetails.isPublic());            
+                recordsManagementSearchService.saveSearch(RM_SITE_ID, 
+                                                          savedSearchDetails.getName(), 
+                                                          savedSearchDetails.getDescription(), 
+                                                          savedSearchDetails.getSearch(), 
+                                                          savedSearchDetails.getSearchParameters(), 
+                                                          savedSearchDetails.isPublic());            
+            }
         }
         
         if (logger.isDebugEnabled() == true)
         {
             logger.debug("   ... complete");
         }        
-        
     }
 }

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

@@ -29,7 +29,7 @@ import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminServiceImpl;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.content.MimetypeMap;
@@ -42,12 +42,12 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.webscripts.Cache;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * This webscript applies necessary changes to the RM custom model in the repository. These changes
@@ -95,7 +95,7 @@ public class ApplyDodCertModelFixesGet extends DeclarativeWebScript
         
         if (customAssocsAspect == null)
         {
-            final String msg = "Unknown aspect: "+RecordsManagementAdminServiceImpl.RMC_CUSTOM_ASSOCS;
+            final String msg = "Unknown aspect: " + RecordsManagementAdminServiceImpl.RMC_CUSTOM_ASSOCS;
             if (logger.isErrorEnabled())
             {
                 logger.error(msg);

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

@@ -27,7 +27,7 @@ import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminServiceImpl;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.dictionary.M2Aspect;

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

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.webscripts.Cache;

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

@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.module.org_alfresco_module_rm.CustomMetadataException;
+import org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
 import org.alfresco.service.namespace.QName;
 import org.json.JSONException;

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

@@ -25,9 +25,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.CustomMetadataException;
+import org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException;
-import org.alfresco.module.org_alfresco_module_rm.PropertyAlreadyExistsMetadataException;
+import org.alfresco.module.org_alfresco_module_rm.admin.PropertyAlreadyExistsMetadataException;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
 import org.alfresco.service.namespace.QName;
 import org.json.JSONException;
@@ -190,8 +190,9 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
         return result;
     }
 
-    @SuppressWarnings("rawtypes")
+    
-    protected Map<String, Serializable> getParamsFromUrlAndJson(WebScriptRequest req, JSONObject json)
+    @SuppressWarnings("unchecked")
+	protected Map<String, Serializable> getParamsFromUrlAndJson(WebScriptRequest req, JSONObject json)
             throws JSONException
     {
         Map<String, Serializable> params;

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

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.namespace.QName;
 import org.apache.commons.logging.Log;

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

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;

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

@@ -24,7 +24,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.webscripts.Cache;

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

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.namespace.QName;
 import org.springframework.extensions.surf.util.ParameterCheck;
 import org.springframework.extensions.webscripts.Cache;

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

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.AssociationDefinition;
 import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
 import org.alfresco.service.namespace.QName;

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

@@ -26,7 +26,7 @@ import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.AssociationDefinition;
 import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;

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

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.AssociationDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.AssociationRef;

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

@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.namespace.NamespaceService;

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

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java

@@ -39,7 +39,6 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.module.org_alfresco_module_rm.CustomMetadataException;
+import org.alfresco.module.org_alfresco_module_rm.admin.CustomMetadataException;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.BeforeCreateReference;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementPolicies.OnCreateReference;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java

@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java

@@ -3,23 +3,21 @@ package org.alfresco.module.org_alfresco_module_rm.test.webscript;
 import java.io.IOException;
 
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
-import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
-import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
 
 public class DataSetRestApiTest extends BaseRMWebScriptTestCase
 {
     /** URL for the REST APIs */
     private static final String GET_DATASETS_URL = "/api/rma/datasets?site=%s";
-    private static final String POST_DATASET_URL = "/api/rma/datasets/%s?site=%s";
+    //private static final String POST_DATASET_URL = "/api/rma/datasets/%s?site=%s";
 
     /** Constant for the content type */
-    private static final String APPLICATION_JSON = "application/json";
+    //private static final String APPLICATION_JSON = "application/json";
 
     /**
      * Test the REST API to retrieve details of available RM data sets

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java

@@ -25,7 +25,7 @@ import java.text.MessageFormat;
 import java.util.Date;
 import java.util.Map;
 
-import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminServiceImpl;
+import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.script.CustomReferenceType;