From 1ed2d338d7a6b3d4770105ebbcbd27f147a49b96 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Tue, 11 Feb 2014 15:28:41 +0000 Subject: [PATCH] remotingApplicationContext : removing configuration bean declaration CdmApplicationRemoteController : removed call to init configuration bean via application context CdmApplicationRemoteDefaultConfiguration : refactoring code to cplit configuration into default / remote --- .../CdmApplicationRemoteController.java | 2 +- ...ApplicationRemoteDefaultConfiguration.java | 331 +----------------- .../cdm/remotingApplicationContext.xml | 3 - 3 files changed, 5 insertions(+), 331 deletions(-) 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 6c4755ac7..2a870877f 100644 --- 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); } } - configuration = (ICdmApplicationRemoteConfiguration)applicationContext.getBean("cdmApplicationRemoteDefaultConfiguration"); + configuration = new CdmApplicationRemoteDefaultConfiguration(); } 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 c5a4dba90..76df0e5d8 100644 --- 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; import org.apache.log4j.Logger; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.security.access.PermissionEvaluator; -import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock; -import eu.etaxonomy.cdm.api.service.IAgentService; -import eu.etaxonomy.cdm.api.service.IClassificationService; -import eu.etaxonomy.cdm.api.service.ICollectionService; -import eu.etaxonomy.cdm.api.service.ICommonService; -import eu.etaxonomy.cdm.api.service.IDatabaseService; -import eu.etaxonomy.cdm.api.service.IDescriptionService; -import eu.etaxonomy.cdm.api.service.IFeatureNodeService; -import eu.etaxonomy.cdm.api.service.IFeatureTreeService; -import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService; -import eu.etaxonomy.cdm.api.service.IGroupService; -import eu.etaxonomy.cdm.api.service.IIdentificationKeyService; -import eu.etaxonomy.cdm.api.service.ILocationService; -import eu.etaxonomy.cdm.api.service.IMediaService; -import eu.etaxonomy.cdm.api.service.INameService; -import eu.etaxonomy.cdm.api.service.IOccurrenceService; -import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService; -import eu.etaxonomy.cdm.api.service.IPolytomousKeyService; -import eu.etaxonomy.cdm.api.service.IReferenceService; -import eu.etaxonomy.cdm.api.service.IService; -import eu.etaxonomy.cdm.api.service.ITaxonNodeService; -import eu.etaxonomy.cdm.api.service.ITaxonService; -import eu.etaxonomy.cdm.api.service.ITermService; -import eu.etaxonomy.cdm.api.service.IUserService; -import eu.etaxonomy.cdm.api.service.IVocabularyService; -import eu.etaxonomy.cdm.api.service.IWorkingSetService; -import eu.etaxonomy.cdm.model.common.CdmBase; +import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultConfiguration; /** * @author a.mueller @@ -62,300 +26,13 @@ import eu.etaxonomy.cdm.model.common.CdmBase; * @author j.koch */ @Component -public class CdmApplicationRemoteDefaultConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware { +public class CdmApplicationRemoteDefaultConfiguration extends CdmApplicationDefaultConfiguration implements ICdmApplicationRemoteConfiguration, ApplicationContextAware { + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(CdmApplicationRemoteDefaultConfiguration.class); - @Autowired - //@Qualifier("nameService") - private INameService nameService; - @Autowired - //@Qualifier("taxonService") - private ITaxonService taxonService; - @Autowired - //@Qualifier("classificationService") - private IClassificationService classificationService; - @Autowired - //@Qualifier("referenceService") - private IReferenceService referenceService; - @Autowired - //@Qualifier("agentService") - private IAgentService agentService; - @Autowired - //@Qualifier("termService") - private ITermService termService; - @Autowired - //@Qualifier("descriptionService") - private IDescriptionService descriptionService; - @Autowired - //@Qualifier("occurrenceService") - private IOccurrenceService occurrenceService; - @Autowired - //@Qualifier("mediaService") - private IMediaService mediaService; - @Autowired - //@Qualifier("commonService") - private ICommonService commonService; - @Autowired - private ILocationService locationService; - @Autowired - private IUserService userService; - @Autowired - private IGroupService groupService; - @Autowired - private ICollectionService collectionService; - @Autowired - private IFeatureTreeService featureTreeService; - @Autowired - private IFeatureNodeService featureNodeService; - @Autowired - private IVocabularyService vocabularyService; - @Autowired - private ITaxonNodeService taxonNodeService; - @Autowired - private IIdentificationKeyService identificationKeyService; - @Autowired - private IPolytomousKeyService polytomousKeyService; - @Autowired - private IPolytomousKeyNodeService polytomousKeyNodeService; - @Autowired - private IGrantedAuthorityService grantedAuthorityService; -// @Autowired - //@Qualifier("mainService") - private IService mainService; - - @Autowired - private IWorkingSetService workingSetService; - @Autowired - private ProviderManager authenticationManager; - @Autowired - private PermissionEvaluator permissionEvaluator; - - protected ApplicationContext applicationContext; - - /** - * - */ public CdmApplicationRemoteDefaultConfiguration() { } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getAgentService() - */ - public IAgentService getAgentService() { - return this.agentService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getNameService() - */ - public INameService getNameService() { - return this.nameService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getReferenceService() - */ - public IReferenceService getReferenceService() { - return this.referenceService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTaxonService() - */ - public ITaxonService getTaxonService() { - return this.taxonService; - } - - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getClassificationService() - */ - public IClassificationService getClassificationService() { - return this.classificationService; - } - - public ITaxonNodeService getTaxonNodeService(){ - return this.taxonNodeService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getDescriptionService() - */ - public IDescriptionService getDescriptionService(){ - return this.descriptionService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getOccurrenceService() - */ - public IOccurrenceService getOccurrenceService(){ - return this.occurrenceService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getMediaService() - */ - public IMediaService getMediaService(){ - return this.mediaService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getTermService() - */ - public ITermService getTermService() { - return this.termService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService() - */ - public ICommonService getCommonService(){ - return this.commonService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getLocationService() - */ - public ILocationService getLocationService() { - return this.locationService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getUserService() - */ - public IUserService getUserService() { - return this.userService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCommonService() - */ - public IService getMainService(){ - return this.mainService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getCollectionService() - */ - public ICollectionService getCollectionService() { - return collectionService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureTreeService() - */ - public IFeatureTreeService getFeatureTreeService() { - return featureTreeService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getFeatureNodeService() - */ - public IFeatureNodeService getFeatureNodeService(){ - return featureNodeService; - } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getVocabularyService() - */ - public IVocabularyService getVocabularyService() { - return vocabularyService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getIdentificationKeyService() - */ - public IIdentificationKeyService getIdentificationKeyService(){ - return identificationKeyService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getPolytomousKeyService() - */ - public IPolytomousKeyService getPolytomousKeyService(){ - return polytomousKeyService; - } - - public IPolytomousKeyNodeService getPolytomousKeyNodeService(){ - return polytomousKeyNodeService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getWorkingSetService() - */ - @Override - public IWorkingSetService getWorkingSetService() { - return workingSetService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationRemoteConfiguration#getGroupService() - */ - @Override - public IGroupService getGroupService() { - return groupService; - } - - @Override - public IDatabaseService getDatabaseService() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ProviderManager getAuthenticationManager() { - return authenticationManager; - } - - /* (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ - @Override - public void setApplicationContext(ApplicationContext applicationContext) - throws BeansException { - this.applicationContext = applicationContext; - } - - - @Override - public final Object getBean(String name){ - return this.applicationContext.getBean(name); - } - - @Override - public ConversationHolder NewConversation() { - return new ConversationHolderMock(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#authenticate(java.lang.String, java.lang.String) - */ - @Override - public void authenticate(String username, String password){ - UsernamePasswordAuthenticationToken tokenForUser = new UsernamePasswordAuthenticationToken(username, password); - Authentication authentication = this.getAuthenticationManager().authenticate(tokenForUser); - SecurityContext context = SecurityContextHolder.getContext(); - context.setAuthentication(authentication); - } - - @Override - public IGrantedAuthorityService getGrantedAuthorityService() { - return this.grantedAuthorityService; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPermissionEvaluator() - */ - @Override - public PermissionEvaluator getPermissionEvaluator() { - return permissionEvaluator; - } + } 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 e01400e48..e9c3af1e9 100644 --- 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 @@ --> - - - -- 2.34.1