Merged V2.2 to HEAD

7629: QName Refactor Merge 6 of 9
   7630: QName Refactor Merge 7 of 9
   7631: QName Refactor Merge 8 of 9
   7632: QName Refactor Merge 9 of 9


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 19:11:36 +00:00
parent 00e81c0d66
commit d389ff1936
30 changed files with 805 additions and 746 deletions

View File

@@ -2,7 +2,7 @@
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<bean id="PatchService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.repo.admin.patch.PatchService</value>
@@ -871,28 +871,6 @@
</property>
</bean>
<bean id="patch.db-V2.1-FKIndexes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.1-FKIndexes</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>63</value></property>
<property name="targetSchema"><value>64</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-FKIndexes.sql</value>
</property>
</bean>
<bean id="patch.db-V2.1-ExplicitIndexes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.1-ExplicitIndexes</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>63</value></property>
<property name="targetSchema"><value>64</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-ExplicitIndexes.sql</value>
</property>
</bean>
<bean id="patch.db-V2.1-VersionColumns2" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.1-VersionColumns2</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -1102,22 +1080,6 @@
</list>
</property>
</bean>
<bean id="patch.db-V1.4-PerfIndexes02" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V1.4-PerfIndexes02</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>110</value></property>
<property name="targetSchema"><value>111</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-PerfIndexes02.sql</value>
</property>
<!-- dependent on upgrade script 1.4-2 having being run -->
<property name="dependsOn" >
<list>
<ref bean="patch.schemaUpdateScript-V1.4-2" />
</list>
</property>
</bean>
<bean id="patch.avmFormPropertyIdentifier" class="org.alfresco.repo.admin.patch.impl.AVMFormsPropertyTokenisationPatch" parent="basePatch" >
<property name="id"><value>patch.avmFormPropertyIdentifier</value></property>
@@ -1252,7 +1214,6 @@
</list>
</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>
@@ -1303,4 +1264,80 @@
</property>
</bean>
</beans>
<bean id="patch.db-V2.2-QNames-0-CreateMissingTables" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-QNames-0-CreateMissingTables</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-0-create-missing-tables.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-ACL" />
</list>
</property>
</bean>
<bean id="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-QNames-1-DropIndexesAndConstraints</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-1-drop-indexes-and-constraints.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-QNames-0-CreateMissingTables" />
</list>
</property>
</bean>
<bean id="patch.db-V2.2-QNames-2-MoveQNames" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-QNames-2-MoveQNames</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-2-move-qnames.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-QNames-1-DropIndexesAndConstraints" />
</list>
</property>
</bean>
<bean id="patch.db-V2.2-QNames-3-PropTypes" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-QNames-3-PropTypes</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-3-proptypes.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-QNames-2-MoveQNames" />
</list>
</property>
</bean>
<bean id="patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-4-extra-indexes-and-constraints.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-QNames-3-PropTypes" />
</list>
</property>
</bean>
</beans>