Merged V2.2 to HEAD

8146: Interim checkin for Oracle upgrade scripts.
   8150: AR-1905
   8151: AR-1956
   8152: Correct I18N when reporting patch description
   8153: QName script for Oracle along with fixes for unique constraints on assoc tables
   8155: Upgrade scripts for Oracle V2.2 - almost there
   8164: AWC-1633: Unable to edit rule added via web service
   8166: V2.2 upgrade scripts for MySQL and Oracle
   8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates
   8174: Fix for AWC-798
   8180: Fix for AWC-1843
   8183: Fixes for different unique index names on alf_child_assoc
   8189: AWC-1719: Need to alllow Rules to account for a space being deleted
   8249: Fixed handling of empty namespaces on Oracle
   8259: Fixes for null namespaces in QName
   8360: Modified alf_audit_date columns and added patch
   8404: Fix AR-2133: Fix handling of empty namespaces during upgrade


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

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

@@ -1276,8 +1276,8 @@
         </property>
     </bean>
     
-    <bean id="patch.db-V2.2-QNames-0-CreateMissingTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-QNames-0-CreateMissingTables</value></property>
+    <bean id="patch.db-V2.2-0-CreateMissingTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-0-CreateMissingTables</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
@@ -1291,8 +1291,8 @@
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-QNames-1-DropIndexesAndConstraints</value></property>
+    <bean id="patch.db-V2.2-1-DropIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-1-DropIndexesAndConstraints</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
@@ -1302,12 +1302,12 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-QNames-0-CreateMissingTables" />
+                <ref bean="patch.db-V2.2-0-CreateMissingTables" />
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-QNames-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-QNames-2-MoveQNames</value></property>
+    <bean id="patch.db-V2.2-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-2-MoveQNames</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
@@ -1317,12 +1317,12 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" />
+                <ref bean="patch.db-V2.2-1-DropIndexesAndConstraints" />
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-QNames-3-PropTypes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-QNames-3-PropTypes</value></property>
+    <bean id="patch.db-V2.2-3-PropTypes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-3-PropTypes</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
@@ -1332,12 +1332,12 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-QNames-2-MoveQNames" />
+                <ref bean="patch.db-V2.2-2-MoveQNames" />
             </list>
         </property>
     </bean>
-    <bean id="patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
-        <property name="id"><value>patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints</value></property>
+    <bean id="patch.db-V2.2-4-ExtraIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-4-ExtraIndexesAndConstraints</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
         <property name="fixesToSchema"><value>120</value></property>
@@ -1347,7 +1347,22 @@
         </property>
         <property name="dependsOn" >
             <list>
-                <ref bean="patch.db-V2.2-QNames-3-PropTypes" />
+                <ref bean="patch.db-V2.2-3-PropTypes" />
+            </list>
+        </property>
+    </bean>
+    <bean id="patch.db-V2.2-5-MappedFKIndexes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-5-MappedFKIndexes</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>120</value></property>
+        <property name="targetSchema"><value>121</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-5-mapped-fk-indexes.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-4-ExtraIndexesAndConstraints" />
             </list>
         </property>
     </bean>