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

ccm-bookmarks/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.bookmarks.BookmarksAppManager

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());
+        
     }
 
 }

ccm-cms-publicpersonalprofile/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileAppManager

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());
     }
 }

ccm-cms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1,3 +0,0 @@
-com.arsdigita.cms.ContentCenterAppManager
-com.arsdigita.cms.ServiceAppManager
-com.arsdigita.cms.contentsection.ContentSectionAppManager

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;
@@ -231,6 +233,11 @@ public class Initializer extends CompoundInitializer {
                 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(
                     GenericPerson.BASE_DATA_OBJECT_TYPE,

ccm-core/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1,3 +0,0 @@
-com.arsdigita.ui.admin.AdminAppManager
-com.arsdigita.ui.login.LoginAppManager
-com.arsdigita.ui.permissions.PermissionsAppManager

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;
@@ -83,6 +87,11 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer {
             }
         }
         
+        //Register ApplicationManager implementations
+        ApplicationManagers.register(new AdminAppManager());
+        ApplicationManagers.register(new LoginAppManager());
+        ApplicationManagers.register(new PermissionsAppManager());
+
         s_log.debug("UI context initialization completed");
     }
 

ccm-core/src/com/arsdigita/ui/admin/AdminServlet.java

@@ -172,11 +172,7 @@ public class AdminServlet extends BaseApplicationServlet implements AdminConstan
         /**
          * Create and add info tab
          */
-        tabbedPane.addTab(INFO_TAB_TITLE, new AdminInfoTab());
+        //tabbedPane.addTab(INFO_TAB_TITLE, new AdminInfoTab());        
-        /*
-         * Create application administration panel
-         */
-        tabbedPane.addTab(APPLICATIONS_TAB_TITLE, new ApplicationsAdministrationTab());
         /*
          * Create and add the user and group tabs.
          */
@@ -185,6 +181,11 @@ public class AdminServlet extends BaseApplicationServlet implements AdminConstan
         tabbedPane.addTab(USER_TAB_TITLE, new UserAdministrationTab(tabbedPane, groupAdminTab));        
         tabbedPane.addTab(GROUP_TAB_TITLE, groupAdminTab);      
         
