From eb6477bb48445eaea81aee52b5539b43eecd528a Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 28 Aug 2010 11:26:33 +0000 Subject: [PATCH] load-bundle mit ccm-sci-publications funktioniert jetzt. git-svn-id: https://svn.libreccm.org/ccm/trunk@519 8810af33-2d31-482b-a856-94f89814c4df --- ccm-sci-publications/application.xml | 1 - .../cms/contenttypes/ArticleInCollectedVolume.xml | 2 +- .../arsdigita/cms/contenttypes/ArticleInJournal.xml | 2 +- .../arsdigita/cms/contenttypes/CollectedVolume.xml | 2 +- .../com/arsdigita/cms/contenttypes/Expertise.xml | 2 +- .../com/arsdigita/cms/contenttypes/GreyLiterature.xml | 2 +- .../{InProccedings.xml => InProceedings.xml} | 2 +- .../arsdigita/cms/contenttypes/InternetArticle.xml | 2 +- .../com/arsdigita/cms/contenttypes/Monograph.xml | 2 +- .../com/arsdigita/cms/contenttypes/Publication.xml | 2 +- .../cms/contenttypes/PublicationWithPublisher.xml | 2 +- .../com/arsdigita/cms/contenttypes/Publisher.xml | 2 +- .../com/arsdigita/cms/contenttypes/Review.xml | 2 +- .../com/arsdigita/cms/contenttypes/Series.xml | 2 +- .../com/arsdigita/cms/contenttypes/UnPublished.xml | 2 +- .../com/arsdigita/cms/contenttypes/WorkingPaper.xml | 2 +- .../ArticleInCollectedVolumeInitializer.java | 10 ++++++++-- .../cms/contenttypes/ArticleInJournalInitializer.java | 10 ++++++++-- .../cms/contenttypes/CollectedVolumeInitializer.java | 8 +++++++- .../cms/contenttypes/ExpertiseInitializer.java | 10 ++++++++-- .../cms/contenttypes/GreyLiteratureInitializer.java | 10 ++++++++-- .../cms/contenttypes/InProceedingsInitializer.java | 10 ++++++++-- .../cms/contenttypes/InternetArticleInitializer.java | 10 ++++++++-- .../cms/contenttypes/MonographInitializer.java | 10 ++++++++-- .../cms/contenttypes/PublicationInitializer.java | 2 +- .../PublicationWithPublisherInitializer.java | 8 +++++++- .../cms/contenttypes/PublisherInitializer.java | 11 +++++++++-- .../arsdigita/cms/contenttypes/ReviewInitializer.java | 10 ++++++++-- .../arsdigita/cms/contenttypes/SeriesInitializer.java | 8 +++++++- .../cms/contenttypes/UnPublishedInitializer.java | 10 ++++++++-- .../cms/contenttypes/WorkingPaperInitializer.java | 10 ++++++++-- 31 files changed, 126 insertions(+), 42 deletions(-) rename ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/{InProccedings.xml => InProceedings.xml} (93%) diff --git a/ccm-sci-publications/application.xml b/ccm-sci-publications/application.xml index 5a331ec7e..7d2e5839e 100644 --- a/ccm-sci-publications/application.xml +++ b/ccm-sci-publications/application.xml @@ -8,7 +8,6 @@ - diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml index 9780d5c66..cb71e8594 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.ArticleInCollectedVolumePropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml index d9f917874..f28a91ae6 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/ArticleInJournal.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.ArticleInJournalPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml index 1f9b8b5c4..0221c6ec2 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/CollectedVolume.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.CollectedVolumePropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml index 2ea68644c..3faf4a6ee 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Expertise.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.ExpertisePropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml index 5783e866f..34ea964f3 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/GreyLiterature.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.GreyLiteraturePropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProccedings.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml similarity index 93% rename from ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProccedings.xml rename to ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml index af6aa09c1..2cea20a14 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProccedings.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InProceedings.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.InProceedingsPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml index 76191527a..0573086b2 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/InternetArticle.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.internetArticlePropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml index e21387261..69bb45d89 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.MonographPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml index e7fae4ddd..bf52853c6 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publication.xml @@ -21,7 +21,7 @@ component="com.arsdigita.cms.contenttypes.ui.PublicationPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml index 71448e811..32b98a634 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml @@ -21,7 +21,7 @@ component="com.arsdigita.cms.contenttypes.ui.PublicationWithPublisherPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml index 770cbccb1..aad1052a0 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Publisher.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.PublisherPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml index e98fadfb4..105313aa9 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Review.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.ReviewPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml index 44d39be59..312586025 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Series.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.SeriesPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml index f851e849c..31aafb144 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/UnPublished.xml @@ -21,7 +21,7 @@ component="com.arsdigita.cms.contenttypes.ui.UnPublishedPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml index 822eb8324..4f3a857c0 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/WorkingPaper.xml @@ -20,7 +20,7 @@ component="com.arsdigita.cms.contenttypes.ui.WorkingPaperPropertiesStep" ordering="1"/> - + diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java index 697041d25..749361f53 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class ArticleInCollectedVolumeInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public ArticleInCollectedVolumeInitializer() { - super("ccm-sci-publications.pdl.mf", ArticleInCollectedVolume.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", ArticleInCollectedVolume.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class ArticleInCollectedVolumeInitializer extends ContentTypeInitializer @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInJournalInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInJournalInitializer.java index 8eba3d995..9abbdbdae 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInJournalInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInJournalInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class ArticleInJournalInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public ArticleInJournalInitializer() { - super("ccm-sci-publications.pdl.mf", ArticleInJournal.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", ArticleInJournal.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class ArticleInJournalInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInJournal.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/CollectedVolumeInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/CollectedVolumeInitializer.java index bc846659f..089de508b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/CollectedVolumeInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/CollectedVolumeInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class CollectedVolumeInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public CollectedVolumeInitializer() { - super("ccm-sci-publications.pdl.mf", CollectedVolume.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", CollectedVolume.BASE_DATA_OBJECT_TYPE); } @Override diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseInitializer.java index 541794dfe..33c3e39e9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ExpertiseInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class ExpertiseInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public ExpertiseInitializer() { - super("ccm-sci-publications.pdl.mf", Expertise.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", Expertise.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class ExpertiseInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Expertise.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/GreyLiteratureInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/GreyLiteratureInitializer.java index de214a236..4f5acbef7 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/GreyLiteratureInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/GreyLiteratureInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class GreyLiteratureInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public GreyLiteratureInitializer() { - super("ccm-sci-publications.pdl.mf", GreyLiterature.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", GreyLiterature.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class GreyLiteratureInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/GreyLiterature.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java index 9722a3b66..abca5db22 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class InProceedingsInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public InProceedingsInitializer() { - super("ccm-sci-publications.pdl.mf", InProceedings.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", InProceedings.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class InProceedingsInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleInitializer.java index db430bf97..5b336d6cb 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InternetArticleInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class InternetArticleInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public InternetArticleInitializer() { - super("ccm-sci-publications.pdl.mf", InternetArticle.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", InternetArticle.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class InternetArticleInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InternetArticle.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/MonographInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/MonographInitializer.java index 25bf97111..0856172f2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/MonographInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/MonographInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class MonographInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public MonographInitializer() { - super("ccm-sci-publications.pdl.mf", Monograph.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", Monograph.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class MonographInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Monograph.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java index d90b80c91..0c7f10174 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java @@ -5,7 +5,7 @@ package com.arsdigita.cms.contenttypes; * @author Jens Pelzetter */ public class PublicationInitializer extends ContentTypeInitializer { - + public PublicationInitializer() { super("ccm-sci-publications.pdl.mf", Publication.BASE_DATA_OBJECT_TYPE); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationWithPublisherInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationWithPublisherInitializer.java index e5e0be64d..f36e8b6e8 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationWithPublisherInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationWithPublisherInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class PublicationWithPublisherInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public PublicationWithPublisherInitializer() { - super("ccm-sci-publications.pdl.mf", PublicationWithPublisher.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", PublicationWithPublisher.BASE_DATA_OBJECT_TYPE); } @Override diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublisherInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublisherInitializer.java index 850663aa0..b56313846 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublisherInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublisherInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class PublisherInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public PublisherInitializer() { - super("ccm-sci-publications.pdl.mf", Publisher.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", Publisher.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,8 @@ public class PublisherInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publisher.xml"; + //return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publisher.xml"; + return ""; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ReviewInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ReviewInitializer.java index 5133a3252..2a4772f01 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ReviewInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ReviewInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class ReviewInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public ReviewInitializer() { - super("ccm-sci-publications.pdl.mf", Review.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", Review.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class ReviewInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Review.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesInitializer.java index b3cd97566..7aa3091be 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/SeriesInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class SeriesInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public SeriesInitializer() { - super("ccm-sci-publications.pdl.mf", Series.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", Series.BASE_DATA_OBJECT_TYPE); } @Override diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedInitializer.java index c1127c716..f25713fe8 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/UnPublishedInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class UnPublishedInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public UnPublishedInitializer() { - super("ccm-sci-publications.pdl.mf", UnPublished.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", UnPublished.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class UnPublishedInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/UnPublished.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java index ecc2018d9..d8ae68ee8 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/WorkingPaperInitializer.java @@ -6,8 +6,14 @@ package com.arsdigita.cms.contenttypes; */ public class WorkingPaperInitializer extends ContentTypeInitializer { + /** + * The pdl.mf file used here is empty, since the + * {@link PublicationInitializer} loads all things using the pdl.mf file + * of the module. Also, it may causes on silly errors in the load-bundle + * step if the same pdl.mf file is used in more than one initializer. + */ public WorkingPaperInitializer() { - super("ccm-sci-publications.pdl.mf", WorkingPaper.BASE_DATA_OBJECT_TYPE); + super("empty.pdl.mf", WorkingPaper.BASE_DATA_OBJECT_TYPE); } @Override @@ -17,7 +23,7 @@ public class WorkingPaperInitializer extends ContentTypeInitializer { @Override public String getTraversalXML() { - return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/WorkingPaper.xml"; + return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Publication.xml"; } }