mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
DM permissions
http://issues.alfresco.com/browse/SLNG-202 http://issues.alfresco.com/browse/SLNG-203 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -235,18 +235,18 @@
|
||||
<value>org.alfresco.repo.security.permissions.impl.PermissionsDaoComponent</value>
|
||||
</property>
|
||||
<property name="defaultBinding">
|
||||
<ref bean="oldPermissionsDaoComponent"></ref>
|
||||
<ref bean="dmPermissionsDaoComponent"></ref>
|
||||
</property>
|
||||
<property name="redirectedProtocolBindings">
|
||||
<map>
|
||||
<entry key="workspace"><ref bean="oldPermissionsDaoComponent"></ref></entry>
|
||||
<entry key="versionStore"><ref bean="oldPermissionsDaoComponent"></ref></entry>
|
||||
<entry key="avm"><ref bean="newPermissionsDaoComponent"/></entry>
|
||||
<entry key="workspace"><ref bean="dmPermissionsDaoComponent"></ref></entry>
|
||||
<entry key="versionStore"><ref bean="dmPermissionsDaoComponent"></ref></entry>
|
||||
<entry key="avm"><ref bean="avmPermissionsDaoComponent"/></entry>
|
||||
</map>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="newPermissionsDaoComponent" class="org.alfresco.repo.domain.hibernate.PermissionsDaoComponentImpl">
|
||||
<bean id="avmPermissionsDaoComponent" class="org.alfresco.repo.domain.hibernate.PermissionsDaoComponentImpl">
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent" />
|
||||
</property>
|
||||
@@ -261,7 +261,7 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="oldPermissionsDaoComponent" class="org.alfresco.repo.domain.hibernate.OldADMPermissionsDaoComponentImpl">
|
||||
<bean id="dmPermissionsDaoComponent" class="org.alfresco.repo.domain.hibernate.DMPermissionsDaoComponentImpl">
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent" />
|
||||
</property>
|
||||
@@ -288,9 +288,18 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="nodeACLDAO" class="org.alfresco.repo.domain.hibernate.NodeAccessControlListDAO">
|
||||
<bean id="nodeACLDAO" class="org.alfresco.repo.domain.hibernate.DMAccessControlListDAO">
|
||||
<property name="nodeDaoService">
|
||||
<ref bean="nodeDaoService" />
|
||||
</property>
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent"/>
|
||||
</property>
|
||||
<property name="hibernateSessionHelper">
|
||||
<ref bean="hibernateSessionHelper"/>
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
@@ -214,9 +214,9 @@ patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area
|
||||
patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
|
||||
patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
|
||||
|
||||
|
||||
patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
|
||||
patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
|
||||
|
||||
|
||||
patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
|
||||
patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
|
||||
|
||||
|
@@ -179,6 +179,9 @@
|
||||
</property>
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService"/>
|
||||
</property>
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent"/>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="sessionSizeResourceInterceptor" class="org.alfresco.repo.transaction.TransactionResourceInterceptor" >
|
||||
|
@@ -1452,5 +1452,20 @@
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.updateDmPermissions" class="org.alfresco.repo.admin.patch.impl.DmPermissionsPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.updateDmPermissions</value></property>
|
||||
<property name="description"><value>patch.updateDmPermissions.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>124</value></property>
|
||||
<property name="targetSchema"><value>125</value></property>
|
||||
<!-- helper beans -->
|
||||
<property name="accessControlListDao">
|
||||
<ref bean="nodeACLDAO" />
|
||||
</property>
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
@@ -41,7 +41,7 @@
|
||||
|
||||
<bean id="permissionServiceImpl" class="org.alfresco.repo.security.permissions.impl.PermissionServiceImpl">
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService" />
|
||||
<ref bean="dbNodeService" />
|
||||
</property>
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService"/>
|
||||
@@ -136,6 +136,16 @@
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService" />
|
||||
</property>
|
||||
<property name="modelDAO">
|
||||
<ref bean="permissionsModelDAO" />
|
||||
</property>
|
||||
<property name="requiredFor">
|
||||
<list>
|
||||
<value>Unlock</value>
|
||||
<value>CheckIn</value>
|
||||
<value>CancelCheckOut</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- ===================== -->
|
||||
|
@@ -19,4 +19,4 @@ version.build=@build-number@
|
||||
|
||||
# Schema number
|
||||
|
||||
version.schema=124
|
||||
version.schema=125
|
||||
|
Reference in New Issue
Block a user