Demo scenario:

* friendlier names for Version relationship
  * added "Versions" event .. too allow auotmatic disposition of versioned records
  * patch for above
  * bug fix for events not being populated when auto-filling rule used



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

rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json

@@ -26,6 +26,11 @@
          "eventName" : "superseded",
          "eventDisplayLabel" : "rmevent.superseded"
       },
+      {
+         "eventType" : "rmEventType.versioned",
+         "eventName" : "versioned",
+         "eventDisplayLabel" : "rmevent.versioned"
+      },
       {
          "eventType" : "rmEventType.simple",
          "eventName" : "study_complete",

rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties

@@ -3,6 +3,7 @@ rmeventservice.rmEventType.simple=Simple Event
 rmeventservice.rmEventType.obsolete=Obsoleted Event
 rmeventservice.rmEventType.superseded=Superseded Event
 rmeventservice.rmEventType.crossReferencedRecordTransfered=Cross Referenced Record Transferred
+rmeventservice.rmEventType.versioned=Versioned Event
 
 # Default events
 rmevent.case_closed=Case Closed
@@ -10,6 +11,7 @@ rmevent.abolished=Abolished
 rmevent.re_designated=Redesignated
 rmevent.no_longer_needed=No longer needed
 rmevent.superseded=Superseded
+rmevent.versioned=Versioned
 rmevent.study_complete=Study Complete
 rmevent.training_complete=Training Complete
 rmevent.related_record_trasfered_inactive_storage=Related Record Transferred To Inactive Storage

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

@@ -99,6 +99,41 @@
 
    <!--  Import the deprecated beans -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-deprecated-context.xml"/>
+   
+   <!-- Event types -->
+   <bean id="rmEventType" init-method="init" abstract="true">
+      <property name="recordsManagementEventService" ref="recordsManagementEventService"/>
+   </bean>
+
+   <bean id="rmEventType.simple" class="org.alfresco.module.org_alfresco_module_rm.event.SimpleRecordsManagementEventTypeImpl" parent="rmEventType"/>
+
+   <bean id="rmEventType.superseded" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferenceCreateEventType" parent="rmEventType">
+      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}supersedes"/>
+      <property name="dispositionService" ref="dispositionService"/>
+      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
+   </bean>
+
+   <bean id="rmEventType.obsolete" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferenceCreateEventType" parent="rmEventType">
+      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}obsoletes"/>
+      <property name="dispositionService" ref="dispositionService"/>
+      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
+   </bean>
+   
+   <bean id="rmEventType.versioned" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferenceCreateEventType" parent="rmEventType">
+      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}versions"/>
+      <property name="dispositionService" ref="dispositionService"/>
+      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
+   </bean>
+
+   <bean id="rmEventType.crossReferencedRecordTransfered" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferencedRecordActionedUpon" parent="rmEventType">
+      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}crossreference"/>
+      <property name="actionName" value="transferComplete"/>
+      <property name="nodeService" ref="nodeService"/>
+      <property name="dispositionService" ref="dispositionService"/>
+      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
+      <property name="recordService" ref="recordService" />
+      <property name="recordFolderService" ref="RecordFolderService"/>
+   </bean>
 
    <!--  Import the RM module patches -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml"/>
@@ -127,36 +162,7 @@
       <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
       <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
    </bean>
