From 4c82fcc914d8f52bad038d0a4dfe415007b15dd3 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 13 Jul 2016 18:07:20 +0300
Subject: [PATCH 1/3] RM-3669 - first try - build is failing

---
 .../module/org_alfresco_module_rm/patch/rm-patch-context.xml   | 2 +-
 .../alfresco/module/org_alfresco_module_rm/version.properties  | 3 +++
 rm-community/rm-community-repo/pom.xml                         | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index c59658b435..323a3d9d5a 100755
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-community/rm-community-repo/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="2502"/>
+      <property name="moduleSchema"><value>${version.rm.schema}</value></property>
       <property name="attributeService" ref="AttributeService" />
       <property name="dependsOn">
          <list>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties
new file mode 100644
index 0000000000..8cce8ad3ce
--- /dev/null
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties
@@ -0,0 +1,3 @@
+# RM Schema number
+
+version.rm.schema=2502
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index a4123f6651..57262f23eb 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -34,6 +34,9 @@
          <resource>
             <directory>config</directory>
             <filtering>${app.filtering.enabled}</filtering>
+            <includes>
+                <include>alfresco/module/org_alfresco_module_rm/version.properties</include>
+            </includes>
          </resource>
       </resources>
       <testResources>

From d71aa1f97f6a9f03b88ec6618ddff28ade1f78d4 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 13 Jul 2016 21:25:09 +0100
Subject: [PATCH 2/3] RM-3669 (Extract the module schema value into a
 properties file)

---
 .../org_alfresco_module_rm/patch/rm-patch-context.xml    | 9 +++++++++
 rm-community/rm-community-repo/pom.xml                   | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index 323a3d9d5a..82d7ea8d5f 100755
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
@@ -3,6 +3,15 @@
 
 <beans>
 
+   <!-- load version.properties -->
+   <bean id="rm.version.properties" parent="common-placeholder-configurer">
+      <property name="locations">
+         <list>
+            <value>classpath*:alfresco/module/org_alfresco_module_rm/version.properties</value>
+         </list>
+      </property>
+   </bean>
+
    <!--  rm module patch executer -->
    <bean id="rm.modulePatchExecuter" parent="module.baseComponent" class="org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl">
       <property name="moduleId" value="org_alfresco_module_rm"/>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 57262f23eb..a4123f6651 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -34,9 +34,6 @@
          <resource>
             <directory>config</directory>
             <filtering>${app.filtering.enabled}</filtering>
-            <includes>
-                <include>alfresco/module/org_alfresco_module_rm/version.properties</include>
-            </includes>
          </resource>
       </resources>
       <testResources>

From f0b1ebcf29d25d3aeaf3bb88c1ca8bac5a58ef2f Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Thu, 14 Jul 2016 14:49:13 +0300
Subject: [PATCH 3/3] RM-3669 - extracted the schema number for enterprise and
 decremented community version

---
 .../module/org_alfresco_module_rm/patch/rm-patch-context.xml    | 2 +-
 .../alfresco/module/org_alfresco_module_rm/version.properties   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index 82d7ea8d5f..684289caa3 100755
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
@@ -18,7 +18,7 @@
       <property name="description" value="RM patch executer"/>
       <property name="sinceVersion" value="2.2"/>
       <property name="executeOnceOnly" value="false"/>
-      <property name="moduleSchema"><value>${version.rm.schema}</value></property>
+      <property name="moduleSchema" value="${version.rm.schema}" />
       <property name="attributeService" ref="AttributeService" />
       <property name="dependsOn">
          <list>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties
index 8cce8ad3ce..cf2c7c2600 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version.properties
@@ -1,3 +1,3 @@
 # RM Schema number
 
-version.rm.schema=2502
+version.rm.schema=2501