From 3917a4f3a68e5bc5d3906b561abf59b1a40e7174 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 3 Sep 2014 15:55:36 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    80524:
 Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       75251: Placed the
 beans in the patch service in correct order (based on target schema).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/patch/patch-services-context.xml | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 40821d9d2d..4c8bd63351 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -3320,8 +3320,34 @@
         <property name="jobLockService" ref="jobLockService" />
         <!--  Do we deferr running the surf-config folder patch? -->
         <property name="deferred"><value>${system.patch.surfConfigFolder.deferred}</value></property>
-    </bean> 
-
+    </bean>
+    
+    <bean id="patch.solrFacets.root" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
+        <property name="id"><value>patch.solrFacets.root</value></property>
+        <property name="description"><value>patch.solrFacets.root.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>7005</value></property>
+        <property name="targetSchema"><value>7006</value></property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.updateDmPermissions" />
+            </list>
+        </property>
+        <property name="importerBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="checkPath">
+            <value>${solr_facets.root}</value>
+        </property>
+        <property name="bootstrapView">
+            <props>
+                <prop key="path">${solr_facets.root.path}</prop>
+                <prop key="location">alfresco/bootstrap/solrFacetsRootFolder.xml</prop>
+                <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
+            </props>
+        </property>
+    </bean>
+    
     <bean id="patch.renameSiteAuthorityDisplayName"
         class="org.alfresco.repo.admin.patch.impl.RenameSiteAuthorityDisplayName"
         parent="basePatch">
@@ -3352,31 +3378,6 @@
         <property name="ruleService">
             <ref bean="ruleService" />
         </property>
-    </bean> 
-    
-    <bean id="patch.solrFacets.root" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
-        <property name="id"><value>patch.solrFacets.root</value></property>
-        <property name="description"><value>patch.solrFacets.root.description</value></property>
-        <property name="fixesFromSchema"><value>0</value></property>
-        <property name="fixesToSchema"><value>7005</value></property>
-        <property name="targetSchema"><value>7006</value></property>
-        <property name="dependsOn" >
-            <list>
-                <ref bean="patch.updateDmPermissions" />
-            </list>
-        </property>
-        <property name="importerBootstrap">
-            <ref bean="spacesBootstrap" />
-        </property>
-        <property name="checkPath">
-            <value>${solr_facets.root}</value>
-        </property>
-        <property name="bootstrapView">
-            <props>
-                <prop key="path">${solr_facets.root.path}</prop>
-                <prop key="location">alfresco/bootstrap/solrFacetsRootFolder.xml</prop>
-                <prop key="messages">alfresco/messages/bootstrap-spaces</prop>
-            </props>
-        </property>
-    </bean> 
+    </bean>
+ 
 </beans>