Merged V2.2 to HEAD

8033: Merged V2.1 to V2.2
      7728: Fix and patch for WCM-893 - now only users explicitly invited to a Web Project can see it in the web-client
      7954: Missing file from CHK-2018 - Fix and patch for WCM-893
   8042: Fixed AWC-1588: Exception message for unsupported target mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-07 04:11:23 +00:00
parent 0ec2646938
commit f8d2a5d084
5 changed files with 136 additions and 13 deletions

View File

@@ -1339,8 +1339,8 @@
</list>
</property>
</bean>
<bean id="patch.wcmPermissionPatch" class="org.alfresco.repo.admin.patch.impl.WCMPermissionPatch" parent="basePatch" >
<bean id="patch.wcmPermissionPatch" class="org.alfresco.repo.admin.patch.impl.WCMPermissionPatch" parent="basePatch" >
<property name="id"><value>patch.wcmPermissionPatch</value></property>
<property name="description"><value>patch.wcmPermissionPatch.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
@@ -1348,13 +1348,36 @@
<property name="targetSchema"><value>122</value></property>
<!-- helper beans -->
<property name="avmService">
<ref bean="avmService" />
</property>
<property name="permissionService">
<ref bean="permissionService" />
</property>
<property name="avmSnapShotTriggeredIndexingMethodInterceptor">
<ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
</property>
<ref bean="avmService" />
</property>
<property name="permissionService">
<ref bean="permissionService" />
</property>
<property name="avmSnapShotTriggeredIndexingMethodInterceptor">
<ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
</property>
</bean>
<bean id="patch.avmWebProjectInheritPermissions" class="org.alfresco.repo.admin.patch.impl.AVMWebProjectInheritPermissionsPatch" parent="basePatch">
<property name="id"><value>patch.avmWebProjectInheritPermissions</value></property>
<property name="description"><value>patch.avmWebProjectInheritPermissions.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>122</value></property>
<property name="targetSchema"><value>123</value></property>
<property name="spacesImporterBootstrap">
<ref bean="spacesBootstrap" />
</property>
<property name="indexerAndSearcher">
<ref bean="indexerAndSearcherFactory" />
</property>
<property name="permissionService">
<ref bean="permissionService"/>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.wcmPermissionPatch" />
</list>
</property>
</bean>
</beans>