-
-   <!-- Event types -->
-   <bean id="rmEventType" init-method="init" abstract="true">
-      <property name="recordsManagementEventService" ref="recordsManagementEventService"/>
-   </bean>
-
-   <bean id="rmEventType.simple" class="org.alfresco.module.org_alfresco_module_rm.event.SimpleRecordsManagementEventTypeImpl" parent="rmEventType"/>
-
-   <bean id="rmEventType.superseded" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferenceCreateEventType" parent="rmEventType">
-      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}supersedes"/>
-      <property name="dispositionService" ref="dispositionService"/>
-      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
-   </bean>
-
-   <bean id="rmEventType.obsolete" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferenceCreateEventType" parent="rmEventType">
-      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}obsoletes"/>
-      <property name="dispositionService" ref="dispositionService"/>
-      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
-   </bean>
-
-   <bean id="rmEventType.crossReferencedRecordTransfered" class="org.alfresco.module.org_alfresco_module_rm.event.OnReferencedRecordActionedUpon" parent="rmEventType">
-      <property name="referenceName" value="{http://www.alfresco.org/model/rmcustom/1.0}crossreference"/>
-      <property name="actionName" value="transferComplete"/>
-      <property name="nodeService" ref="nodeService"/>
-      <property name="dispositionService" ref="dispositionService"/>
-      <property name="recordsManagementActionService" ref="recordsManagementActionService"/>
-      <property name="recordService" ref="recordService" />
-      <property name="recordFolderService" ref="RecordFolderService"/>
-   </bean>
-
+   
    <!--  Job context -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-job-context.xml"/>
 

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

@@ -9,7 +9,7 @@
       <property name="description" value="RM patch executer"/>
       <property name="sinceVersion" value="2.2"/>
       <property name="executeOnceOnly" value="false"/>
-      <property name="moduleSchema" value="1010"/>      
+      <property name="moduleSchema" value="1011"/>      
       <property name="attributeService" ref="AttributeService" />   
       <property name="dependsOn">
       	<list>

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

@@ -13,5 +13,14 @@
       <property name="targetSchema" value="1010"/>
 	  <property name="recordContributorsGroupBootstrapComponent" ref="recordContributorsGroupBootstrapComponent"/>
    </bean>
+   
+   <bean id="rm.versionsEventPatch"
+         parent="rm.parentModulePatch"
+         class="org.alfresco.module.org_alfresco_module_rm.patch.v23.RMv23VersionsEventPatch">
+      <property name="description" value="Create versions event."/>
+      <property name="fixesToSchema" value="1010"/>
+      <property name="targetSchema" value="1011"/>
+	  <property name="recordsManagementEventService" ref="recordsManagementEventService"/>
+   </bean>
 
 </beans>

rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl

@@ -8,7 +8,7 @@
 		"${eventtype.name}":
 		{
 		  "eventTypeName" : "${eventtype.name}",
-		  "eventTypeDisplayLabel" : "${eventtype.displayLabel}" 
+		  "eventTypeDisplayLabel" : "<#if eventtype.displayLabel??>${eventtype.displayLabel}<#else></#if>" 
 		}<#if eventtype_has_next>,</#if>
 		</#list>
 	}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java

@@ -77,7 +77,7 @@ public class DispositionLifecycleAspect extends BaseBehaviourBean
     @Behaviour
     (
             kind = BehaviourKind.CLASS,
-            notificationFrequency = NotificationFrequency.FIRST_EVENT
+            notificationFrequency = NotificationFrequency.EVERY_EVENT
     )
     public void onAddAspect(final NodeRef nodeRef, final QName aspect)
     {

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2014 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.patch.v23;
+
+import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
+import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * RM v2.3 patch that creates the versions event.
+ *
+ * @author Roy Wetherall
+ * @since 2.3
+ */
+public class RMv23VersionsEventPatch extends AbstractModulePatch
+{
+	/** event details */
+	private static final String EVENT_TYPE = "rmEventType.versioned";
+	private static final String EVENT_NAME = "versioned";
+	private static final String EVENT_I18N = "rmevent.versioned";
+	
+	/** records management event service */
+    private RecordsManagementEventService recordsManagementEventService;
+    
+    /**
+     * @param recordsManagementEventService	records management event service
+     */
+    public void setRecordsManagementEventService(RecordsManagementEventService recordsManagementEventService) 
+    {
+		this.recordsManagementEventService = recordsManagementEventService;
+	}
+    
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch#applyInternal()
+     */
+    @Override
+    public void applyInternal()
+    {
+    	// add versions event
+        recordsManagementEventService.addEvent(EVENT_TYPE, EVENT_NAME, I18NUtil.getMessage(EVENT_I18N));
+    }
+    
+}