From 5a1e9023995d48ec8c252af066cd831d67986903 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 19 Aug 2014 13:20:11 +0000
Subject: [PATCH] Some bugfixes for the upgrade script for
 ccm-ldn-types-organization (ex ccm-cms-types-organization)

git-svn-id: https://svn.libreccm.org/ccm/trunk@2819 8810af33-2d31-482b-a856-94f89814c4df
---
 .../default/6.6.0-6.6.1/rename_to_ldn_orga.sql     | 14 +++++++-------
 ccm-sci-bundle/bundles/devel/cfg/project.xml       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
index a6b92dc84..be7ffa8e2 100644
--- a/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
+++ b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
@@ -19,12 +19,12 @@
 ALTER TABLE init_requirements DROP CONSTRAINT init_requirements_init_f_cmmdn ;
 
 UPDATE inits
-   SET classname='com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer'
- WHERE classname='com.arsdigita.cms.contenttypes.OrganizationInitializer'
+   SET class_name='com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer'
+ WHERE class_name='com.arsdigita.cms.contenttypes.OrganizationInitializer';
 
-update init_requirements
-   set init='com.arsdigita.cms.contenttypes.ldn.SimpleOrganiztionInitializer'
- where init='com.arsdigita.cms.contenttypes.OrganizationInitializer' ;
+UPDATE init_requirements
+   SET init='com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer'
+ WHERE init='com.arsdigita.cms.contenttypes.OrganizationInitializer' ;
 
 ALTER TABLE init_requirements
   ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
@@ -40,7 +40,7 @@ UPDATE authoring_steps
    SET    label_bundle='com.arsdigita.cms.contenttypes.ldn.OrganizationResources',
     description_bundle='com.arsdigita.cms.contenttypes.ldn.OrganizationResources',
              component='com.arsdigita.cms.contenttypes.ldn.ui.OrganizationPropertiesStep'
- WHERE component='com.arsdigita.cms.contenttypes.ui.OrganizationPropertiesStep'
+ WHERE component='com.arsdigita.cms.contenttypes.ui.OrganizationPropertiesStep';
 
 UPDATE acs_objects 
    SET (object_type,default_domain_class) =
@@ -65,4 +65,4 @@ UPDATE vcx_tags
     WHERE tagged_oid LIKE '%contenttypes.Organization%';
 
 
-ALTER TABLE ct_organization to ct_ldn_organization;
\ No newline at end of file
+ALTER TABLE ct_organization RENAME TO ct_ldn_organization;
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index 35a294482..dc3138d40 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -9,7 +9,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r2815" 
+                 release="devel-SNAPSHOT-r2816" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="libreccm"