From 4060da2b8e8a0e5ede3194dda0cdecf7b68f9fbe Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 25 Jun 2010 10:34:13 +0000
Subject: [PATCH] Script fixes after merges  - DB2 creates alf_node_properties
 with BLOB  - Moved patch script into dbscripts/upgrade  - Fixed path for
 patch AlfrescoPostCreate-JBPM-Extra.sql (was
 AlfrescoPostCreate-3.3-JBPM-Extra.sql)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/bootstrap-context.xml                         | 1 -
 .../org.hibernate.dialect.Dialect/node-prop-serializable.sql  | 4 ++--
 config/alfresco/patch/patch-services-context.xml              | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename config/alfresco/dbscripts/{create => upgrade/3.3}/org.hibernate.dialect.Dialect/node-prop-serializable.sql (97%)

diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 4420dd5e03..7f9119bda5 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -79,7 +79,6 @@
        <property name="postCreateScriptUrls">
           <list>
              <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoPostCreate-JBPM-Extra.sql</value>
-             <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/node-prop-serializable.sql</value>
           </list>
        </property>
        <property name="validateUpdateScriptPatches">
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/node-prop-serializable.sql b/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.Dialect/node-prop-serializable.sql
similarity index 97%
rename from config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/node-prop-serializable.sql
rename to config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.Dialect/node-prop-serializable.sql
index b0a4564170..5ed510cd48 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.Dialect/node-prop-serializable.sql
+++ b/config/alfresco/dbscripts/upgrade/3.3/org.hibernate.dialect.Dialect/node-prop-serializable.sql
@@ -4,8 +4,8 @@
 -- Since:      V3.3 schema 4014
 -- Author:     janv
 --
--- This patch is only required to fix column on DB2.
-
+-- This patch is only required to fix column on DB2.
+
 --
 -- Record script finish
 --
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index f8753591ec..129d224334 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2249,7 +2249,7 @@
         <property name="fixesToSchema"><value>4105</value></property>
         <property name="targetSchema"><value>4106</value></property>
         <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoPostCreate-3.3-JBPM-Extra.sql</value>
+            <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoPostCreate-JBPM-Extra.sql</value>
         </property>
     </bean>
     
@@ -2260,7 +2260,7 @@
         <property name="fixesToSchema"><value>4105</value></property>
         <property name="targetSchema"><value>4106</value></property>
         <property name="scriptUrl">
-            <value>classpath:alfresco/dbscripts/create/${db.script.dialect}/node-prop-serializable.sql</value>
+            <value>classpath:alfresco/dbscripts/upgrade/3.3/${db.script.dialect}/node-prop-serializable.sql</value>
         </property>
     </bean>