Merged MOB-987 and MOB-214: JBPM upgrade scripts and Enterprise DB scripts

- DB2 issue outstanding with use of 'lower(?)' function
 - Need to fix up sharing of insert statements for sequence-related ID generation


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

config/alfresco/bootstrap-context.xml

@@ -32,7 +32,7 @@
     -->
     <bean id="shutdownBackstop" class="org.alfresco.repo.shutdown.ShutdownBackstop">
        <property name="timeout">
-       	  <value>${shutdown.backstop.timeout}</value>
+            <value>${shutdown.backstop.timeout}</value>
        </property>
        <property name="enabled">
           <value>${shutdown.backstop.enabled}</value>
@@ -90,7 +90,7 @@
              <ref bean="patch.schemaUpdateScript-V1.4-2" />
              <ref bean="patch.db-V2.1-NotNullColumns" />
              <ref bean="patch.db-V2.2-ACL-From-2.1-A" />
-			 <ref bean="patch.db-V2.2-ACL" />
+          <ref bean="patch.db-V2.2-ACL" />
              <ref bean="patch.db-V2.2-0-CreateMissingTables" />
              <ref bean="patch.db-V2.2-Upgrade-From-2.1" />
              <ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
@@ -111,6 +111,7 @@
              <ref bean="patch.db-V3.0-0-CreateActivitiesExtras" />
              <ref bean="patch.db-V3.2-Remove-AVM-Issuer" />
              <ref bean="patch.db-V3.2-Modify-AVM-MimeType" />
+             <ref bean="patch.db-V3.2-Upgrade-JBPM" />
           </list>
        </property>
     </bean>
@@ -486,7 +487,7 @@
         </property>
     </bean>
 
-	<!-- Repository helper class -->
+   <!-- Repository helper class -->
    <bean id="repositoryHelper" class="org.alfresco.repo.model.Repository">
       <property name="transactionHelper" ref="retryingTransactionHelper" />
       <property name="namespaceService" ref="namespaceService" />

config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/jbpm-upgrade.sql

@@ -0,0 +1,25 @@
+--
+-- Title:      Upgrade to V3.2 - upgrade jbpm tables to jbpm 3.3.1 
+-- Database:   MySql
+-- Since:      V3.2 schema 2013
+-- Author:     
+--
+-- upgrade jbpm tables to jbpm 3.3.1
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+
+-- we mark next statement as optional to not fail the upgrade from 2.1.a  (as it doesn't contain jbpm)
+alter table JBPM_MODULEDEFINITION modify NAME_ varchar(255);  -- (optional)
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V3.2-Upgrade-JBPM';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V3.2-Upgrade-JBPM', 'Manually executed script upgrade V3.2 to jbpm version 3.3.1 usage',
+     0, 2017, -1, 2018, null, 'UNKOWN', 1, 1, 'Script completed'
+   );

config/alfresco/patch/patch-services-context.xml

@@ -576,10 +576,10 @@
         <property name="userImporterBootstrap">
             <ref bean="userBootstrap" />
         </property>
-          <property name="spacesImporterBootstrap">
+        <property name="spacesImporterBootstrap">
             <ref bean="spacesBootstrap" />
         </property>
-          <property name="indexerAndSearcher">
+        <property name="indexerAndSearcher">
             <ref bean="indexerAndSearcherFactory" />
         </property>
     </bean>
@@ -1080,7 +1080,7 @@
         </property>
     </bean>
    
-	<bean id="patch.db-V2.2-ACL-From-2.1-A" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V2.2-ACL-From-2.1-A" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.2-ACL-From-2.1-A</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1110,7 +1110,7 @@
                 <ref bean="patch.db-V2.1-NotNullColumns" />
             </list>
         </property>
-		<property name="alternatives" >
+      <property name="alternatives" >
             <list>
                 <ref bean="patch.db-V2.2-ACL-From-2.1-A" />
             </list>
@@ -1718,7 +1718,7 @@
         <property name="fixesToSchema"><value>2006</value></property>
         <property name="targetSchema"><value>2007</value></property>
         <property name="permissionService">
-        	<ref bean="permissionService"/>
+           <ref bean="permissionService"/>
         </property>
         <property name="nodeService">
             <ref bean="nodeService"/>
@@ -1742,7 +1742,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-Remove-AVM-Issuer" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-Remove-AVM-Issuer" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-Remove-AVM-Issuer</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1809,7 +1809,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-LockTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-LockTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-LockTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1861,7 +1861,7 @@
         </property>
     </bean>
    
-	<bean id="patch.authorityDefaultZonesPatch" class="org.alfresco.repo.admin.patch.impl.AuthorityDefaultZonesPatch" parent="basePatch" >
+   <bean id="patch.authorityDefaultZonesPatch" class="org.alfresco.repo.admin.patch.impl.AuthorityDefaultZonesPatch" parent="basePatch" >
         <property name="id"><value>patch.authorityDefaultZonesPatch</value></property>
         <property name="description"><value>patch.authorityDefaultZonesPatch.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1870,13 +1870,13 @@
         <property name="authorityService">
             <ref bean="authorityService" />
         </property>
-		<property name="avmService">
+      <property name="avmService">
             <ref bean="avmService" />
         </property>
-		<property name="siteService">
+      <property name="siteService">
             <ref bean="siteService" />
         </property>
-		<property name="hibernateSessionHelper">
+      <property name="hibernateSessionHelper">
             <ref bean="hibernateSessionHelper"/>
         </property>
         <property name="dependsOn">
@@ -1910,7 +1910,7 @@
         </property>
     </bean>
     
-	<bean id="patch.db-V3.2-ContentTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+   <bean id="patch.db-V3.2-ContentTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V3.2-ContentTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1933,4 +1933,15 @@
         </property>
     </bean>
 
+    <bean id="patch.db-V3.2-Upgrade-JBPM" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V3.2-Upgrade-JBPM</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>2017</value></property>
+        <property name="targetSchema"><value>2018</value></property>
+        <property name="scriptUrl">           
+            <value>classpath:alfresco/dbscripts/upgrade/3.2/${db.script.dialect}/jbpm-upgrade.sql</value>
+        </property>
+    </bean>
+    
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=2017
+version.schema=2018