From 142a0c6969e49c5a23531c68330689e06c7b0b2c Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 25 Jul 2013 16:09:15 +0000 Subject: [PATCH] Nutzungen des Java-internen ServiceLoaders entfernt, und durch register-Aufrufe in Initializern ersetzt, da die Nutzung des Service-Loaders Probleme mit dem Build-System verursacht. git-svn-id: https://svn.libreccm.org/ccm/trunk@2269 8810af33-2d31-482b-a856-94f89814c4df --- ...a.ui.admin.applications.ApplicationManager | 1 - .../com/arsdigita/bookmarks/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../PublicPersonalProfilesInitializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 3 - .../src/com/arsdigita/cms/Initializer.java | 7 + ...a.ui.admin.applications.ApplicationManager | 3 - .../src/com/arsdigita/ui/Initializer.java | 9 ++ .../com/arsdigita/ui/admin/AdminServlet.java | 13 +- .../ui/admin/ApplicationManagers.java | 70 ++++++++ .../admin/ApplicationsAdministrationTab.java | 27 ++-- ...a.ui.admin.applications.ApplicationManager | 1 - .../src/com/arsdigita/faq/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../src/com/arsdigita/forum/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../arsdigita/london/search/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../arsdigita/london/terms/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../com/arsdigita/navigation/Initializer.java | 4 + .../PublicationTypeAssetInitializer.java | 5 +- .../PublicationTypeAssetLoader.java | 8 +- .../ui/PublicationTypeAssetStep.java | 5 + ...lications.exporter.SciPublicationsExporter | 2 - ...ons.exporter.bibtex.builders.BibTeXBuilder | 7 - ...exporter.bibtex.converters.BibTeXConverter | 13 -- ....scipublications.exporter.ris.RisConverter | 13 -- ...lications.importer.SciPublicationsImporter | 2 - ...blications.importer.bibtex.BibTeXConverter | 13 -- ....scipublications.importer.ris.RisConverter | 20 --- ...a.ui.admin.applications.ApplicationManager | 1 - .../SciPublicationsInitializer.java | 152 +++++++++++++++++- .../SciPublicationsServlet.java | 2 +- .../exporter/SciPublicationsExporters.java | 42 ++--- .../exporter/bibtex/BibTeXExporter.java | 6 +- .../bibtex/builders/BibTeXBuilders.java | 21 +-- .../bibtex/converters/BibTeXConverters.java | 23 ++- .../exporter/ris/RisConverters.java | 29 ++-- .../importer/SciPublicationsImporters.java | 24 ++- .../importer/bibtex/BibTeXConverters.java | 36 +++-- .../importer/ris/RisConverters.java | 21 ++- ...lications.importer.SciPublicationsImporter | 1 - .../src/ccm-sci-publicationscsvimporter.load | 4 +- .../importer/csv/Initializer.java | 40 +++++ ...a.ui.admin.applications.ApplicationManager | 1 - .../com/arsdigita/shortcuts/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../com/arsdigita/subsite/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../arsdigita/themedirector/Initializer.java | 4 + ...a.ui.admin.applications.ApplicationManager | 1 - .../src/org/undp/weblog/Initializer.java | 4 + 53 files changed, 452 insertions(+), 225 deletions(-) delete mode 100644 ccm-bookmarks/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-cms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-core/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager create mode 100644 ccm-core/src/com/arsdigita/ui/admin/ApplicationManagers.java delete mode 100644 ccm-faq/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-forum/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-ldn-search/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-ldn-terms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-navigation/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.SciPublicationsExporter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilder delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.ris.RisConverter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.ris.RisConverter delete mode 100644 ccm-sci-publications/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-sci-publicationscsvimporter/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter create mode 100644 ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/Initializer.java delete mode 100644 ccm-shortcuts/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-subsite/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-themedirector/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager delete mode 100644 ccm-weblog/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager diff --git a/ccm-bookmarks/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-bookmarks/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index bcf160496..000000000 --- a/ccm-bookmarks/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.bookmarks.BookmarksAppManager \ No newline at end of file diff --git a/ccm-bookmarks/src/com/arsdigita/bookmarks/Initializer.java b/ccm-bookmarks/src/com/arsdigita/bookmarks/Initializer.java index c0cc13812..5c6610311 100755 --- a/ccm-bookmarks/src/com/arsdigita/bookmarks/Initializer.java +++ b/ccm-bookmarks/src/com/arsdigita/bookmarks/Initializer.java @@ -29,6 +29,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.ui.admin.ApplicationManagers; import org.apache.log4j.Logger; @@ -85,6 +86,9 @@ public class Initializer extends CompoundInitializer { } }); + // Register the ApplicationManager implementation for this application + ApplicationManagers.register(new BookmarksAppManager()); + } } diff --git a/ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 49af06a10..000000000 --- a/ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileAppManager \ No newline at end of file diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java index a478c11f0..36585aa49 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesInitializer.java @@ -29,6 +29,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.ui.admin.ApplicationManagers; /** * @@ -60,5 +61,8 @@ public class PublicPersonalProfilesInitializer extends CompoundInitializer { return new PublicPersonalProfiles(dataObject); } }); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new PublicPersonalProfileAppManager()); } } diff --git a/ccm-cms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-cms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 44096adb6..000000000 --- a/ccm-cms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1,3 +0,0 @@ -com.arsdigita.cms.ContentCenterAppManager -com.arsdigita.cms.ServiceAppManager -com.arsdigita.cms.contentsection.ContentSectionAppManager \ No newline at end of file diff --git a/ccm-cms/src/com/arsdigita/cms/Initializer.java b/ccm-cms/src/com/arsdigita/cms/Initializer.java index 7be57b495..7bb614cd2 100755 --- a/ccm-cms/src/com/arsdigita/cms/Initializer.java +++ b/ccm-cms/src/com/arsdigita/cms/Initializer.java @@ -18,6 +18,7 @@ */ package com.arsdigita.cms; +import com.arsdigita.cms.contentsection.ContentSectionAppManager; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.Link; import com.arsdigita.cms.contenttypes.ui.GenericPersonOrgaUnitsStep; @@ -75,6 +76,7 @@ import com.arsdigita.search.filters.ContentSectionFilterType; import com.arsdigita.search.filters.ObjectTypeFilterType; import com.arsdigita.search.filters.PermissionFilterType; import com.arsdigita.templating.PatternStylesheetResolver; +import com.arsdigita.ui.admin.ApplicationManagers; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.workflow.simple.Engine; import com.arsdigita.workflow.simple.Workflow; @@ -230,6 +232,11 @@ public class Initializer extends CompoundInitializer { MetadataProviderRegistry.registerAdapter( FileAsset.BASE_DATA_OBJECT_TYPE, new AssetMetadataProvider()); + + //Register the ApplicationManager implementations provided by this module + ApplicationManagers.register(new ContentCenterAppManager()); + ApplicationManagers.register(new ServiceAppManager()); + ApplicationManagers.register(new ContentSectionAppManager()); if (s_conf.getAttachPersonOrgaUnitsStep()) { AuthoringKitWizard.registerAssetStep( diff --git a/ccm-core/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-core/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 0b4bfa3f1..000000000 --- a/ccm-core/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1,3 +0,0 @@ -com.arsdigita.ui.admin.AdminAppManager -com.arsdigita.ui.login.LoginAppManager -com.arsdigita.ui.permissions.PermissionsAppManager \ No newline at end of file diff --git a/ccm-core/src/com/arsdigita/ui/Initializer.java b/ccm-core/src/com/arsdigita/ui/Initializer.java index a07840480..3074d123d 100755 --- a/ccm-core/src/com/arsdigita/ui/Initializer.java +++ b/ccm-core/src/com/arsdigita/ui/Initializer.java @@ -21,6 +21,10 @@ package com.arsdigita.ui; import com.arsdigita.runtime.ContextInitEvent; import com.arsdigita.runtime.ConfigError; +import com.arsdigita.ui.admin.AdminAppManager; +import com.arsdigita.ui.admin.ApplicationManagers; +import com.arsdigita.ui.login.LoginAppManager; +import com.arsdigita.ui.permissions.PermissionsAppManager; import java.util.Iterator; import java.util.List; @@ -82,6 +86,11 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer { buildLayout(layout)); } } + + //Register ApplicationManager implementations + ApplicationManagers.register(new AdminAppManager()); + ApplicationManagers.register(new LoginAppManager()); + ApplicationManagers.register(new PermissionsAppManager()); s_log.debug("UI context initialization completed"); } diff --git a/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java b/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java index abeacdfcd..b45f992bb 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java +++ b/ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java @@ -172,18 +172,19 @@ public class AdminServlet extends BaseApplicationServlet implements AdminConstan /** * Create and add info tab */ - tabbedPane.addTab(INFO_TAB_TITLE, new AdminInfoTab()); - /* - * Create application administration panel - */ - tabbedPane.addTab(APPLICATIONS_TAB_TITLE, new ApplicationsAdministrationTab()); + //tabbedPane.addTab(INFO_TAB_TITLE, new AdminInfoTab()); /* * Create and add the user and group tabs. */ //tabbedPane.addTab(USER_TAB_TITLE, userSplitPanel); final GroupAdministrationTab groupAdminTab = new GroupAdministrationTab(); tabbedPane.addTab(USER_TAB_TITLE, new UserAdministrationTab(tabbedPane, groupAdminTab)); - tabbedPane.addTab(GROUP_TAB_TITLE, groupAdminTab); + tabbedPane.addTab(GROUP_TAB_TITLE, groupAdminTab); + + /* + * Create application administration panel + */ + tabbedPane.addTab(APPLICATIONS_TAB_TITLE, new ApplicationsAdministrationTab()); // browsePane.setTabbedPane(tabbedPane); // browsePane.setGroupAdministrationTab(groupAdminTab); diff --git a/ccm-core/src/com/arsdigita/ui/admin/ApplicationManagers.java b/ccm-core/src/com/arsdigita/ui/admin/ApplicationManagers.java new file mode 100644 index 000000000..75031eb96 --- /dev/null +++ b/ccm-core/src/com/arsdigita/ui/admin/ApplicationManagers.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2010 Jens Pelzetter, ScientificCMS.org team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.ui.admin; + +import com.arsdigita.ui.admin.applications.ApplicationManager; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * Helper class for managing the implementations of the {@link ApplicationManager} interface + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class ApplicationManagers { + + private Map> appManagers = new HashMap>(); + + /** + * The one and only instance of this class. The pattern used here ensures that + * the instance is created at the first access, but not earlier. + */ + private static class Instance { + private static final ApplicationManagers INSTANCE = new ApplicationManagers(); + } + + /** + * Private constructor to ensure that no instances of this class can be created. + */ + private ApplicationManagers() { + //Nothing + } + + /** + * @return The instance of this class. + */ + public static ApplicationManagers getInstance() { + return Instance.INSTANCE; + } + + public static void register(final ApplicationManager appManager) { + getInstance().registerApplicationManager(appManager); + } + + public void registerApplicationManager(final ApplicationManager appManager) { + appManagers.put(appManager.getApplication().getName(), appManager); + } + + protected Map> getApplicationManagers() { + return Collections.unmodifiableMap(appManagers); + } + +} diff --git a/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java b/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java index ea934d2ab..3751802a4 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java +++ b/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java @@ -75,9 +75,8 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons panel.setLeft(treeSection); final ApplicationTypeCollection applicationTypes = ApplicationType.retrieveAllApplicationTypes(); - - //final Map> createForms = retrieveAppCreateForms(); - final Map> appManagers = retrieveAppManagers(); + + final Map> appManagers = ApplicationManagers.getInstance().getApplicationManagers(); while (applicationTypes.next()) { if (applicationTypes.getApplicationType().isSingleton()) { @@ -109,17 +108,17 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons // } // return appCreateForms; // } - @SuppressWarnings("rawtypes") - private Map> retrieveAppManagers() { - final Map> appManagers = new HashMap>(); - - final ServiceLoader loader = ServiceLoader.load(ApplicationManager.class); - for (ApplicationManager appManager : loader) { - appManagers.put(appManager.getApplication().getName(), appManager); - } - - return appManagers; - } +// @SuppressWarnings("rawtypes") +// private Map> retrieveAppManagers() { +// final Map> appManagers = new HashMap>(); +// +// final ServiceLoader loader = ServiceLoader.load(ApplicationManager.class); +// for (ApplicationManager appManager : loader) { +// appManagers.put(appManager.getApplication().getName(), appManager); +// } +// +// return appManagers; +// } private void createSingletonAppPane(final ApplicationType applicationType, final Map> appManagers) { diff --git a/ccm-faq/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-faq/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index af6c54aa4..000000000 --- a/ccm-faq/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.faq.FaqAppManager \ No newline at end of file diff --git a/ccm-faq/src/com/arsdigita/faq/Initializer.java b/ccm-faq/src/com/arsdigita/faq/Initializer.java index 3851032f2..5580f3a58 100644 --- a/ccm-faq/src/com/arsdigita/faq/Initializer.java +++ b/ccm-faq/src/com/arsdigita/faq/Initializer.java @@ -29,6 +29,7 @@ import com.arsdigita.kernel.URLService; import com.arsdigita.persistence.*; import com.arsdigita.persistence.pdl.*; import com.arsdigita.runtime.*; +import com.arsdigita.ui.admin.ApplicationManagers; /** * FAQ Initializer @@ -106,6 +107,9 @@ public class Initializer extends CompoundInitializer { } }; URLService.registerFinder(QAPair.BASE_DATA_OBJECT_TYPE, faqFinder); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new FaqAppManager()); } diff --git a/ccm-forum/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-forum/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 8d178a4e6..000000000 --- a/ccm-forum/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.forum.ForumApplicationManager \ No newline at end of file diff --git a/ccm-forum/src/com/arsdigita/forum/Initializer.java b/ccm-forum/src/com/arsdigita/forum/Initializer.java index 309b6279f..2ce2cf3bc 100755 --- a/ccm-forum/src/com/arsdigita/forum/Initializer.java +++ b/ccm-forum/src/com/arsdigita/forum/Initializer.java @@ -46,6 +46,7 @@ import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.search.MetadataProviderRegistry; +import com.arsdigita.ui.admin.ApplicationManagers; import com.arsdigita.web.ui.ApplicationConfigFormSection; import com.arsdigita.xml.XML; @@ -218,6 +219,9 @@ public class Initializer extends CompoundInitializer { PostFileAttachment.BASE_DATA_OBJECT_TYPE, new FileAttachmentMetadataProvider()); + //Register the ApplicationManager implementation for the Forum application + ApplicationManagers.register(new ForumApplicationManager()); + } // public void init(LegacyInitEvent e) { diff --git a/ccm-ldn-search/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-ldn-search/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 204898f19..000000000 --- a/ccm-ldn-search/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.london.search.SearchAppManager \ No newline at end of file diff --git a/ccm-ldn-search/src/com/arsdigita/london/search/Initializer.java b/ccm-ldn-search/src/com/arsdigita/london/search/Initializer.java index dcabe57fa..e83a5a41d 100755 --- a/ccm-ldn-search/src/com/arsdigita/london/search/Initializer.java +++ b/ccm-ldn-search/src/com/arsdigita/london/search/Initializer.java @@ -36,6 +36,7 @@ import com.arsdigita.search.IndexerType; import com.arsdigita.search.FilterType; import com.arsdigita.search.QueryEngineRegistry; import com.arsdigita.search.filters.ObjectTypeFilterType; +import com.arsdigita.ui.admin.ApplicationManagers; import org.apache.log4j.Logger; @@ -91,6 +92,9 @@ public class Initializer extends CompoundInitializer { registerLimitedSimpleSearch(); registerRemoteSearch(); + + //Register the ApplicationManager implementation for this Application + ApplicationManagers.register(new SearchAppManager()); } /** diff --git a/ccm-ldn-terms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-ldn-terms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 6304006c7..000000000 --- a/ccm-ldn-terms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.london.terms.TermsAppManager \ No newline at end of file diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java index 0b2f0d599..0d46cfac2 100755 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java @@ -38,6 +38,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.ui.admin.ApplicationManagers; import com.arsdigita.xml.XML; public class Initializer extends CompoundInitializer { @@ -126,6 +127,9 @@ public class Initializer extends CompoundInitializer { return URLService.locate(model.getOID()); } }); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new TermsAppManager()); XML.parse(Terms.getConfig().getTraversalAdapters(), new TraversalHandler()); diff --git a/ccm-navigation/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-navigation/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 3c8c2c913..000000000 --- a/ccm-navigation/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.navigation.NavigationAppManager \ No newline at end of file diff --git a/ccm-navigation/src/com/arsdigita/navigation/Initializer.java b/ccm-navigation/src/com/arsdigita/navigation/Initializer.java index 62ff8e91a..22edb74cb 100755 --- a/ccm-navigation/src/com/arsdigita/navigation/Initializer.java +++ b/ccm-navigation/src/com/arsdigita/navigation/Initializer.java @@ -74,6 +74,7 @@ import java.util.List; import org.apache.log4j.Logger; import com.arsdigita.domain.xml.TraversalHandler; +import com.arsdigita.ui.admin.ApplicationManagers; import com.arsdigita.xml.XML; /** @@ -351,6 +352,9 @@ public class Initializer extends CompoundInitializer { // } // // }); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new NavigationAppManager()); XML.parse(Navigation.getConfig().getTraversalAdapters(), new TraversalHandler()); diff --git a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetInitializer.java b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetInitializer.java index 46fc45ce3..da1de3f0e 100644 --- a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetInitializer.java +++ b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetInitializer.java @@ -45,10 +45,7 @@ public class PublicationTypeAssetInitializer extends ContentAssetInitializer { DomainObjectTraversal.registerAdapter(PublicationTypeAsset.BASE_DATA_OBJECT_TYPE, new SimpleDomainObjectTraversalAdapter(), - SimpleXMLGenerator.ADAPTER_CONTEXT); - - final RelationAttributeImportTool importTool = new RelationAttributeImportTool(); - importTool.loadData("WEB-INF/resources/publication_types.xml"); + SimpleXMLGenerator.ADAPTER_CONTEXT); } @Override diff --git a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetLoader.java b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetLoader.java index ffc95e5d6..155385f7c 100644 --- a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetLoader.java +++ b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetLoader.java @@ -18,6 +18,7 @@ */ package com.arsdigita.cms.contentassets; +import com.arsdigita.cms.RelationAttributeImportTool; import com.arsdigita.loader.PackageLoader; import com.arsdigita.runtime.ScriptContext; @@ -27,9 +28,10 @@ import com.arsdigita.runtime.ScriptContext; * @version $Id$ */ public class PublicationTypeAssetLoader extends PackageLoader { - + public void run(final ScriptContext ctx) { - //Nothing + final RelationAttributeImportTool importTool = new RelationAttributeImportTool(); + importTool.loadData("WEB-INF/resources/publication_types.xml"); } - + } diff --git a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetStep.java b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetStep.java index 419e058ed..6cb3481ea 100644 --- a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetStep.java +++ b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetStep.java @@ -42,6 +42,11 @@ public class PublicationTypeAssetStep extends SimpleEditStep { private final BigDecimalParameter typeParameter; final PublicationTypeAssetAddForm addForm; + public PublicationTypeAssetStep(final ItemSelectionModel itemModel, + final AuthoringKitWizard parent) { + this(itemModel, parent, null); + } + public PublicationTypeAssetStep(final ItemSelectionModel itemModel, final AuthoringKitWizard parent, final String prefix) { diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.SciPublicationsExporter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.SciPublicationsExporter deleted file mode 100644 index bc2c5bffb..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.SciPublicationsExporter +++ /dev/null @@ -1,2 +0,0 @@ - com.arsdigita.cms.scipublications.exporter.bibtex.BibTeXExporter - com.arsdigita.cms.scipublications.exporter.ris.RisExporter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilder b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilder deleted file mode 100644 index b2e8fbe37..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilder +++ /dev/null @@ -1,7 +0,0 @@ -com.arsdigita.cms.scipublications.exporter.bibtex.builders.ArticleBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.BookBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.InCollectionBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.InProceedingsBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.MiscBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.ProceedingsBuilder -com.arsdigita.cms.scipublications.exporter.bibtex.builders.UnPublishedBuilder \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverter deleted file mode 100644 index 08bff0e5c..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverter +++ /dev/null @@ -1,13 +0,0 @@ -com.arsdigita.cms.scipublications.exporter.bibtex.converters.ArticleInCollectedVolumeConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.ArticleInJournalConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.CollectedVolumeConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.ExpertiseConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.GreyLiteratureConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.InProceedingsConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.InternetArticleConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.MonographConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.ProceedingsConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.PublicationConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.PublicationWithPublisherConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.ReviewConverter -com.arsdigita.cms.scipublications.exporter.bibtex.converters.WorkingPaperConverter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.ris.RisConverter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.ris.RisConverter deleted file mode 100644 index 5fc2e0163..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.ris.RisConverter +++ /dev/null @@ -1,13 +0,0 @@ -com.arsdigita.cms.scipublications.exporter.ris.ArticleInCollectedVolumeConverter -com.arsdigita.cms.scipublications.exporter.ris.ArticleInJournalConverter -com.arsdigita.cms.scipublications.exporter.ris.CollectedVolumeConverter -com.arsdigita.cms.scipublications.exporter.ris.ExpertiseConverter -com.arsdigita.cms.scipublications.exporter.ris.GreyLiteratureConverter -com.arsdigita.cms.scipublications.exporter.ris.InProceedingsConverter -com.arsdigita.cms.scipublications.exporter.ris.InternetArticleConverter -com.arsdigita.cms.scipublications.exporter.ris.MonographConverter -com.arsdigita.cms.scipublications.exporter.ris.ProceedingsConverter -com.arsdigita.cms.scipublications.exporter.ris.PublicationConverter -com.arsdigita.cms.scipublications.exporter.ris.PublicationWithPublisherConverter -com.arsdigita.cms.scipublications.exporter.ris.ReviewConverter -com.arsdigita.cms.scipublications.exporter.ris.WorkingPaperConverter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter deleted file mode 100644 index f4a2dd0b7..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter +++ /dev/null @@ -1,2 +0,0 @@ -com.arsdigita.cms.scipublications.importer.ris.RisImporter -com.arsdigita.cms.scipublications.importer.bibtex.BibTeXPublicationsImporter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverter deleted file mode 100644 index 4ba6e2f68..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverter +++ /dev/null @@ -1,13 +0,0 @@ -com.arsdigita.cms.scipublications.importer.bibtex.converters.ArticleConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.BookConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.BookletConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.InBookConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.InCollectionConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.InProceedingsConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.ManualConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.MasterThesisConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.MiscConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.PhdThesisConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.ProceedingsConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.TechReportConverter -com.arsdigita.cms.scipublications.importer.bibtex.converters.UnPublishedConverter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.ris.RisConverter b/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.ris.RisConverter deleted file mode 100644 index 8d833bac9..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.ris.RisConverter +++ /dev/null @@ -1,20 +0,0 @@ -com.arsdigita.cms.scipublications.importer.ris.converters.AbstConverter -com.arsdigita.cms.scipublications.importer.ris.converters.BlogConverter -com.arsdigita.cms.scipublications.importer.ris.converters.BookConverter -com.arsdigita.cms.scipublications.importer.ris.converters.ChapConverter -com.arsdigita.cms.scipublications.importer.ris.converters.ConfConverter -com.arsdigita.cms.scipublications.importer.ris.converters.CpaperConverter -com.arsdigita.cms.scipublications.importer.ris.converters.EbookConverter -com.arsdigita.cms.scipublications.importer.ris.converters.EchapConverter -com.arsdigita.cms.scipublications.importer.ris.converters.EdbookConverter -com.arsdigita.cms.scipublications.importer.ris.converters.EjourConverter -com.arsdigita.cms.scipublications.importer.ris.converters.ElecConverter -com.arsdigita.cms.scipublications.importer.ris.converters.EncycConverter -com.arsdigita.cms.scipublications.importer.ris.converters.GenConverter -com.arsdigita.cms.scipublications.importer.ris.converters.InprConverter -com.arsdigita.cms.scipublications.importer.ris.converters.JfullConverter -com.arsdigita.cms.scipublications.importer.ris.converters.JourConverter -com.arsdigita.cms.scipublications.importer.ris.converters.MgznConverter -com.arsdigita.cms.scipublications.importer.ris.converters.RprtConverter -com.arsdigita.cms.scipublications.importer.ris.converters.ThesConverter -com.arsdigita.cms.scipublications.importer.ris.converters.UnpbConverter \ No newline at end of file diff --git a/ccm-sci-publications/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-sci-publications/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index b5d088f9b..000000000 --- a/ccm-sci-publications/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.cms.scipublications.SciPublicationsAppManager \ No newline at end of file diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java index 649c3c97c..de6e1dbf7 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Jens Pelzetter + * Copyright (c) 2010, 2013 Jens Pelzetter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -18,6 +18,65 @@ */ package com.arsdigita.cms.scipublications; +import com.arsdigita.cms.scipublications.exporter.SciPublicationsExporters; +import com.arsdigita.cms.scipublications.exporter.bibtex.BibTeXExporter; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.ArticleBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilders; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.BookBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.InCollectionBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.InProceedingsBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.MiscBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.ProceedingsBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.builders.UnPublishedBuilder; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.ArticleInCollectedVolumeConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.ArticleInJournalConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverters; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.CollectedVolumeConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.ExpertiseConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.GreyLiteratureConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.InProceedingsConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.InternetArticleConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.MonographConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.ProceedingsConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.PublicationConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.PublicationWithPublisherConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.ReviewConverter; +import com.arsdigita.cms.scipublications.exporter.bibtex.converters.WorkingPaperConverter; +import com.arsdigita.cms.scipublications.exporter.ris.RisConverters; +import com.arsdigita.cms.scipublications.exporter.ris.RisExporter; +import com.arsdigita.cms.scipublications.importer.SciPublicationsImporters; +import com.arsdigita.cms.scipublications.importer.bibtex.BibTeXPublicationsImporter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.ArticleConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.BookConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.BookletConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.InBookConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.InCollectionConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.ManualConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.MasterThesisConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.MiscConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.PhdThesisConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.TechReportConverter; +import com.arsdigita.cms.scipublications.importer.bibtex.converters.UnPublishedConverter; +import com.arsdigita.cms.scipublications.importer.ris.RisImporter; +import com.arsdigita.cms.scipublications.importer.ris.converters.AbstConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.BlogConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.ChapConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.ConfConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.CpaperConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.EbookConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.EchapConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.EdbookConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.EjourConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.ElecConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.EncycConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.GenConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.InprConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.JfullConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.JourConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.MgznConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.RprtConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.ThesConverter; +import com.arsdigita.cms.scipublications.importer.ris.converters.UnpbConverter; import com.arsdigita.db.DbHelper; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; @@ -29,6 +88,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.ui.admin.ApplicationManagers; /** * @@ -45,7 +105,6 @@ public class SciPublicationsInitializer extends CompoundInitializer { getDatabaseSuffix( database)), "pdl")))); - } @Override @@ -60,6 +119,95 @@ public class SciPublicationsInitializer extends CompoundInitializer { } }); + + //Register the ApplicationManager implementation for the SciPublications applications + ApplicationManagers.register(new SciPublicationsAppManager()); + + //Register SciPublicationsExporter implementations provided by this module + SciPublicationsExporters.register(new BibTeXExporter()); + SciPublicationsExporters.register(new RisExporter()); + + //Register BibTeXBuilder implementations provided by this module + BibTeXBuilders.register(new ArticleBuilder()); + BibTeXBuilders.register(new BookBuilder()); + BibTeXBuilders.register(new InCollectionBuilder()); + BibTeXBuilders.register(new InProceedingsBuilder()); + BibTeXBuilders.register(new MiscBuilder()); + BibTeXBuilders.register(new ProceedingsBuilder()); + BibTeXBuilders.register(new UnPublishedBuilder()); + + //Register all exporter BibTeXConverter implementations provided by this module + BibTeXConverters.register(new ArticleInCollectedVolumeConverter()); + BibTeXConverters.register(new ArticleInJournalConverter()); + BibTeXConverters.register(new CollectedVolumeConverter()); + BibTeXConverters.register(new ExpertiseConverter()); + BibTeXConverters.register(new GreyLiteratureConverter()); + BibTeXConverters.register(new InProceedingsConverter()); + BibTeXConverters.register(new InternetArticleConverter()); + BibTeXConverters.register(new MonographConverter()); + BibTeXConverters.register(new ProceedingsConverter()); + BibTeXConverters.register(new PublicationConverter()); + BibTeXConverters.register(new PublicationWithPublisherConverter()); + BibTeXConverters.register(new ReviewConverter()); + BibTeXConverters.register(new WorkingPaperConverter()); + + //Register all exporter RisConverter implementations provided by this module + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.ArticleInCollectedVolumeConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.ArticleInJournalConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.CollectedVolumeConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.ExpertiseConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.GreyLiteratureConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.InProceedingsConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.InternetArticleConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.MonographConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.ProceedingsConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.PublicationConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.PublicationWithPublisherConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.ReviewConverter()); + RisConverters.register(new com.arsdigita.cms.scipublications.exporter.ris.WorkingPaperConverter()); + + //Register all SciPublicationsImporter implementations provided by this module + SciPublicationsImporters.register(new BibTeXPublicationsImporter()); + SciPublicationsImporters.register(new RisImporter()); + + //Register all importer BibTeXConverter implementations provided by this module + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new ArticleConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new BookConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new BookletConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new InBookConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new InCollectionConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register( + new com.arsdigita.cms.scipublications.importer.bibtex.converters.InProceedingsConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new ManualConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new MasterThesisConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new MiscConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new PhdThesisConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register( + new com.arsdigita.cms.scipublications.importer.bibtex.converters.ProceedingsConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new TechReportConverter()); + com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverters.register(new UnPublishedConverter()); + + //Register all importer RisConverter implementations provided by this module + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new AbstConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new BlogConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new com.arsdigita.cms.scipublications.importer.ris.converters.BookConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new ChapConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new ConfConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new CpaperConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new EbookConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new EchapConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new EdbookConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new EjourConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new ElecConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new EncycConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new GenConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new InprConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new JfullConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new JourConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new MgznConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new RprtConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new ThesConverter()); + com.arsdigita.cms.scipublications.importer.ris.RisConverters.register(new UnpbConverter()); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsServlet.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsServlet.java index e61136d9d..adeea4018 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsServlet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsServlet.java @@ -573,7 +573,7 @@ public class SciPublicationsServlet extends BaseApplicationServlet { } - result.append(result.toString()); + response.getWriter().append(result.toString()); } private void addAuthorAliasToFilter(final StringBuilder builder, diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java index f3914e188..18fe0dbca 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/SciPublicationsExporters.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ServiceLoader; -import org.apache.log4j.Logger; /** * This class provides access to implementations of the @@ -34,9 +32,7 @@ import org.apache.log4j.Logger; * @version $Id$ */ public final class SciPublicationsExporters { - - private static final Logger logger = Logger.getLogger( - SciPublicationsExporters.class); + /** * Association of the format and the responsible exporters. */ @@ -54,24 +50,10 @@ public final class SciPublicationsExporters { } /** - * Creates the instance. Uses the {@link ServiceLoader} to find all available - * implementations of {@link SciPublicationsExporter} and puts them into - * the {@link #exporters} map. + * Private constructor to ensure that no instances of this class can be created. */ private SciPublicationsExporters() { - logger.debug("Creating SciPublicationsExporter instance..."); - ServiceLoader exporterServices; - - logger.debug("Loading all available implementations of the " - + "SciPublicationsExporter interface..."); - exporterServices = ServiceLoader.load(SciPublicationsExporter.class); - - for (SciPublicationsExporter exporter : exporterServices) { - logger.debug(String.format("Found exporter for format '%s'...", - exporter.getSupportedFormat().getName().toLowerCase())); - exporters.put(exporter.getSupportedFormat().getName().toLowerCase(), exporter); - } - logger.debug(String.format("Found %d exporters.", exporters.size())); + //Nothing for now } /** @@ -80,6 +62,24 @@ public final class SciPublicationsExporters { public static SciPublicationsExporters getInstance() { return Instance.INSTANCE; } + + /** + * Convenient static wrapper method for {@code SciPublicationsExporter.getInstance().registerExporter(SciPublicationsExporter)}. + * + * @param exporter The exporter to register. + */ + public static void register(final SciPublicationsExporter exporter) { + getInstance().registerExporter(exporter); + } + + /** + * Register an {@link SciPublicationsExporter} implementation. + * + * @param exporter The exporter to register. + */ + public void registerExporter(final SciPublicationsExporter exporter) { + exporters.put(exporter.getSupportedFormat().getName().toLowerCase(), exporter); + } /** * Retrieves the exporter for the specified format. diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/BibTeXExporter.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/BibTeXExporter.java index 99fbd51fc..4c7c6ad7a 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/BibTeXExporter.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/BibTeXExporter.java @@ -37,15 +37,16 @@ import org.apache.log4j.Logger; */ public class BibTeXExporter implements SciPublicationsExporter { - private final static Logger logger = Logger.getLogger(BibTeXExporter.class); + private final static Logger LOGGER = Logger.getLogger(BibTeXExporter.class); + @Override public PublicationFormat getSupportedFormat() { try { return new PublicationFormat("BibTeX", new MimeType("text", "x-bibtex"), "bib"); } catch (MimeTypeParseException ex) { - logger.warn("Failed to create MimeType for PublicationFormat." + LOGGER.warn("Failed to create MimeType for PublicationFormat." + "Using null mimetype instead. Cause: ", ex); return new PublicationFormat("BibTeX", null, @@ -54,6 +55,7 @@ public class BibTeXExporter implements SciPublicationsExporter { } } + @Override public String exportPublication(final Publication publication) { return BibTeXConverters.getInstance().convert(publication); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/builders/BibTeXBuilders.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/builders/BibTeXBuilders.java index 97e65f037..a50e587b1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/builders/BibTeXBuilders.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/builders/BibTeXBuilders.java @@ -41,25 +41,18 @@ public class BibTeXBuilders { new HashMap(); /** - * Private constructor, loads all available {@link BibTeXBuilder}s. + * Private constructor to ensure that no instances of this class can be created. */ private BibTeXBuilders() { - ServiceLoader builderServices; - - builderServices = ServiceLoader.load(BibTeXBuilder.class); - - for (BibTeXBuilder builder : builderServices) { - builders.put(builder.getBibTeXType(), builder); - } + //Nothing } /** * Static inner class which keeps the one and only instance of this class. */ private static class Instance { - private static final BibTeXBuilders INSTANCE = new BibTeXBuilders(); - } + } /** * @@ -68,6 +61,14 @@ public class BibTeXBuilders { public static BibTeXBuilders getInstance() { return Instance.INSTANCE; } + + public static void register(final BibTeXBuilder builder) { + getInstance().registerBibTeXBuilder(builder); + } + + public void registerBibTeXBuilder(final BibTeXBuilder builder) { + builders.put(builder.getBibTeXType(), builder); + } /** * Retrieves a builder for a BibTeX type. diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/converters/BibTeXConverters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/converters/BibTeXConverters.java index 967fe96a5..4d42ff197 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/converters/BibTeXConverters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/converters/BibTeXConverters.java @@ -42,21 +42,10 @@ public class BibTeXConverters { new HashMap(); /** - * Finds all available {@link BibTeXConverter}s and puts them into the - * map. + * Private constructor to ensure that no instances of this class can be created. */ private BibTeXConverters() { - logger.debug("Loading BibTeX converters..."); - ServiceLoader converterServices; - - converterServices = ServiceLoader.load(BibTeXConverter.class); - - for (BibTeXConverter converter : converterServices) { - logger.debug(String.format("Found converter for CCM type '%s'...", - converter.getCcmType())); - converters.put(converter.getCcmType(), converter); - } - logger.debug(String.format("Found %d converters.", converters.size())); + //Nothing } private static class Instance { @@ -70,6 +59,14 @@ public class BibTeXConverters { public static BibTeXConverters getInstance() { return Instance.INSTANCE; } + + public static void register(final BibTeXConverter converter) { + getInstance().registerConverter(converter); + } + + public void registerConverter(final BibTeXConverter converter) { + converters.put(converter.getCcmType(), converter); + } /** * Converts the provided publication to BibTeX using the responsible diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/RisConverters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/RisConverters.java index 82b8acc14..ea4f45603 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/RisConverters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/RisConverters.java @@ -41,21 +41,10 @@ public class RisConverters { new HashMap(); /** - * The constructor loads all available implementations of the - * {@link RisConverter} interface using the {@link ServiceLoader}. - */ - private RisConverters() { - logger.debug("Loading RIS converters..."); - ServiceLoader converterServices; - - converterServices = ServiceLoader.load(RisConverter.class); - - for (RisConverter converter : converterServices) { - logger.debug(String.format("Found converter for CCM type '%s'...", - converter.getCcmType())); - converters.put(converter.getCcmType(), converter); - } - logger.debug(String.format("Found %d converters.", converters.size())); + * Private constructor to ensure that no instances of this class can be created. + */ + private RisConverters() { + //Nothing } /** @@ -64,7 +53,7 @@ public class RisConverters { private static class Instance { private static RisConverters INSTANCE = new RisConverters(); - } + } /** * @@ -74,6 +63,14 @@ public class RisConverters { return Instance.INSTANCE; } + public static void register(final RisConverter converter) { + getInstance().registerConverter(converter); + } + + public void registerConverter(final RisConverter converter) { + converters.put(converter.getCcmType(), converter); + } + /** * Converts a {@link Publication} content item to an RIS reference. Tries * to find a suitable converter for the type of the publication. If no diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java index 36a36386f..9239e231f 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java @@ -28,27 +28,23 @@ public class SciPublicationsImporters { } /** - * Create the instance. Uses the {@link ServiceLoader} to find all avaiable implementations of - * {@link SciPublicationsImporters} and puts them into the {@link #importers} map. + * Private constructor to ensure that no instances of this class can be created. */ private SciPublicationsImporters() { - LOGGER.debug("Creating SciPublicationsImporter instance..."); - final ServiceLoader importerServices; - - LOGGER.debug("Loading all available implementations of the SciPublicationsImporter interface..."); - importerServices = ServiceLoader.load(SciPublicationsImporter.class); - - for (SciPublicationsImporter importer : importerServices) { - LOGGER.debug(String.format("Found importer for format '%s'...", - importer.getSupportedFormat().getName().toLowerCase())); - importers.put(importer.getSupportedFormat().getName().toLowerCase(), importer); - } - LOGGER.debug(String.format("Found %d importers.", importers.size())); + //Nothing } public static SciPublicationsImporters getInstance() { return Instance.INSTANCE; } + + public static void register(final SciPublicationsImporter importer) { + getInstance().registerImporter(importer); + } + + public void registerImporter(final SciPublicationsImporter importer) { + importers.put(importer.getSupportedFormat().getName().toLowerCase(), importer); + } /** * Retrieves the importer for the specified format. diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/BibTeXConverters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/BibTeXConverters.java index 2647fe6d9..2603aace4 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/BibTeXConverters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/bibtex/BibTeXConverters.java @@ -22,7 +22,6 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import java.util.ServiceLoader; -import java.util.logging.Level; import org.apache.log4j.Logger; import org.jbibtex.BibTeXEntry; import org.jbibtex.ParseException; @@ -39,17 +38,12 @@ public class BibTeXConverters { private final Map> converters = new HashMap>(); + /** + * Private constructor to ensure that no instances of this class can be created. + */ @SuppressWarnings("rawtypes") private BibTeXConverters() { - LOGGER.debug("Loading BibTeX converters..."); - final ServiceLoader converterServices = ServiceLoader.load(BibTeXConverter.class); - - for (BibTeXConverter converter : converterServices) { - LOGGER.debug(String.format("Found converter for BibTeX type '%s'.", converter.getBibTeXType())); - - converters.put(converter.getBibTeXType(), converter); - } - LOGGER.debug(String.format("Found %d BibTeX converters.", converters.size())); + //Nothing } private static class Instance { @@ -61,12 +55,20 @@ public class BibTeXConverters { return Instance.INSTANCE; } + public static void register(final BibTeXConverter converter) { + getInstance().registerConverter(converter); + } + + public void registerConverter(final BibTeXConverter converter) { + converters.put(converter.getBibTeXType(), converter); + } + public PublicationImportReport convert(final BibTeXEntry bibTeXEntry, final ImporterUtil importerUtil, final boolean pretend, final boolean publishNewItems) { - final PublicationImportReport report = new PublicationImportReport(); - + final PublicationImportReport report = new PublicationImportReport(); + BibTeXConverter converter = converters.get(bibTeXEntry. getType().getValue().toLowerCase()); @@ -79,10 +81,10 @@ public class BibTeXConverters { return report; } - if(isPublicationAlreadyInDatabase(bibTeXEntry, converter.getTypeName(), report)) { + if (isPublicationAlreadyInDatabase(bibTeXEntry, converter.getTypeName(), report)) { return report; } - + try { converter = converter.getClass().newInstance(); } catch (InstantiationException ex) { @@ -185,8 +187,8 @@ public class BibTeXConverters { } catch (NumberFormatException ex) { yearOfPublication = 0; } - - final Session session = SessionManager.getSession(); + + final Session session = SessionManager.getSession(); final DataCollection collection = session.retrieve(Publication.BASE_DATA_OBJECT_TYPE); final FilterFactory filterFactory = collection.getFilterFactory(); final Filter titleFilter = filterFactory.equals("title", title); @@ -196,7 +198,7 @@ public class BibTeXConverters { final boolean result = !collection.isEmpty(); collection.close(); - + if (result) { importReport.setTitle(title); importReport.setType(type); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/ris/RisConverters.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/ris/RisConverters.java index 034fd14d8..993420b25 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/ris/RisConverters.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/ris/RisConverters.java @@ -20,19 +20,10 @@ public class RisConverters { private Map converters = new EnumMap(RisType.class); /** - * The constructor loads all available implementations of the - * {@link RisConverter} interface using the {@link ServiceLoader}. + * Private constructor to ensure that no instances of this class can be created. */ private RisConverters() { - LOGGER.debug("Loading RIS import converters..."); - final ServiceLoader converterServices = ServiceLoader.load(RisConverter.class); - - for (RisConverter converter : converterServices) { - LOGGER.debug(String.format("Found converter for RIS type '%s'.", converter.getRisType().toString())); - - converters.put(converter.getRisType(), converter); - } - LOGGER.debug(String.format("Found %d import converters.", converters.size())); + // Nothing } /** @@ -51,6 +42,14 @@ public class RisConverters { return Instance.INSTANCE; } + public static void register(final RisConverter converter) { + getInstance().registerConverter(converter); + } + + public void registerConverter(final RisConverter converter) { + converters.put(converter.getRisType(), converter); + } + /** * * @param dataset diff --git a/ccm-sci-publicationscsvimporter/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter b/ccm-sci-publicationscsvimporter/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter deleted file mode 100644 index ed4260492..000000000 --- a/ccm-sci-publicationscsvimporter/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.cms.scipublications.importer.csv.PublicationsImporter \ No newline at end of file diff --git a/ccm-sci-publicationscsvimporter/src/ccm-sci-publicationscsvimporter.load b/ccm-sci-publicationscsvimporter/src/ccm-sci-publicationscsvimporter.load index 277ba1db0..e388702bf 100644 --- a/ccm-sci-publicationscsvimporter/src/ccm-sci-publicationscsvimporter.load +++ b/ccm-sci-publicationscsvimporter/src/ccm-sci-publicationscsvimporter.load @@ -6,11 +6,11 @@ - + - + diff --git a/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/Initializer.java b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/Initializer.java new file mode 100644 index 000000000..e3d0c678f --- /dev/null +++ b/ccm-sci-publicationscsvimporter/src/com/arsdigita/cms/scipublications/importer/csv/Initializer.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2013 Jens Pelzetter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.scipublications.importer.csv; + +import com.arsdigita.cms.scipublications.SciPublications; +import com.arsdigita.cms.scipublications.importer.SciPublicationsImporters; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.DomainInitEvent; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class Initializer extends CompoundInitializer { + + @Override + public void init(DomainInitEvent e) { + super.init(e); + + SciPublicationsImporters.register(new PublicationsImporter()); + } + +} diff --git a/ccm-shortcuts/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-shortcuts/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 51c55f490..000000000 --- a/ccm-shortcuts/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.shortcuts.ShortcutsAppManager \ No newline at end of file diff --git a/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java b/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java index 4859a36fa..0c4576a5f 100755 --- a/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java +++ b/ccm-shortcuts/src/com/arsdigita/shortcuts/Initializer.java @@ -33,6 +33,7 @@ import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; +import com.arsdigita.ui.admin.ApplicationManagers; /** * Initializes the shortcuts application @@ -71,6 +72,9 @@ public class Initializer extends CompoundInitializer { return new Shortcuts(dataObject); } }); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new ShortcutsAppManager()); } diff --git a/ccm-subsite/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-subsite/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 79eaecf8b..000000000 --- a/ccm-subsite/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.subsite.SubsiteAppManager \ No newline at end of file diff --git a/ccm-subsite/src/com/arsdigita/subsite/Initializer.java b/ccm-subsite/src/com/arsdigita/subsite/Initializer.java index 027fb24da..80a719c15 100755 --- a/ccm-subsite/src/com/arsdigita/subsite/Initializer.java +++ b/ccm-subsite/src/com/arsdigita/subsite/Initializer.java @@ -34,6 +34,7 @@ import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.subsite.dispatcher.SubsiteItemURLFinder; import com.arsdigita.templating.PatternStylesheetResolver; +import com.arsdigita.ui.admin.ApplicationManagers; import com.arsdigita.xml.XML; /** @@ -77,6 +78,9 @@ public class Initializer extends CompoundInitializer { "subsite", new SubsitePatternGenerator() ); + //Register the ApplicationManager implementation for the Subsite application + ApplicationManagers.register(new SubsiteAppManager()); + } } diff --git a/ccm-themedirector/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-themedirector/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 8aa1146d7..000000000 --- a/ccm-themedirector/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -com.arsdigita.themedirector.ThemeDirectorAppManager \ No newline at end of file diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java index f4d8021cc..f883aafdd 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java @@ -39,6 +39,7 @@ import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.templating.PatternStylesheetResolver; +import com.arsdigita.ui.admin.ApplicationManagers; import org.apache.log4j.Logger; @@ -99,6 +100,9 @@ public class Initializer extends CompoundInitializer { return new ThemeDirector(dataObject); } }); + + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new ThemeDirectorAppManager()); } @Override diff --git a/ccm-weblog/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager b/ccm-weblog/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager deleted file mode 100644 index 412ed4d99..000000000 --- a/ccm-weblog/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager +++ /dev/null @@ -1 +0,0 @@ -org.undp.weblog.WebLogAppManager \ No newline at end of file diff --git a/ccm-weblog/src/org/undp/weblog/Initializer.java b/ccm-weblog/src/org/undp/weblog/Initializer.java index 7d42960a2..451f22375 100755 --- a/ccm-weblog/src/org/undp/weblog/Initializer.java +++ b/ccm-weblog/src/org/undp/weblog/Initializer.java @@ -10,6 +10,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; import com.arsdigita.runtime.PDLInitializer; import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.ui.admin.ApplicationManagers; import org.apache.log4j.Logger; import org.undp.weblog.ui.WebLogPortlet; @@ -84,6 +85,9 @@ public class Initializer extends CompoundInitializer { } }); + //Register the ApplicationManager implementation for this application + ApplicationManagers.register(new WebLogAppManager()); + s_log.debug("WebLog Initializer done."); }