mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merge V1.2.0 BRANCH to HEAD
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -3,7 +3,7 @@
|
||||
|
||||
|
||||
<!--
|
||||
Repository Boostrap Sequence.
|
||||
Repository Bootstrap Sequence.
|
||||
|
||||
This file specifies the initialisation (and order of initialisation) to perform during Repository startup.
|
||||
|
||||
@@ -34,6 +34,10 @@
|
||||
<prop key="path">/</prop>
|
||||
<prop key="location">alfresco/bootstrap/alfrescoUserStore.xml</prop>
|
||||
</props>
|
||||
<props>
|
||||
<prop key="path">/${alfresco_user_store.system_container.childname}</prop>
|
||||
<prop key="location">alfresco/bootstrap/alfrescoAuthorityStore.xml</prop>
|
||||
</props>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
10
config/alfresco/bootstrap/alfrescoAuthorityStore.xml
Normal file
10
config/alfresco/bootstrap/alfrescoAuthorityStore.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
|
||||
xmlns:cm="http://www.alfresco.org/model/content/1.0"
|
||||
xmlns:sys="http://www.alfresco.org/model/system/1.0"
|
||||
xmlns:usr="http://www.alfresco.org/model/user/1.0"
|
||||
xmlns:app="http://www.alfresco.org/model/application/1.0">
|
||||
|
||||
<sys:container view:childName="${alfresco_user_store.authorities_container.childname}">
|
||||
</sys:container>
|
||||
|
||||
</view:view>
|
||||
@@ -18,8 +18,6 @@
|
||||
</usr:user>
|
||||
</sys:children>
|
||||
</sys:container>
|
||||
<sys:container view:childName="${alfresco_user_store.authorities_container.childname}">
|
||||
</sys:container>
|
||||
</sys:children>
|
||||
</sys:container>
|
||||
|
||||
|
||||
@@ -6,6 +6,14 @@ patch.executer.not_executed =\n=== Recorded patch (not executed) === \nID: {0}\n
|
||||
patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
|
||||
patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
|
||||
|
||||
# General patch messages
|
||||
|
||||
patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
|
||||
patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
|
||||
patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
|
||||
|
||||
patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
|
||||
|
||||
# Individual patch messages
|
||||
|
||||
patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
|
||||
@@ -19,6 +27,8 @@ patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be
|
||||
patch.updatePermissionData.description=Update permission entries from 'folder' to 'cmobject'.
|
||||
patch.updatePermissionData.result=Created the following permission reference names: {0}. \nUpdated {1} permission entries.
|
||||
|
||||
patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
|
||||
|
||||
patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
|
||||
patch.guestUser.result=Added guest user and fixed permissions.
|
||||
|
||||
|
||||
@@ -153,9 +153,9 @@
|
||||
<grantedToGroup permissionGroup="Delete" />
|
||||
<!-- Commented out parent permission check ...
|
||||
<requiredPermission on="parent" name="ReadChildren" implies="false"/>
|
||||
-->
|
||||
<requiredPermission on="parent" name="DeleteChildren" implies="false"/>
|
||||
<requiredPermission on="node" name="DeleteChildren" implies="false"/>
|
||||
-->
|
||||
<!-- Remove the recursive check for now for performance -->
|
||||
<!-- TODO: have one permission to check for delete on an item and one to check -->
|
||||
<!-- child permissions when delete is called on the node service -->
|
||||
|
||||
@@ -44,7 +44,10 @@
|
||||
<property name="sys:versionSchema">
|
||||
<type>d:int</type>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
<default>0</default>
|
||||
<default>0</default>
|
||||
</property>
|
||||
<property name="sys:license">
|
||||
<type>d:content</type>
|
||||
</property>
|
||||
</properties>
|
||||
</type>
|
||||
|
||||
@@ -77,11 +77,19 @@
|
||||
<!-- Helper beans -->
|
||||
<!-- -->
|
||||
|
||||
<bean id="patch.savedSearches.Base" abstract="true" parent="basePatch" >
|
||||
<!-- helper beans for execution -->
|
||||
<property name="importerBootstrap">
|
||||
<ref bean="spacesBootstrap" />
|
||||
<bean id="patch.genericBootstrap.Base" abstract="true" parent="basePatch" >
|
||||
<property name="namespaceService">
|
||||
<ref bean="namespaceService" />
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="searchService" />
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.savedSearches.Base" abstract="true" parent="basePatch" >
|
||||
<property name="namespaceService">
|
||||
<ref bean="namespaceService" />
|
||||
</property>
|
||||
@@ -105,6 +113,26 @@
|
||||
<!-- Patch definitions -->
|
||||
<!-- -->
|
||||
|
||||
<bean id="patch.authoritiesFolder" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="patch.genericBootstrap.Base" >
|
||||
<property name="id"><value>patch.authoritiesFolder</value></property>
|
||||
<property name="description"><value>patch.authoritiesFolder.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>0</value></property>
|
||||
<property name="targetSchema"><value>6</value></property>
|
||||
<!-- bootstrap view -->
|
||||
<property name="importerBootstrap">
|
||||
<ref bean="userBootstrap" />
|
||||
</property>
|
||||
<property name="checkPath">
|
||||
<value>/${alfresco_user_store.system_container.childname}/${alfresco_user_store.authorities_container.childname}</value>
|
||||
</property>
|
||||
<property name="bootstrapView">
|
||||
<props>
|
||||
<prop key="path">/${alfresco_user_store.system_container.childname}</prop>
|
||||
<prop key="location">alfresco/bootstrap/alfrescoAuthorityStore.xml</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="patch.savedSearchesFolder" class="org.alfresco.repo.admin.patch.impl.SavedSearchFolderPatch" parent="patch.savedSearches.Base" >
|
||||
<property name="id"><value>patch.savedSearchesFolder</value></property>
|
||||
<property name="description"><value>patch.savedSearchesFolder.description</value></property>
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
org.alfresco.service.cmr.repository.NodeService.getNodeStatus=ACL_NODE.0.sys:base.Read
|
||||
org.alfresco.service.cmr.repository.NodeService.getRootNode=ACL_NODE.0.sys:base.Read
|
||||
org.alfresco.service.cmr.repository.NodeService.createNode=ACL_NODE.0.sys:base.CreateChildren
|
||||
org.alfresco.service.cmr.repository.NodeService.moveNode=ACL_NODE.0.sys:base.WriteProperties,ACL_PARENT.0.sys:base.DeleteChildren,ACL_NODE.1.sys:base.CreateChildren
|
||||
org.alfresco.service.cmr.repository.NodeService.moveNode=ACL_NODE.0.sys:base.DeleteNode,ACL_NODE.1.sys:base.CreateChildren
|
||||
org.alfresco.service.cmr.repository.NodeService.setChildAssociationIndex=ACL_PARENT.0.sys:base.WriteProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.getType=ACL_NODE.0.sys:base.Read
|
||||
org.alfresco.service.cmr.repository.NodeService.setType=ACL_NODE.0.sys:base.Write
|
||||
@@ -345,9 +345,9 @@
|
||||
org.alfresco.service.cmr.repository.NodeService.removeAspect=ACL_NODE.0.sys:base.Write
|
||||
org.alfresco.service.cmr.repository.NodeService.hasAspect=ACL_NODE.0.sys:base.ReadProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.getAspects=ACL_NODE.0.sys:base.ReadProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.deleteNode=ACL_NODE.0.sys:base.Delete
|
||||
org.alfresco.service.cmr.repository.NodeService.deleteNode=ACL_NODE.0.sys:base.DeleteNode
|
||||
org.alfresco.service.cmr.repository.NodeService.addChild=ACL_NODE.0.sys:base.CreateChildren,ACL_NODE.1.sys:base.ReadProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.removeChild=ACL_NODE.1.sys:base.Delete
|
||||
org.alfresco.service.cmr.repository.NodeService.removeChild=ACL_NODE.1.sys:base.DeleteChildren
|
||||
org.alfresco.service.cmr.repository.NodeService.getProperties=ACL_NODE.0.sys:base.ReadProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.getProperty=ACL_NODE.0.sys:base.ReadProperties
|
||||
org.alfresco.service.cmr.repository.NodeService.setProperties=ACL_NODE.0.sys:base.WriteProperties
|
||||
|
||||
Reference in New Issue
Block a user