remotingApplicationContext : removing configuration bean declaration

CdmApplicationRemoteController : removed call to init configuration bean via application context
CdmApplicationRemoteDefaultConfiguration : refactoring code to cplit configuration into default / remote

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java
index 6c4755ac7b3b94a5cfba16fdd4cc34aaf8146d84..2a870877f94b76fb0e03bee664a77cdfa944dd46 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteController.java
@@ -190,7 +190,7 @@ public class CdmApplicationRemoteController  implements ICdmApplicationRemoteCon
                                logger.info(beanName);\r
                        }\r
                }\r
-               configuration = (ICdmApplicationRemoteConfiguration)applicationContext.getBean("cdmApplicationRemoteDefaultConfiguration");\r
+               configuration = new CdmApplicationRemoteDefaultConfiguration();\r
        }\r
        \r
     \r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteDefaultConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteDefaultConfiguration.java
index c5a4dba90927362d8d0bdf8323495e15e0c3e29c..76df0e5d8ade273832dd22dd3612850d3d3c74a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteDefaultConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/api/application/CdmApplicationRemoteDefaultConfiguration.java
@@ -11,46 +11,10 @@
 package eu.etaxonomy.cdm.remote.api.application;\r
 \r
 import org.apache.log4j.Logger;\r
-import org.springframework.beans.BeansException;\r
-import org.springframework.beans.factory.annotation.Autowired;\r
-import org.springframework.context.ApplicationContext;\r
 import org.springframework.context.ApplicationContextAware;\r
-import org.springframework.security.access.PermissionEvaluator;\r
-import org.springframework.security.authentication.ProviderManager;\r
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;\r
-import org.springframework.security.core.Authentication;\r
-import org.springframework.security.core.context.SecurityContext;\r
-import org.springframework.security.core.context.SecurityContextHolder;\r
 import org.springframework.stereotype.Component;\r
 \r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;\r
-import eu.etaxonomy.cdm.api.service.IAgentService;\r
-import eu.etaxonomy.cdm.api.service.IClassificationService;\r
-import eu.etaxonomy.cdm.api.service.ICollectionService;\r
-import eu.etaxonomy.cdm.api.service.ICommonService;\r
-import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
-import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
-import eu.etaxonomy.cdm.api.service.IFeatureNodeService;\r
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;\r
-import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;\r
-import eu.etaxonomy.cdm.api.service.IGroupService;\r
-import eu.etaxonomy.cdm.api.service.IIdentificationKeyService;\r
-import eu.etaxonomy.cdm.api.service.ILocationService;\r
-import eu.etaxonomy.cdm.api.service.IMediaService;\r
-import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
-import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;\r
-import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;\r
-import eu.etaxonomy.cdm.api.service.IReferenceService;\r
-import eu.etaxonomy.cdm.api.service.IService;\r
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;\r
-import eu.etaxonomy.cdm.api.service.ITaxonService;\r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.api.service.IUserService;\r
-import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -62,300 +26,13 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
  * @author j.koch\r
  */\r
 @Component\r
-public class CdmApplicationRemoteDefaultConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware {\r
+public class CdmApplicationRemoteDefaultConfiguration extends CdmApplicationDefaultConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware {\r
+       \r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(CdmApplicationRemoteDefaultConfiguration.class);\r
 \r
-       @Autowired\r
-       //@Qualifier("nameService")\r
-       private INameService nameService;\r
-       @Autowired\r
-       //@Qualifier("taxonService")\r
-       private ITaxonService taxonService;\r
-       @Autowired\r
-       //@Qualifier("classificationService")\r
-       private IClassificationService classificationService;\r
-       @Autowired\r
-       //@Qualifier("referenceService")\r
-       private IReferenceService referenceService;\r
-       @Autowired\r
-       //@Qualifier("agentService")\r
-       private IAgentService agentService;\r
-       @Autowired\r
-       //@Qualifier("termService")\r
-       private ITermService termService;\r
-       @Autowired\r
-       //@Qualifier("descriptionService")\r
-       private IDescriptionService descriptionService;\r
-       @Autowired\r
-       //@Qualifier("occurrenceService")\r
-       private IOccurrenceService occurrenceService;\r
-       @Autowired\r
-       //@Qualifier("mediaService")\r
-       private IMediaService mediaService;\r
-       @Autowired\r
-       //@Qualifier("commonService")\r
-       private ICommonService commonService;\r
-       @Autowired\r
-       private ILocationService locationService;\r
-       @Autowired\r
-       private IUserService userService;\r
-       @Autowired\r
-       private IGroupService groupService;\r
-       @Autowired\r
-       private ICollectionService collectionService;\r
-       @Autowired\r
-       private IFeatureTreeService featureTreeService;\r
-       @Autowired\r
-       private IFeatureNodeService featureNodeService;\r
-       @Autowired\r
-       private IVocabularyService vocabularyService;\r
-       @Autowired\r
-       private ITaxonNodeService taxonNodeService;\r
-       @Autowired\r
-       private IIdentificationKeyService identificationKeyService;\r
-       @Autowired\r
-       private IPolytomousKeyService polytomousKeyService;\r
-       @Autowired\r
-       private IPolytomousKeyNodeService polytomousKeyNodeService;\r
-    @Autowired\r
-    private IGrantedAuthorityService grantedAuthorityService;\r
-//     @Autowired\r
-       //@Qualifier("mainService")\r
-       private IService<CdmBase> mainService;\r
-\r
-       @Autowired\r
-       private IWorkingSetService workingSetService;\r
-       @Autowired\r
-       private ProviderManager authenticationManager;\r
-    @Autowired\r
-    private PermissionEvaluator permissionEvaluator;\r
-       \r
-    protected ApplicationContext applicationContext;\r
-    \r
-       /**\r
-        * \r
-        */\r
        public CdmApplicationRemoteDefaultConfiguration() {\r
        }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getAgentService()\r
-        */\r
-       public IAgentService getAgentService() {\r
-               return this.agentService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getNameService()\r
-        */\r
-       public INameService getNameService() {\r
-               return this.nameService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getReferenceService()\r
-        */\r
-       public IReferenceService getReferenceService() {\r
-               return this.referenceService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTaxonService()\r
-        */\r
-       public ITaxonService getTaxonService() {\r
-               return this.taxonService;\r
-       }\r
-       \r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getClassificationService()\r
-        */\r
-       public IClassificationService getClassificationService() {\r
-               return this.classificationService;\r
-       }\r
-       \r
-       public ITaxonNodeService getTaxonNodeService(){\r
-               return this.taxonNodeService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getDescriptionService()\r
-        */\r
-       public IDescriptionService getDescriptionService(){\r
-               return this.descriptionService;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getOccurrenceService()\r
-        */\r
-       public IOccurrenceService getOccurrenceService(){\r
-               return this.occurrenceService;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getMediaService()\r
-        */\r
-       public IMediaService getMediaService(){\r
-               return this.mediaService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTermService()\r
-        */\r
-       public ITermService getTermService() {\r
-               return this.termService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService()\r
-        */\r
-       public ICommonService getCommonService(){\r
-               return this.commonService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getLocationService()\r
-        */\r
-       public ILocationService getLocationService() {\r
-               return this.locationService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getUserService()\r
-        */\r
-       public IUserService getUserService() {\r
-               return this.userService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService()\r
-        */\r
-       public IService<CdmBase> getMainService(){\r
-               return this.mainService;\r
-       }\r
-       \r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCollectionService()\r
-        */\r
-       public ICollectionService getCollectionService() {\r
-               return collectionService;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureTreeService()\r
-        */\r
-       public IFeatureTreeService getFeatureTreeService() {\r
-               return featureTreeService;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureNodeService()\r
-        */\r
-       public IFeatureNodeService getFeatureNodeService(){\r
-               return featureNodeService;\r
-       }\r
-       \r
-       /*\r
-        * (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getVocabularyService()\r
-        */\r
-       public IVocabularyService getVocabularyService() {\r
-               return vocabularyService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getIdentificationKeyService()\r
-        */\r
-       public IIdentificationKeyService getIdentificationKeyService(){\r
-               return identificationKeyService;\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getPolytomousKeyService()\r
-        */\r
-       public IPolytomousKeyService getPolytomousKeyService(){\r
-               return polytomousKeyService;\r
-       }\r
-       \r
-       public IPolytomousKeyNodeService getPolytomousKeyNodeService(){\r
-               return polytomousKeyNodeService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getWorkingSetService()\r
-        */\r
-       @Override\r
-       public IWorkingSetService getWorkingSetService() {\r
-               return workingSetService;\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getGroupService()\r
-        */\r
-       @Override\r
-       public IGroupService getGroupService() {\r
-               return groupService;\r
-       }\r
-\r
-       @Override\r
-       public IDatabaseService getDatabaseService() {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-       @Override\r
-       public ProviderManager getAuthenticationManager() {\r
-               return authenticationManager;\r
-       }\r
-       \r
-    /* (non-Javadoc)\r
-     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)\r
-     */\r
-    @Override\r
-    public void setApplicationContext(ApplicationContext applicationContext)\r
-            throws BeansException {\r
-        this.applicationContext = applicationContext;\r
-    }\r
-\r
-       \r
-    @Override\r
-    public final Object getBean(String name){\r
-        return this.applicationContext.getBean(name);\r
-    }\r
-\r
-       @Override\r
-       public ConversationHolder NewConversation() {\r
-               return new ConversationHolderMock();\r
-       }\r
-       \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#authenticate(java.lang.String, java.lang.String)\r
-     */\r
-    @Override\r
-       public void authenticate(String username, String password){\r
-               UsernamePasswordAuthenticationToken tokenForUser = new UsernamePasswordAuthenticationToken(username, password);\r
-               Authentication authentication = this.getAuthenticationManager().authenticate(tokenForUser);\r
-        SecurityContext context = SecurityContextHolder.getContext();\r
-        context.setAuthentication(authentication);\r
-       }\r
-\r
-       @Override\r
-       public IGrantedAuthorityService getGrantedAuthorityService() {          \r
-               return this.grantedAuthorityService;\r
-       }\r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPermissionEvaluator()\r
-     */\r
-    @Override\r
-    public PermissionEvaluator getPermissionEvaluator() {\r
-        return permissionEvaluator;\r
-    }\r
        \r
+               \r
 }\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
index e01400e487f50c93e86fe39c11e983d95d855582..e9c3af1e9b0c51269d1894f72a9e083046f75131 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml
@@ -21,9 +21,6 @@
        <context:component-scan base-package="eu/etaxonomy/cdm/api/service">\r
        </context:component-scan>\r
  -->\r
- \r
-    <bean name="cdmApplicationRemoteDefaultConfiguration" class="eu.etaxonomy.cdm.remote.api.application.CdmApplicationRemoteDefaultConfiguration">\r
-    </bean>\r
     \r
        <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml"/>\r
  \r