Merged V2.2 to HEAD

10955: Merged V2.1 to V2.2
      10874: Fix for ETWOONE-296.
      10914: Corrected fix for ETWOONE-296.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-06 11:04:42 +00:00
parent 62c7b53c79
commit 9ed542fab1
7 changed files with 177 additions and 34 deletions

View File

@@ -1,17 +1,11 @@
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
xmlns:sys="http://www.alfresco.org/model/system/1.0"
xmlns:cm="http://www.alfresco.org/model/content/1.0">
<cm:category_root view:childName="cm:categoryRoot">
<view:acl>
<view:ace view:access="ALLOWED">
<view:authority>guest</view:authority>
<view:permission>Read</view:permission>
</view:ace>
</view:acl>
<cm:name>categories</cm:name>
<cm:categories>
<!-- Software Document Classification -->
<cm:category view:childName="cm:generalclassifiable">
<cm:name>General</cm:name>
@@ -1118,5 +1112,4 @@
</cm:categories>
</cm:category_root>
</view:view>
</view:view>

View File

@@ -1,10 +1,9 @@
<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0"
xmlns:cm="http://www.alfresco.org/model/content/1.0"
xmlns:app="http://www.alfresco.org/model/application/1.0">
xmlns:cm="http://www.alfresco.org/model/content/1.0"
xmlns:app="http://www.alfresco.org/model/application/1.0">
<!-- NOTE: all replaced properties referenced from repository.properties file must also be
mapped in the bootstrap-context.xml spacesBootstrap/configuration section -->
mapped in the bootstrap-context.xml spacesBootstrap/configuration section -->
<cm:folder view:childName="${spaces.company_home.childname}">
<view:acl view:inherit="false">
<view:ace view:access="ALLOWED">

View File

@@ -2,18 +2,32 @@
xmlns:cm="http://www.alfresco.org/model/content/1.0"
xmlns:sys="http://www.alfresco.org/model/system/1.0"
xmlns:app="http://www.alfresco.org/model/application/1.0">
<view:reference view:pathref="${bootstrap.location.path}">
<!-- Apply Read access to Everyone on root node of Spaces Store -->
<view:acl>
<view:ace view:access="ALLOWED">
<view:authority>GROUP_EVERYONE</view:authority>
<view:permission>Read</view:permission>
<view:ace view:access="ALLOWED">
<view:authority>GROUP_EVERYONE</view:authority>
<view:permission>Read</view:permission>
</view:ace>
</view:acl>
<!-- Apply Read access to Guest on root node of Spaces Store -->
<view:acl>
<view:ace view:access="ALLOWED">
<view:authority>guest</view:authority>
<view:permission>Read</view:permission>
</view:ace>
</view:acl>
</view:reference>
<sys:container view:childName="${system.system_container.childname}">
<!-- Apply Read access to Everyone on sys:system node -->
<view:acl view:inherit="false">
<view:ace view:access="ALLOWED">
<view:authority>GROUP_EVERYONE</view:authority>
<view:permission>Read</view:permission>
</view:ace>
</view:acl>
<sys:children>
<sys:container view:childName="${system.people_container.childname}">
<sys:children>