From 2fc2331607a05a4434e2cbe1c9b2ceed6ecd6dec Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 12 Aug 2014 16:02:50 +0000
Subject: [PATCH] Final step of renaming ccm-cms-types-organization to
 ccm-ldn-types-organization

git-svn-id: https://svn.libreccm.org/ccm/trunk@2805 8810af33-2d31-482b-a856-94f89814c4df
---
 .../oracle-se-create.sql                      |  0
 .../postgres-create.sql                       |  0
 .../6.6.0-6.6.1/rename_to_ldn_orga.sql        |  0
 .../upgrade/oracle-se-6.6.0-6.6.1.sql         |  0
 .../upgrade/postgres-6.6.0-6.6.1.sql          |  0
 .../cms/contenttypes/ldn/Organization.xml     |  2 +-
 .../src/ccm-ldn-types-organization.load       |  6 +--
 .../cms/contenttypes/ldn/Organization.java    |  2 +-
 .../ldn/OrganizationInitializer.java          |  2 +-
 .../contenttypes/ldn/OrganizationLoader.java  |  2 +-
 .../util/OrganizationGlobalizationUtil.java   |  2 +-
 .../arsdigita/cms/contenttypes/SciProject.xml | 40 +++++++++----------
 12 files changed, 28 insertions(+), 28 deletions(-)
 rename ccm-ldn-types-organization/sql/{ccm-cms-types-organization => ccm-ldn-types-organization}/oracle-se-create.sql (100%)
 rename ccm-ldn-types-organization/sql/{ccm-cms-types-organization => ccm-ldn-types-organization}/postgres-create.sql (100%)
 rename ccm-ldn-types-organization/sql/{ccm-cms-types-organization => ccm-ldn-types-organization}/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql (100%)
 rename ccm-ldn-types-organization/sql/{ccm-cms-types-organization => ccm-ldn-types-organization}/upgrade/oracle-se-6.6.0-6.6.1.sql (100%)
 rename ccm-ldn-types-organization/sql/{ccm-cms-types-organization => ccm-ldn-types-organization}/upgrade/postgres-6.6.0-6.6.1.sql (100%)

diff --git a/ccm-ldn-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/oracle-se-create.sql
similarity index 100%
rename from ccm-ldn-types-organization/sql/ccm-cms-types-organization/oracle-se-create.sql
rename to ccm-ldn-types-organization/sql/ccm-ldn-types-organization/oracle-se-create.sql
diff --git a/ccm-ldn-types-organization/sql/ccm-cms-types-organization/postgres-create.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/postgres-create.sql
similarity index 100%
rename from ccm-ldn-types-organization/sql/ccm-cms-types-organization/postgres-create.sql
rename to ccm-ldn-types-organization/sql/ccm-ldn-types-organization/postgres-create.sql
diff --git a/ccm-ldn-types-organization/sql/ccm-cms-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
similarity index 100%
rename from ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
rename to ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/default/6.6.0-6.6.1/rename_to_ldn_orga.sql
diff --git a/ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
rename to ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/oracle-se-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-types-organization/sql/ccm-cms-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
rename to ccm-ldn-types-organization/sql/ccm-ldn-types-organization/upgrade/postgres-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml b/ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
index 3b3e62822..b8e692152 100755
--- a/ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
+++ b/ccm-ldn-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml
@@ -19,7 +19,7 @@
 
             <ctd:authoring-step
                 labelKey="organization.authoring.logo_image.title" 
-                labelBundle="com.arsdigita.cms.ldn.contenttypes.OrganizationResources"
+                labelBundle="com.arsdigita.cms.contenttypes.ldn.OrganizationResources"
                 descriptionKey="organization.authoring.logo_image.description" 
                 descriptionBundle="com.arsdigita.cms.contenttypes.ldn.OrganizationResources"
                 component="com.arsdigita.cms.contenttypes.ldn.ui.OrganizationImageStep" 
diff --git a/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
index e9e4e26a5..d2ed92a9e 100755
--- a/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
+++ b/ccm-ldn-types-organization/src/ccm-ldn-types-organization.load
@@ -7,10 +7,10 @@
   </requires>
   <provides>
     <table name="ct_organization"/>
-    <initializer class="com.arsdigita.cms.contenttypes.OrganizationInitializer"/>
+    <initializer class="com.arsdigita.cms.contenttypes.ldn.OrganizationInitializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-cms-types-organization"/>
-    <data class="com.arsdigita.cms.contenttypes.OrganizationLoader"/>
+    <schema directory="ccm-ldn-types-organization"/>
+    <data class="com.arsdigita.cms.contenttypes.ldn.OrganizationLoader"/>
   </scripts>
 </load>
