mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V3.1 to HEAD
13857: Merged V2.2 to V3.1
7028-13041: (Record only) New merge path
13343: (Record onlY) Merged V3.1 to V2.2:
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13363: Fix ETWOTWO-1022 (Virtual website not found - Bad host name)
13386: Fix ETWOTWO-1145: WCM Form web script include is not handling ${} token format
13387: (Record only) Removed dev from version label
13621: (Record only) Merged V3.1 to V2.2
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
Fixes ETWOTWO-1012
13828: ETWOTWO-1171 - checkpoint (alternative patch: resetWCMToGroupBasedPermissions)
13845: ETWOTWO-1171 - alternative patch: resetWCMToGroupBasedPermissions (part 2 of 2 - set layered/shared acls)
13855: Fixed line endings
13856: ETWOTWO-1171 - minor fix: wcmPostPermissionSnapshot patch target schema should be 95
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.2:r7028-12305,12307-12310,12312-12319,12321,...
Merged /alfresco/BRANCHES/V3.1:r13857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -1534,28 +1534,30 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.moveWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.MoveWCMToGroupBasedPermissionsPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.moveWCMToGroupBasedPermissionsPatch</value></property>
|
||||
<property name="description"><value>patch.moveWCMToGroupBasedPermissionsPatch.description</value></property>
|
||||
<bean id="patch.resetWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.resetWCMToGroupBasedPermissionsPatch</value></property>
|
||||
<property name="description"><value>patch.resetWCMToGroupBasedPermissionsPatch.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>2001</value></property>
|
||||
<property name="targetSchema"><value>2002</value></property>
|
||||
<!-- helper beans -->
|
||||
<property name="sessionFactory">
|
||||
<ref bean="sessionFactory" />
|
||||
</property>
|
||||
<property name="avmService">
|
||||
<ref bean="avmService" />
|
||||
</property>
|
||||
<property name="permissionService">
|
||||
<ref bean="permissionService" />
|
||||
</property>
|
||||
<property name="aclDaoComponent">
|
||||
<ref bean="aclDaoComponent" />
|
||||
</property>
|
||||
<property name="avmSnapShotTriggeredIndexingMethodInterceptor">
|
||||
<ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
|
||||
<property name="personService">
|
||||
<ref bean="personService" />
|
||||
</property>
|
||||
<property name="authorityService">
|
||||
<ref bean="authorityService" />
|
||||
</property>
|
||||
<property name="qnameDAO">
|
||||
<ref bean="qnameDAO" />
|
||||
</property>
|
||||
<property name="replaceAllWith">
|
||||
<value>ContentManager</value>
|
||||
</property>
|
||||
@@ -1564,15 +1566,21 @@
|
||||
<ref bean="patch.zonedAuthorities" />
|
||||
</list>
|
||||
</property>
|
||||
<property name="alternatives" >
|
||||
<list>
|
||||
<ref bean="patch.moveWCMToGroupBasedPermissionsPatch" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.wcmPostPermissionSnapshotPatch2" class="org.alfresco.repo.admin.patch.impl.WCMPostPermissionSnapshotPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.wcmPostPermissionSnapshotPatch2</value></property>
|
||||
|
||||
<!-- note: does not need to be run if patch.wcmPostPermissionSnapshotPatch2 already applied -->
|
||||
<bean id="patch.wcmPostPermissionSnapshotPatch3" class="org.alfresco.repo.admin.patch.impl.WCMPostPermissionSnapshotPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.wcmPostPermissionSnapshotPatch3</value></property>
|
||||
<property name="description"><value>patch.wcmPostPermissionSnapshotPatch.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>2001</value></property>
|
||||
<property name="targetSchema"><value>2002</value></property>
|
||||
<!-- helper beans -->
|
||||
|
||||
<property name="avmService">
|
||||
<ref bean="AVMService" />
|
||||
</property>
|
||||
@@ -1584,11 +1592,47 @@
|
||||
</property>
|
||||
<property name="dependsOn" >
|
||||
<list>
|
||||
<ref bean="patch.moveWCMToGroupBasedPermissionsPatch" />
|
||||
<ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
|
||||
</list>
|
||||
</property>
|
||||
<property name="alternatives" >
|
||||
<list>
|
||||
<ref bean="patch.wcmPostPermissionSnapshotPatch2" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- note: NOOP - superceded by patch.resetWCMToGroupBasedPermissionsPatch -->
|
||||
<bean id="patch.moveWCMToGroupBasedPermissionsPatch" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.moveWCMToGroupBasedPermissionsPatch</value></property>
|
||||
<property name="description"><value>patch.noOpPatch.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>2001</value></property>
|
||||
<property name="targetSchema"><value>2002</value></property>
|
||||
|
||||
<property name="dependsOn" >
|
||||
<list>
|
||||
<ref bean="patch.resetWCMToGroupBasedPermissionsPatch" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- note: NOOP - superceded by patch.wcmPostPermissionSnapshotPatch3 -->
|
||||
<bean id="patch.wcmPostPermissionSnapshotPatch2" class="org.alfresco.repo.admin.patch.impl.NoOpPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.wcmPostPermissionSnapshotPatch2</value></property>
|
||||
<property name="description"><value>patch.noOpPatch.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>2001</value></property>
|
||||
<property name="targetSchema"><value>2002</value></property>
|
||||
|
||||
<property name="dependsOn" >
|
||||
<list>
|
||||
<ref bean="patch.wcmPostPermissionSnapshotPatch3" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<!-- Redeploy both direct and indirect submit processes for addition submit failure handling -->
|
||||
<bean id="patch.redeploySubmitProcess6" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.redeploySubmitProcess6</value></property>
|
||||
|
||||
Reference in New Issue
Block a user