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
This commit is contained in:
Will Abson
2014-09-03 15:55:36 +00:00
parent f0423115fa
commit 3917a4f3a6

View File

@@ -3322,6 +3322,32 @@
<property name="deferred"><value>${system.patch.surfConfigFolder.deferred}</value></property> <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" <bean id="patch.renameSiteAuthorityDisplayName"
class="org.alfresco.repo.admin.patch.impl.RenameSiteAuthorityDisplayName" class="org.alfresco.repo.admin.patch.impl.RenameSiteAuthorityDisplayName"
parent="basePatch"> parent="basePatch">
@@ -3354,29 +3380,4 @@
</property> </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>
</beans> </beans>