diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json
index d0bb84cc0f..6eb58eff72 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rmEventConfigBootstrap.json
+++ b/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",
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties
index 6342449a64..ff7d78eab7 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-events.properties
+++ b/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
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 4e1ff359ae..fc67e96a70 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -99,6 +99,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,36 +162,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index b6c366bd9d..2d7f7e337a 100755
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml
index 53a2078c63..786dabf4b7 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v23-context.xml
@@ -13,5 +13,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl
index 21d6c3a7e3..9f8d7bd807 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmeventtypes.get.json.ftl
+++ b/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 eventtype_has_next>,
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java
index b3e923051f..fce16e9a4b 100755
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/DispositionLifecycleAspect.java
+++ b/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)
{
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23VersionsEventPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23VersionsEventPatch.java
new file mode 100644
index 0000000000..696183e5ac
--- /dev/null
+++ b/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 .
+ */
+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));
+ }
+
+}