diff --git a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
index 60655d108..13a00c294 100755
--- a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
+++ b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/Organization.java
@@ -44,7 +44,7 @@ public class Organization extends ContentPage {
 
     /** Data object type for tihs domain object */
     public static final String BASE_DATA_OBJECT_TYPE = 
-                              "com.arsdigita.cms.contenttypes.Organization";
+                              "com.arsdigita.cms.contenttypes.ldn.Organization";
 
     public Organization () {
         super(BASE_DATA_OBJECT_TYPE);
diff --git a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
index 88826af83..ea7a8a65d 100755
--- a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
+++ b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationInitializer.java
@@ -43,7 +43,7 @@ public class OrganizationInitializer extends ContentTypeInitializer {
      * Constructor, sets the PDL manifest file and object type string.
      */
     public OrganizationInitializer() {
-        super("ccm-cms-types-organization.pdl.mf",
+        super("ccm-ldn-types-organization.pdl.mf",
               Organization.BASE_DATA_OBJECT_TYPE);
     }
 
diff --git a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
index 02ecd882c..050de088c 100755
--- a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
+++ b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/OrganizationLoader.java
@@ -31,7 +31,7 @@ import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader;
 public class OrganizationLoader extends AbstractContentTypeLoader {
 
     private static final String[] TYPES = {
-        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Organization.xml"
+        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ldn/Organization.xml"
     };
 
     public String[] getTypes() {
diff --git a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
index 1c43523ae..750483887 100755
--- a/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
+++ b/ccm-ldn-types-organization/src/com/arsdigita/cms/contenttypes/ldn/util/OrganizationGlobalizationUtil.java
@@ -34,7 +34,7 @@ public class OrganizationGlobalizationUtil implements Globalized {
     
     /**  Name of Java resource files to handle CMS's globalisation.  */
     final public static String BUNDLE_NAME = 
-                        "com.arsdigita.cms.contenttypes.OrganizationResources";
+                        "com.arsdigita.cms.contenttypes.ldn.OrganizationResources";
 
     /**
      * This returns a globalized message using the package specific bundle,
diff --git a/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml b/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
index daecea4ac..7ad7433d4 100644
--- a/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
+++ b/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
@@ -5,34 +5,34 @@
                    xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd">
                        
     <ctd:content-type
-      label="SciProject"
-      description="Projects of scientific organizations."
-      objectType="com.arsdigita.cms.contenttypes.SciProject"
-      classname="com.arsdigita.cms.contenttypes.SciProject">
+        label="SciProject"
+        description="Projects of scientific organizations."
+        objectType="com.arsdigita.cms.contenttypes.SciProject"
+        classname="com.arsdigita.cms.contenttypes.SciProject">
           
         <ctd:authoring-kit createComponent="com.arsdigita.cms.contenttypes.ui.SciProjectCreate">
             
             <ctd:authoring-step
-	      labelKey="sciorganization.ui.project_properties.title"
-	      labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
-	      descriptionKey="sciorganization.ui.project_properties.title"
-	      descriptionBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
-	      component="com.arsdigita.cms.contenttypes.ui.SciProjectPropertiesStep"
-	      ordering="1"/>
+                labelKey="sciorganization.ui.project_properties.title"
+                labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
+                descriptionKey="sciorganization.ui.project_properties.title"
+                descriptionBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
+                component="com.arsdigita.cms.contenttypes.ui.SciProjectPropertiesStep"
+                ordering="1"/>
               
             <ctd:authoring-step
-	      labelKey="sciorganization.ui.project.members"
-	      labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
-	      descriptionKey="sciorganization.ui.project.members.description"
-	      component="com.arsdigita.cms.contenttypes.SciProjectMembersStep"
-	      ordering="2"/>
+                labelKey="sciorganization.ui.project.members"
+                labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
+                descriptionKey="sciorganization.ui.project.members.description"
+                component="com.arsdigita.cms.contenttypes.ui.SciProjectMembersStep"
+                ordering="2"/>
               
             <ctd:authoring-step
-	      labelKey="sciorganization.ui.project_description.title"
-	      labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
-	      descriptionKey="sciorganization.ui.project_description.title"
-	      component="com.arsdigita.cms.contenttypes.SciProjectDescriptionStep"
-	      ordering="3"/>
+                labelKey="sciorganization.ui.project_description.title"
+                labelBundle="com.arsdigita.cms.contenttypes.SciProjectResources"
+                descriptionKey="sciorganization.ui.project_description.title"
+                component="com.arsdigita.cms.contenttypes.ui.SciProjectDescriptionStep"
+                ordering="3"/>
               
             <ctd:include href="/WEB-INF/content-types/assign-categories-step.xml"/>