Merged V2.2 to HEAD

7575: Permission changes for AVM. 7577: Incorporated most of the feedback provided by Kevin C earlier today 7578: Removed directory not removed by patch 7579: EmailServer bug fixes AR-1902: Double posts when emailing to a document AR-1904: Attachments via email should be allowed on forum posts AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments 7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-07-24 17:32:48 +00:00 · 2008-03-06 14:43:55 +00:00
parent a9fac10b45
commit a49bfd311d
89 changed files with 21301 additions and 11139 deletions
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -4,15 +4,15 @@
 <beans>

    <bean id="PatchService" class="org.springframework.aop.framework.ProxyFactoryBean">
-    	<property name="proxyInterfaces">
-    		<value>org.alfresco.repo.admin.patch.PatchService</value>
-    	</property>
-    	<property name="target"><ref bean="patchComponent"/></property>
-    	<property name="interceptorNames">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.repo.admin.patch.PatchService</value>
+        </property>
+        <property name="target"><ref bean="patchComponent"/></property>
+        <property name="interceptorNames">
            <list>
                <idref local="PatchService_transaction" />
-    		</list>
-    	</property>
+            </list>
+        </property>
    </bean>

    <bean id="PatchService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
@@ -572,7 +572,7 @@
            </props>
        </property>
    </bean>
-	
+    
    <bean id="patch.LinkNodeFileExtension" class="org.alfresco.repo.admin.patch.impl.LinkNodeFileExtensionPatch" parent="basePatch" >
        <property name="id"><value>patch.LinkNodeFileExtension</value></property>
        <property name="description"><value>patch.linkNodeExtension.description</value></property>
@@ -608,8 +608,8 @@
            </props>
        </property>
    </bean>
-	
-	<bean id="patch.userAndPersonUserNamesAsIdentifiers" class="org.alfresco.repo.admin.patch.impl.UserAndPersonTokenisationPatch" parent="basePatch" >
+    
+    <bean id="patch.userAndPersonUserNamesAsIdentifiers" class="org.alfresco.repo.admin.patch.impl.UserAndPersonTokenisationPatch" parent="basePatch" >
        <property name="id"><value>patch.userAndPersonUserNamesAsIdentifiers</value></property>
        <property name="description"><value>patch.userAndPersonUserNamesAsIdentifiers.description</value></property>
        <property name="fixesFromSchema"><value>0</value></property>
@@ -619,10 +619,10 @@
        <property name="userImporterBootstrap">
            <ref bean="userBootstrap" />
        </property>
-		  <property name="spacesImporterBootstrap">
+          <property name="spacesImporterBootstrap">
            <ref bean="spacesBootstrap" />
        </property>
-		  <property name="indexerAndSearcher">
+          <property name="indexerAndSearcher">
            <ref bean="indexerAndSearcherFactory" />
        </property>
    </bean>
@@ -660,7 +660,7 @@
            <value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-NotNullColumns.sql</value>
        </property>
    </bean>
-	
+    
    <bean id="patch.groupNamesAsIdentifiers" class="org.alfresco.repo.admin.patch.impl.GroupTokenisationPatch" parent="basePatch" >
        <property name="id"><value>patch.groupNamesAsIdentifiers</value></property>
        <property name="description"><value>patch.groupNamesAsIdentifiers.description</value></property>
@@ -675,8 +675,8 @@
            <ref bean="indexerAndSearcherFactory" />
        </property>
    </bean>
-	
-	<bean id="patch.invalidUserPersonAndGroup" class="org.alfresco.repo.admin.patch.impl.InvalidUserPersonAndGroupPatch" parent="basePatch" >
+    
+    <bean id="patch.invalidUserPersonAndGroup" class="org.alfresco.repo.admin.patch.impl.InvalidUserPersonAndGroupPatch" parent="basePatch" >
        <property name="id"><value>patch.invalidUserPersonAndGroup</value></property>
        <property name="description"><value>patch.invalidUserPersonAndGroup.description</value></property>
        <property name="fixesFromSchema"><value>0</value></property>
@@ -686,10 +686,10 @@
        <property name="userImporterBootstrap">
            <ref bean="userBootstrap" />
        </property>
-		<property name="spacesImporterBootstrap">
+        <property name="spacesImporterBootstrap">
            <ref bean="spacesBootstrap" />
        </property>
-		<property name="dictionaryService">
+        <property name="dictionaryService">
            <ref bean="dictionaryService" />
        </property>
    </bean>
@@ -752,7 +752,7 @@
        </property>
    </bean>

-	<bean id="patch.groupMembersAsIdentifiers" class="org.alfresco.repo.admin.patch.impl.GroupTokenisationPatch" parent="basePatch" >
+    <bean id="patch.groupMembersAsIdentifiers" class="org.alfresco.repo.admin.patch.impl.GroupTokenisationPatch" parent="basePatch" >
        <property name="id"><value>patch.groupMembersAsIdentifiers</value></property>
        <property name="description"><value>patch.groupMembersAsIdentifiers.description</value></property>
        <property name="fixesFromSchema"><value>0</value></property>
@@ -1247,4 +1247,54 @@
        </property>
    </bean>
    
+    <bean id="patch.db-V2.2-ACL" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V2.2-ACL</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>119</value></property>
+        <property name="targetSchema"><value>120</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-2.2-ACL.sql</value>
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.1-NotNullColumns" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="patch.updateAvmPermissionData" class="org.alfresco.repo.admin.patch.impl.AVMPermissionDataPatch" parent="basePatch" >
+        <property name="id"><value>patch.updateAvmPermissionData</value></property>
+        <property name="description"><value>patch.updateAvmPermissionData.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>119</value></property>
+        <property name="targetSchema"><value>120</value></property>
+        <!-- helper beans -->
+        <property name="sessionFactory">
+            <ref bean="sessionFactory" />
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.db-V2.2-ACL" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="patch.updateAvmPermissions" class="org.alfresco.repo.admin.patch.impl.AVMPermissionsPatch" parent="basePatch" >
+        <property name="id"><value>patch.updateAvmPermissions</value></property>
+        <property name="description"><value>patch.updateAvmPermissions.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>119</value></property>
+        <property name="targetSchema"><value>120</value></property>
+        <!-- helper beans -->
+        <property name="accessControlListDao">
+            <ref bean="avmACLDAO" />
+        </property>
+        <property name="dependsOn" >
+            <list>
+                <ref bean="patch.updateAvmPermissionData" />
+            </list>
+        </property>
+    </bean>
+    
 </beans>