inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
config/alfresco/patch/patch-services-context.xml
View File

@@ -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>