From 7a522e4b885d8627aaf09f1754ee3da1e5104a5c Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 10 Sep 2007 23:04:39 +0000 Subject: [PATCH] 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 --- config/alfresco/bootstrap-context.xml | 1 + ...emaUpdate-2.1-RemoveWcmSubmittedAspect.sql | 27 ++++++++++++++++++ ...emaUpdate-2.1-RemoveWcmSubmittedAspect.sql | 28 +++++++++++++++++++ .../alfresco/patch/patch-services-context.xml | 12 ++++++++ config/alfresco/version.properties | 2 +- config/alfresco/workflow/wcmWorkflowModel.xml | 10 ------- 6 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql create mode 100644 config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml index 69668b63c4..253d9b89a8 100644 --- a/config/alfresco/bootstrap-context.xml +++ b/config/alfresco/bootstrap-context.xml @@ -56,6 +56,7 @@ + diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql new file mode 100644 index 0000000000..7113f6e162 --- /dev/null +++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql @@ -0,0 +1,27 @@ +-- +-- Title: Remove wcmwf:submitted Aspect +-- Database: Generic +-- Since: V2.1 Schema 73 +-- Author: Derek Hulley +-- +-- Please contact support@alfresco.com if you need assistance with the upgrade. +-- +-- This removes the wcmwf:submitted aspect along with the wcmwf:workflowInstanceId property +-- from the AVM nodes + +DELETE FROM avm_aspects WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted'; +DELETE FROM avm_aspects_new WHERE name = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted'; +DELETE FROM avm_node_properties WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId'; +DELETE FROM avm_node_properties_new WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId'; + +-- +-- Record script finish +-- +DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-RemoveWcmSubmittedAspect'; +INSERT INTO alf_applied_patch + (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report) + VALUES + ( + 'patch.db-V2.1-RemoveWcmSubmittedAspect', 'Manually executed script upgrade V2.1: Remove wcmwf:submitted aspect', + 0, 72, -1, 73, null, 'UNKOWN', 1, 1, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql new file mode 100644 index 0000000000..2d2b0b3e2f --- /dev/null +++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql @@ -0,0 +1,28 @@ +-- +-- Title: Remove wcmwf:submitted Aspect +-- Database: PostgreSQL +-- Since: V2.1 Schema 73 +-- Author: Derek Hulley +-- +-- Please contact support@alfresco.com if you need assistance with the upgrade. +-- +-- This removes the wcmwf:submitted aspect along with the wcmwf:workflowInstanceId property +-- from the AVM nodes. +-- PostgreSQL requires TRUE for boolean values. + +DELETE FROM avm_aspects WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted'; +DELETE FROM avm_aspects_new WHERE name = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted'; +DELETE FROM avm_node_properties WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId'; +DELETE FROM avm_node_properties_new WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId'; + +-- +-- Record script finish +-- +DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-RemoveWcmSubmittedAspect'; +INSERT INTO alf_applied_patch + (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report) + VALUES + ( + 'patch.db-V2.1-RemoveWcmSubmittedAspect', 'Manually executed script upgrade V2.1: Remove wcmwf:submitted aspect', + 0, 72, -1, 73, null, 'UNKOWN', TRUE, TRUE, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index 11a9089854..57498d449b 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -908,6 +908,7 @@ +<<<<<<< .working patch.customModels patch.customModels.description @@ -989,4 +990,15 @@ + + patch.db-V2.1-RemoveWcmSubmittedAspect + patch.schemaUpgradeScript.description + 0 + 103 + 104 + + classpath:alfresco/dbscripts/upgrade/2.1/${db.script.dialect}/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql + + + diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties index f4ffd4f43f..f88bbe4712 100644 --- a/config/alfresco/version.properties +++ b/config/alfresco/version.properties @@ -19,4 +19,4 @@ version.build=@build-number@ # Schema number -version.schema=103 +version.schema=104 diff --git a/config/alfresco/workflow/wcmWorkflowModel.xml b/config/alfresco/workflow/wcmWorkflowModel.xml index 1065d09e8f..20148b8c36 100644 --- a/config/alfresco/workflow/wcmWorkflowModel.xml +++ b/config/alfresco/workflow/wcmWorkflowModel.xml @@ -285,16 +285,6 @@ - - - - Workflow Instance Id - d:text - true - - - - \ No newline at end of file