mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4843 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4848 . Allow null in setAuthentication Patch for system registry area git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -81,6 +81,10 @@
|
||||
<prop key="path">/</prop>
|
||||
<prop key="location">alfresco/bootstrap/descriptor.xml</prop>
|
||||
</props>
|
||||
<props>
|
||||
<prop key="path">/</prop>
|
||||
<prop key="location">alfresco/bootstrap/systemRegistry.xml</prop>
|
||||
</props>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
6
config/alfresco/bootstrap/systemRegistry.xml
Normal file
6
config/alfresco/bootstrap/systemRegistry.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
|
||||
xmlns:sys="http://www.alfresco.org/model/system/1.0">
|
||||
|
||||
<sys:container view:childName="sys:system-registry" />
|
||||
|
||||
</view:view>
|
@@ -128,3 +128,5 @@ patch.linkNodeExtension.description=Fixes link node file extensions to have a .u
|
||||
patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
|
||||
patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
|
||||
patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
|
||||
|
||||
patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
|
||||
|
@@ -537,8 +537,7 @@
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.userHomesFolder" class="org.alfresco.repo.admin.patch.impl.UserHomesFolderPatch" parent="basePatch" >
|
||||
<bean id="patch.userHomesFolder" class="org.alfresco.repo.admin.patch.impl.UserHomesFolderPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.userHomesFolder</value></property>
|
||||
<property name="description"><value>patch.userHomesFolder.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
@@ -548,7 +547,7 @@
|
||||
<property name="messageSource">
|
||||
<ref bean="bootstrapSpacesMessageSource" />
|
||||
</property>
|
||||
<property name="importerBootstrap">
|
||||
<property name="importerBootstrap">
|
||||
<ref bean="spacesBootstrap" />
|
||||
</property>
|
||||
</bean>
|
||||
@@ -588,7 +587,7 @@
|
||||
|
||||
<bean id="patch.LinkNodeFileExtension" class="org.alfresco.repo.admin.patch.impl.LinkNodeFileExtensionPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.LinkNodeFileExtension</value></property>
|
||||
<property name="description"><value>patch.invalidNameEnding.description</value></property>
|
||||
<property name="description"><value>patch.linkNodeExtension.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>33</value></property>
|
||||
<property name="targetSchema"><value>34</value></property>
|
||||
@@ -601,4 +600,25 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.systemRegistryBootstrap" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.systemRegistryBootstrap</value></property>
|
||||
<property name="description"><value>patch.systemRegistryBootstrap.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>34</value></property>
|
||||
<property name="targetSchema"><value>35</value></property>
|
||||
<!-- bootstrap view -->
|
||||
<property name="importerBootstrap">
|
||||
<ref bean="systemBootstrap" />
|
||||
</property>
|
||||
<property name="checkPath">
|
||||
<value>/sys:system-registry</value>
|
||||
</property>
|
||||
<property name="bootstrapView">
|
||||
<props>
|
||||
<prop key="path">/</prop>
|
||||
<prop key="location">alfresco/bootstrap/systemRegistry.xml</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
@@ -19,4 +19,4 @@ version.build=@build-number@
|
||||
|
||||
# Schema number
|
||||
|
||||
version.schema=34
|
||||
version.schema=35
|
||||
|
Reference in New Issue
Block a user