+        /*
+         * Create application administration panel
+         */
+        tabbedPane.addTab(APPLICATIONS_TAB_TITLE, new ApplicationsAdministrationTab());
+
 //        browsePane.setTabbedPane(tabbedPane);
 //        browsePane.setGroupAdministrationTab(groupAdminTab);      
 

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 <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class ApplicationManagers {
+    
+    private Map<String, ApplicationManager<?>> appManagers = new HashMap<String, ApplicationManager<?>>();
+    
+    /**
+     * 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<String, ApplicationManager<?>> getApplicationManagers() {
+        return Collections.unmodifiableMap(appManagers);
+    }
+    
+}

ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java

@@ -76,8 +76,7 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
 
         final ApplicationTypeCollection applicationTypes = ApplicationType.retrieveAllApplicationTypes();
         
-        //final Map<String, ApplicationCreateForm<?>> createForms = retrieveAppCreateForms();
+        final Map<String, ApplicationManager<?>> appManagers = ApplicationManagers.getInstance().getApplicationManagers();
-        final Map<String, ApplicationManager<?>> appManagers = retrieveAppManagers();
 
         while (applicationTypes.next()) {
             if (applicationTypes.getApplicationType().isSingleton()) {
@@ -109,17 +108,17 @@ public class ApplicationsAdministrationTab extends BoxPanel implements AdminCons
 //        }
 //        return appCreateForms;
 //    }
-    @SuppressWarnings("rawtypes")
+//    @SuppressWarnings("rawtypes")
-    private Map<String, ApplicationManager<?>> retrieveAppManagers() {
+//    private Map<String, ApplicationManager<?>> retrieveAppManagers() {
-        final Map<String, ApplicationManager<?>> appManagers = new HashMap<String, ApplicationManager<?>>();
+//        final Map<String, ApplicationManager<?>> appManagers = new HashMap<String, ApplicationManager<?>>();
-
+//
-        final ServiceLoader<ApplicationManager> loader = ServiceLoader.load(ApplicationManager.class);
+//        final ServiceLoader<ApplicationManager> loader = ServiceLoader.load(ApplicationManager.class);
-        for (ApplicationManager<?> appManager : loader) {
+//        for (ApplicationManager<?> appManager : loader) {
-            appManagers.put(appManager.getApplication().getName(), appManager);
+//            appManagers.put(appManager.getApplication().getName(), appManager);
-        }
+//        }
-
+//
-        return appManagers;
+//        return appManagers;
-    }
+//    }
 
     private void createSingletonAppPane(final ApplicationType applicationType,
                                         final Map<String, ApplicationManager<?>> appManagers) {

ccm-faq/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.faq.FaqAppManager

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
@@ -107,6 +108,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());
+
     }
 
 }

ccm-forum/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.forum.ForumApplicationManager

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) {

ccm-ldn-search/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.london.search.SearchAppManager

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());
     }
 
     /**

ccm-ldn-terms/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.london.terms.TermsAppManager

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 {
@@ -127,6 +128,9 @@ public class Initializer extends CompoundInitializer {
                 }
             });
         
+        //Register the ApplicationManager implementation for this application
+        ApplicationManagers.register(new TermsAppManager());
+
         XML.parse(Terms.getConfig().getTraversalAdapters(),
                   new TraversalHandler());
 

ccm-navigation/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.navigation.NavigationAppManager

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;
 
 /**
@@ -352,6 +353,9 @@ public class Initializer extends CompoundInitializer {
 //
 //        });
         
+        //Register the ApplicationManager implementation for this application
+        ApplicationManagers.register(new NavigationAppManager());
+
         XML.parse(Navigation.getConfig().getTraversalAdapters(),
                   new TraversalHandler());
 

ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/PublicationTypeAssetInitializer.java

@@ -46,9 +46,6 @@ 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");
     }
 
     @Override

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;
 
@@ -29,7 +30,8 @@ import com.arsdigita.runtime.ScriptContext;
 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");
     }
 
 }

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) {

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.SciPublicationsExporter

@@ -1,2 +0,0 @@
- com.arsdigita.cms.scipublications.exporter.bibtex.BibTeXExporter
- com.arsdigita.cms.scipublications.exporter.ris.RisExporter

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.builders.BibTeXBuilder

@@ -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

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.bibtex.converters.BibTeXConverter

@@ -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

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.exporter.ris.RisConverter

@@ -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

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter

@@ -1,2 +0,0 @@
-com.arsdigita.cms.scipublications.importer.ris.RisImporter
-com.arsdigita.cms.scipublications.importer.bibtex.BibTeXPublicationsImporter

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.bibtex.BibTeXConverter

@@ -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

ccm-sci-publications/src/META-INF/services/com.arsdigita.cms.scipublications.importer.ris.RisConverter

@@ -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

ccm-sci-publications/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.cms.scipublications.SciPublicationsAppManager

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());
     }
 
 }

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,

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 
@@ -35,8 +33,6 @@ import org.apache.log4j.Logger;
  */
 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
+     * Private constructor to ensure that no instances of this class can be created.
-     * implementations of {@link SciPublicationsExporter} and puts them into
-     * the {@link #exporters} map.
      */
     private SciPublicationsExporters() {
-        logger.debug("Creating SciPublicationsExporter instance...");
+        //Nothing for now
-        ServiceLoader<SciPublicationsExporter> 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()));
     }
 
     /**
@@ -81,6 +63,24 @@ public final class SciPublicationsExporters {
         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.
      *

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);     
     }

ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/builders/BibTeXBuilders.java

@@ -41,23 +41,16 @@ public class BibTeXBuilders {
                                        new HashMap<String, BibTeXBuilder>();
 
     /**
-     * Private constructor, loads all available {@link BibTeXBuilder}s.
+     * Private constructor to ensure that no instances of this class can be created.
      */
     private BibTeXBuilders() {
-        ServiceLoader<BibTeXBuilder> builderServices;
+        //Nothing
-
-        builderServices = ServiceLoader.load(BibTeXBuilder.class);
-
-        for (BibTeXBuilder builder : builderServices) {
-            builders.put(builder.getBibTeXType(), builder);
-        }
     }
 
     /**
      * Static inner class which keeps the one and only instance of this class.
      */
     private static class Instance {
-
         private static final BibTeXBuilders INSTANCE = new BibTeXBuilders();
     }        
 
