From c321d8d89ce0237604d09d5637a288c5c710c6a7 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 7 Jul 2012 07:25:52 +0000
Subject: [PATCH] =?UTF-8?q?Weitere=20Erg=C3=A4nzungen=20Upgrade=20(fehlt?=
 =?UTF-8?q?=20nur=20in=20Trunk)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1758 8810af33-2d31-482b-a856-94f89814c4df
---
 .../src/ccm-cms-publicpersonalprofile.upgrade |  3 +-
 .../PublicPersonalProfileBundleCreate.java    |  8 -----
 ...ublicPersonalProfileOwnerAssocUpgrade.java | 10 +-----
 .../PublicPersonalProfileUpgrade662to663.java | 32 +++++++++++++++++++
 4 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileUpgrade662to663.java

diff --git a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
index 25c4d7365..66af5ef86 100644
--- a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
+++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
@@ -5,7 +5,6 @@
     </version>
     <!-- Applicable for UHB only!  -->
     <version from="6.6.2" to="6.6.3">
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicPersonalProfileBundleCreate"/>
-        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicPersonalProfileOwnerAssocUpgrade"/>
+        <script class="com.arsdigita.cms.contenttypes.upgrades.PublicPersonalProfileUpgrade662to563"/>        
     </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileBundleCreate.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileBundleCreate.java
index 3ffedcec2..35f90d0fa 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileBundleCreate.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileBundleCreate.java
@@ -9,14 +9,6 @@ import com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle;
  */
 public class PublicPersonalProfileBundleCreate extends AbstractBundleUpgrade {
 
-    public PublicPersonalProfileBundleCreate() {
-        super("PublicPersonalProfileBundleCreate", "1.0.0", "");
-    }
-
-    public static void main(final String[] args) {
-        new PublicPersonalProfileBundleCreate().run(args);
-    }
-
     @Override
     protected String getBundleTableName() {
         return "ct_public_personal_profile_bundles";
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileOwnerAssocUpgrade.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileOwnerAssocUpgrade.java
index fefb51f20..80859db2f 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileOwnerAssocUpgrade.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileOwnerAssocUpgrade.java
@@ -9,15 +9,7 @@ import java.util.Map;
  * @version $Id$
  */
 public class PublicPersonalProfileOwnerAssocUpgrade extends AbstractAssocUpgrade {
-    
-    public PublicPersonalProfileOwnerAssocUpgrade() {
-        super("PublicPersonalProfileOwnerAssocUpgrade", "1.0.0", "");
-    }
-    
-    public static void main(final String[] args) {
-        new PublicPersonalProfileOwnerAssocUpgrade().run(args);
-    }
-
+       
     @Override
     protected String getTableName() {
         return "ct_public_personal_profile_owner_map";
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileUpgrade662to663.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileUpgrade662to663.java
new file mode 100644
index 000000000..6f131c4f8
--- /dev/null
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/upgrades/PublicPersonalProfileUpgrade662to663.java
@@ -0,0 +1,32 @@
+package com.arsdigita.cms.contenttypes.upgrades;
+
+import com.arsdigita.cms.contenttypes.XMLContentTypeHandler;
+import com.arsdigita.util.cmd.Program;
+import com.arsdigita.xml.XML;
+import org.apache.commons.cli.CommandLine;
+
+/**
+ *
+ * @author Jens Pelzetter <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class PublicPersonalProfileUpgrade662to663 extends Program {
+
+    public PublicPersonalProfileUpgrade662to663() {
+        super("PublicPersonalProfileBundleUpgrade662to663", "1.0.0", "", true, true);
+    }
+
+    @Override
+    protected void doRun(final CommandLine cmdLine) {
+        new PublicPersonalProfileBundleCreate().doUpgrade();
+        new PublicPersonalProfileOwnerAssocUpgrade().doUpgrade();
+        
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml", handler);
+    }
+
+    public static void main(final String[] args) {
+        new PublicPersonalProfileUpgrade662to663().run(args);
+    }
+
+}