Merged V2.1 to HEAD

6467, 6468: Patch to remove submitted aspect data
         Resolved conflicted state of 'root\projects\repository\config\alfresco\version.properties'
         Resolved conflicted state of 'root\projects\repository\config\alfresco\patch\patch-services-context.xml'
         Version number to 104


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:04:39 +00:00
parent bcfd0ae519
commit 7a522e4b88
6 changed files with 69 additions and 11 deletions

View File

@@ -908,6 +908,7 @@
</property>
</bean>
<<<<<<< .working
<bean id="patch.customModels" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
<property name="id"><value>patch.customModels</value></property>
<property name="description"><value>patch.customModels.description</value></property>
@@ -989,4 +990,15 @@
</property>
</bean>
<bean id="patch.db-V2.1-RemoveWcmSubmittedAspect" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.1-RemoveWcmSubmittedAspect</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>103</value></property>
<property name="targetSchema"><value>104</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql</value>
</property>
</bean>
</beans>