@@ -69,6 +62,14 @@ public class BibTeXBuilders {
         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.
      *

ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/bibtex/converters/BibTeXConverters.java

@@ -42,21 +42,10 @@ public class BibTeXConverters {
                                          new HashMap<String, BibTeXConverter>();
 
     /**
-     * Finds all available {@link BibTeXConverter}s and puts them into the
+     * Private constructor to ensure that no instances of this class can be created.
-     * map.
      */
     private BibTeXConverters() {
-        logger.debug("Loading BibTeX converters...");
+        //Nothing
-        ServiceLoader<BibTeXConverter> 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()));
     }
 
     private static class Instance {
@@ -71,6 +60,14 @@ 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.getCcmType(), converter);
+    }
+
     /**
      * Converts the provided publication to BibTeX using the responsible
      * converter. If no converter is found, the

ccm-sci-publications/src/com/arsdigita/cms/scipublications/exporter/ris/RisConverters.java

@@ -41,21 +41,10 @@ public class RisConverters {
                                       new HashMap<String, RisConverter>();
 
     /**
-     * The constructor loads all available implementations of the
+     * Private constructor to ensure that no instances of this class can be created.
-     * {@link RisConverter} interface using the {@link ServiceLoader}.
      */    
     private RisConverters() {        
-        logger.debug("Loading RIS converters...");
+        //Nothing
-        ServiceLoader<RisConverter> 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()));
     }
 
     /**
@@ -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

ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/SciPublicationsImporters.java

@@ -28,28 +28,24 @@ public class SciPublicationsImporters {
     }
 
     /**
-     * Create the instance. Uses the {@link ServiceLoader} to find all avaiable implementations of 
+     * Private constructor to ensure that no instances of this class can be created.
-     * {@link SciPublicationsImporters} and puts them into the {@link #importers} map.
      */
     private SciPublicationsImporters() {
-        LOGGER.debug("Creating SciPublicationsImporter instance...");
+        //Nothing
-        final ServiceLoader<SciPublicationsImporter> 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()));
     }
 
     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.
      * 

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<String, BibTeXConverter<Publication, PublicationBundle>> converters =
                                                                                new HashMap<String, BibTeXConverter<Publication, PublicationBundle>>();
 
+    /**
+     * Private constructor to ensure that no instances of this class can be created.
+     */
     @SuppressWarnings("rawtypes")
     private BibTeXConverters() {
-        LOGGER.debug("Loading BibTeX converters...");
+        //Nothing
-        final ServiceLoader<BibTeXConverter> 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()));
     }
 
     private static class Instance {
@@ -61,6 +55,14 @@ 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,

ccm-sci-publications/src/com/arsdigita/cms/scipublications/importer/ris/RisConverters.java

@@ -20,19 +20,10 @@ public class RisConverters {
     private Map<RisType, RisConverter> converters = new EnumMap<RisType, RisConverter>(RisType.class);
 
     /**
-     * The constructor loads all available implementations of the
+     * Private constructor to ensure that no instances of this class can be created.
-     * {@link RisConverter} interface using the {@link ServiceLoader}.
      */
     private RisConverters() {
-        LOGGER.debug("Loading RIS import converters...");
+        // Nothing
-        final ServiceLoader<RisConverter> 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()));
     }
 
     /**
@@ -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     

ccm-sci-publicationscsvimporter/src/META-INF/services/com.arsdigita.cms.scipublications.importer.SciPublicationsImporter

@@ -1 +0,0 @@
-com.arsdigita.cms.scipublications.importer.csv.PublicationsImporter

ccm-sci-publicationscsvimporter/src/ccm-sci-publicationscsvimporter.load

@@ -6,11 +6,11 @@
 		 <table name="ct_publications"/>
 		 <initializer class="com.arsdigita.cms.Initializer"/>
 		 <initializer class="com.arsdigita.cms.contenttypes.PublicationInitializer"/>
-                 <initializer class="com.arsdigita.cms.contenttypes.ResearchReportInitializer"/>
+                 <!-- <initializer class="com.arsdigita.cms.contenttypes.ResearchReportInitializer"/> -->
 	</requires>
 
 	<provides>
-		<!--<initializer class="com.arsdigita.cms.scipublications.importer.csv.Initializer"/>-->
+		<initializer class="com.arsdigita.cms.scipublications.importer.csv.Initializer"/>
 	</provides>
 	<scripts>
 		 <!--<data class="com.arsdigita.cms.scipublications.importer.csv.Loader"/>-->

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 <jens@jp-digital.de>
+ * @version $Id$
+ */
+public class Initializer extends CompoundInitializer {
+    
+    @Override
+    public void init(DomainInitEvent e) {
+        super.init(e);
+        
+        SciPublicationsImporters.register(new PublicationsImporter());
+    }
+    
+}

ccm-shortcuts/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.shortcuts.ShortcutsAppManager

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());
     }
 
 

ccm-subsite/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.subsite.SubsiteAppManager

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());
+        
     }
 
 }

ccm-themedirector/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-com.arsdigita.themedirector.ThemeDirectorAppManager

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

ccm-weblog/src/META-INF/services/com.arsdigita.ui.admin.applications.ApplicationManager

@@ -1 +0,0 @@
-org.undp.weblog.WebLogAppManager

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.");
     }