RM-926: File plan filters (Hold, Transfer, Unfiled) may not show up to date results when Rm configured for SOLR

* transfer and hold containers created under file plan
  * holds and transfers now contained within these containers
  * holds named using folder level counter to avoid name clash in container
  * hold and transfer filters now API driven .. so canned query driven .. so *live*
  * unit test updates
  * UI tested



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

rm-server/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties

@@ -14,4 +14,5 @@ rm.service.parent-record-folder-root=Can't create a record folder, because the p
 rm.service.parent-record-folder-type=Can't create record folder, because the parent was not sub-type of rm:recordsManagementContainer. (parentType={0})
 rm.service.record-folder-type=Can't create record folder, because the provided type is not a sub-type of rm:recordFolder. (type={0})
 rm.service.not-record=The node {0} is not a record.
-rm.service.vital-def-missing=Vital record definition aspect is not present on node. (nodeRef={0})
+rm.service.vital-def-missing=Vital record definition aspect is not present on node. (nodeRef={0})
+rm.hold.name=Hold

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

@@ -84,6 +84,7 @@
 
          <title>File Plan</title>
          <parent>rma:recordsManagementContainer</parent>
+
          <mandatory-aspects>
             <aspect>rma:recordsManagementRoot</aspect>
          </mandatory-aspects>
@@ -94,6 +95,22 @@
       	 <title>Unfiled Record Container</title>
          <parent>rma:recordsManagementContainer</parent>
       </type>
+      
+      <type name="rma:holdContainer">
+      	 <title>Hold Container</title>
+         <parent>rma:recordsManagementContainer</parent>
+         <mandatory-aspects>
+            <aspect>rma:countable</aspect>
+         </mandatory-aspects>
+      </type>
+      
+      <type name="rma:transferContainer">
+      	 <title>Transfer Container</title>
+         <parent>rma:recordsManagementContainer</parent>
+         <mandatory-aspects>
+            <aspect>rma:countable</aspect>
+         </mandatory-aspects>
+      </type>
 
 	  <!--  Disposition Schedule -->
 
@@ -597,6 +614,7 @@
         <title>Records Management Root</title>
          <associations>
 
+			<!-- @deprecated as of 2.1 -->
             <child-association name="rma:holds">
                 <title>Holds</title>
                 <source>
@@ -610,7 +628,7 @@
                 </target>
             </child-association>
 
-
+			<!-- @deprecated as of 2.1 -->
             <child-association name="rma:transfers">
                 <title>Transfers</title>
                 <source>
@@ -625,9 +643,6 @@
             </child-association>
 
          </associations>
-         <mandatory-aspects>
-            <aspect>rma:filePlanComponent</aspect>
-         </mandatory-aspects>
       </aspect>
 
       <aspect name="rma:declaredRecord">
@@ -1197,6 +1212,19 @@
             </property>
          </properties>
       </aspect>
+      
+      <!--  Helper aspect that can be used to keep a count -->
+      <aspect name="rma:countable">
+         <title>Countable aspect</title>
+         <properties>
+            <property name="rma:count">
+               	<type>d:int</type>
+      			<protected>true</protected>
+      			<mandatory>true</mandatory>
+      			<default>0</default>
+            </property>
+         </properties>
+      </aspect>
 
    </aspects>
 

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

@@ -30,6 +30,18 @@
           parent="baseRecordsManagementIdentifierGenerator" 
     	  class="org.alfresco.module.org_alfresco_module_rm.identifier.BasicIdentifierGenerator">
       <property name="typeAsString" value="{http://www.alfresco.org/model/recordsmanagement/1.0}record"/>
+    </bean> 
+
+    <bean id="holdIdentifierGenerator" 
+          parent="baseRecordsManagementIdentifierGenerator" 
+    	  class="org.alfresco.module.org_alfresco_module_rm.identifier.BasicIdentifierGenerator">
+      <property name="typeAsString" value="{http://www.alfresco.org/model/recordsmanagement/1.0}hold"/>
+    </bean> 
+
+    <bean id="transferIdentifierGenerator" 
+          parent="baseRecordsManagementIdentifierGenerator" 
+    	  class="org.alfresco.module.org_alfresco_module_rm.identifier.BasicIdentifierGenerator">
+      <property name="typeAsString" value="{http://www.alfresco.org/model/recordsmanagement/1.0}transfer"/>
     </bean>
     
 </beans>    

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

@@ -480,6 +480,10 @@
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.existsUnfiledContainer=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getUnfiledContainer=RM.Read.0,AFTER_RM.FilterNode
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createUnfiledContainer=RM.Write.0
+                org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getHoldContainer=RM.Read.0,AFTER_RM.FilterNode
+                org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createHoldContainer=RM.Write.0
+                org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getTransferContainer=RM.Read.0,AFTER_RM.FilterNode
+                org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createTransferContainer=RM.Write.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.createFilePlan=RM_ALLOW
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.getNodeRefPath=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService.isFilePlanContainer=RM_ALLOW

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

@@ -232,6 +232,7 @@
       <property name="permissionService" ref="PermissionService" />
       <property name="mimetypeService" ref="mimetypeService" />
       <property name="exporterService" ref="ExporterService" />
+      <property name="filePlanService" ref="FilePlanService" />
    </bean>
 
    <!-- REST impl for GET transfer -->