Weitere Ergänzungen an den Upgrades. Unter anderem ist das Neuladen der AuthoringSteps jetzt in die Upgrades integriert.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1756 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/src/com/arsdigita/cms/contenttypes/upgrades/Upgrade664to665.java

@@ -1,6 +1,8 @@
 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;
 
 /**
@@ -24,6 +26,11 @@ public class Upgrade664to665 extends Program {
         new GenericOrgaUnitGenericOrgaUnitAssocUpgrade().doUpgrade();
         new GenericOrgaUnitGenericPersonAssocUpgrade().doUpgrade();
         
+        //Reload authoring steps
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericContact.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GenericPerson.xml", handler);
     }
     
     public static void main(final String[] args) {

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/upgrades/SciPublicationsUpgrade662to663.java

@@ -1,6 +1,8 @@
 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;
 
 /**
@@ -43,6 +45,25 @@ public class SciPublicationsUpgrade662to663 extends Program {
         new SeriesEditorsAssocUpgrade().doUpgrade();
         new SeriesPublicationsAssocUpgrade().doUpgrade();
         new UnPublishedOrganizationAssocUpgrade().doUpgrade();
+        
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ExpertiseBundle", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Journal.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Proceedings.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml", handler);
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml", handler);
+    }
+    
+    public static void main(final String[] args) {
+        new SciPublicationsUpgrade662to663().run(args);
     }
 
 }

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/upgrades/SciDepartmentUpgrade664to665.java

@@ -1,6 +1,8 @@
 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;
 
 /**
@@ -16,7 +18,10 @@ public class SciDepartmentUpgrade664to665 extends Program {
 
     @Override
     protected void doRun(CommandLine cmdLine) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        new SciDepartmentBundleUpgrade().doUpgrade();
+        
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml", handler);
     }
 
     public static void main(final String[] args) {

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/upgrades/SciInstituteUpgrade664to665.java

@@ -1,6 +1,8 @@
 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;
 
 /**
@@ -16,13 +18,14 @@ public class SciInstituteUpgrade664to665 extends Program {
 
     @Override
     protected void doRun(CommandLine cmdLine) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        new SciInstituteBundleUpgrade().doUpgrade();
+
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciInsitute.xml", handler);
     }
 
     public static void main(final String[] args) {
         new SciInstituteUpgrade664to665().run(args);
     }
 
-    
-    
 }

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/upgrades/SciProjectUpgrade665to666.java

@@ -1,6 +1,8 @@
 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;
 
 /**
@@ -16,6 +18,9 @@ public class SciProjectUpgrade665to666 extends Program {
     @Override
     protected void doRun(final CommandLine cmdLine) {
         new SciProjectBundleUpgrade().doUpgrade();
+        
+        XMLContentTypeHandler handler = new XMLContentTypeHandler();
+        XML.parseResource("/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml", handler);
     }
     
     public static void main(final String[] args) {