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/bootstrap-context.xml

@@ -49,15 +49,16 @@
              <ref bean="patch.schemaUpdateScript-V1.4-2" />
              <ref bean="patch.db-V2.1-NotNullColumns" />
              <ref bean="patch.db-V2.2-ACL" />
-             <ref bean="patch.db-V2.2-QNames-0-CreateMissingTables" />
-             <ref bean="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" />
-             <ref bean="patch.db-V2.2-QNames-2-MoveQNames" />
-             <ref bean="patch.db-V2.2-QNames-3-PropTypes" />
+             <ref bean="patch.db-V2.2-0-CreateMissingTables" />
+             <ref bean="patch.db-V2.2-1-DropIndexesAndConstraints" />
+             <ref bean="patch.db-V2.2-2-MoveQNames" />
+             <ref bean="patch.db-V2.2-3-PropTypes" />
           </list>
        </property>
        <property name="postUpdateScriptPatches">
           <list>
-             <ref bean="patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints" />
+             <ref bean="patch.db-V2.2-4-ExtraIndexesAndConstraints" />
+             <ref bean="patch.db-V2.2-5-MappedFKIndexes" />
              <ref bean="patch.db-V1.4-TxnCommitTimeIndex" />
              <ref bean="patch.db-V2.1-JBPMData" />
              <ref bean="patch.db-V2.1-VersionColumns2" />
@@ -93,6 +94,32 @@
        </property>
     </bean>
 
+    <!-- Load models -->
+   <bean id="dictionaryRepositoryBootstrap" class="org.alfresco.repo.dictionary.DictionaryRepositoryBootstrap">
+
+      <property name="dictionaryDAO" ref="dictionaryDAO"/>
+      <property name="contentService" ref="ContentService"/>      
+      <property name="searchService" ref="SearchService"/>
+      <property name="transactionService" ref="transactionComponent"/>
+      <property name="namespaceService" ref="namespaceService"/>
+      <property name="nodeService" ref="NodeService"/>
+      <property name="messageService" ref="messageService"/>
+      <property name="tenantDeployerService" ref="tenantAdminService"/>
+         
+      <property name="repositoryModelsLocations">
+         <list>
+            <ref bean="customModelsRepositoryLocation" />
+         </list>        
+      </property>
+         
+      <property name="repositoryMessagesLocations">
+         <list>
+            <ref bean="customMessagesRepositoryLocation" />
+         </list>        
+      </property>
+           
+   </bean>
+
     <!-- Bootstrap Files -->
     <bean id="systemInfoBootstrap" parent="systemInfoImporter">
     </bean>