ref #10222 adapt taxeditor to changes (DerivedUnitFacade and CondensedDistributionRec...

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / cdm / api / application / CdmApplicationRemoteConfiguration.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index 6729c9ce86dbc6ed8eae7de35341200627392d5b..4bc14613dc8fe5c28b2cc3f8c4c40413488a3438 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -15,10 +15,8 @@ import java.util.List;
 import java.util.Map;\r
 \r
 import org.apache.commons.lang3.StringUtils;\r
-import org.apache.log4j.Logger;\r
-import org.springframework.beans.BeansException;\r
-import org.springframework.context.ApplicationContext;\r
-import org.springframework.context.ApplicationContextAware;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 import org.springframework.remoting.httpinvoker.CachingHttpInvokerProxyFactoryBean;\r
 import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;\r
 import org.springframework.security.access.AccessDecisionVoter;\r
@@ -32,24 +30,19 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;\r
 import org.springframework.security.core.context.SecurityContextHolder;\r
 import org.springframework.stereotype.Component;\r
-import org.springframework.transaction.PlatformTransactionManager;\r
-import org.springframework.transaction.TransactionStatus;\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.IAnnotationService;\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.IDescriptionElementService;\r
 import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
 import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;\r
 import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;\r
 import eu.etaxonomy.cdm.api.service.IEntityValidationService;\r
 import eu.etaxonomy.cdm.api.service.IEventBaseService;\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
@@ -73,11 +66,13 @@ import eu.etaxonomy.cdm.api.service.ITermTreeService;
 import eu.etaxonomy.cdm.api.service.ITestService;\r
 import eu.etaxonomy.cdm.api.service.IUserService;\r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
+import eu.etaxonomy.cdm.api.service.geo.IDistributionService;\r
 import eu.etaxonomy.cdm.api.service.longrunningService.ILongRunningTasksService;\r
 import eu.etaxonomy.cdm.api.service.media.MediaInfoFactory;\r
 import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;\r
 import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;\r
 import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;\r
+import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService;\r
 import eu.etaxonomy.cdm.api.service.security.IAccountRegistrationService;\r
 import eu.etaxonomy.cdm.api.service.security.IPasswordResetService;\r
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;\r
@@ -105,10 +100,10 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
  */\r
 @Component\r
 // TODO split into CdmRepository and proper @Configuration class\r
-public class CdmApplicationRemoteConfiguration implements ICdmRepository, ApplicationContextAware  {\r
+public class CdmApplicationRemoteConfiguration implements ICdmRepository {\r
 \r
     @SuppressWarnings("unused")\r
-    private static final Logger logger = Logger.getLogger(CdmApplicationRemoteConfiguration.class);\r
+    private static final Logger logger = LogManager.getLogger();\r
 \r
     /**\r
      * Timeout for service lookup etc. This timeout (milliseconds) should be more\r
@@ -135,8 +130,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
      */\r
     public static final int HTTP_READ_TIMEOUT = 10 * 60 * 1000;\r
 \r
-    protected ApplicationContext applicationContext;\r
-\r
     private ICdmRemoteSource remoteSource;\r
 \r
     //TODO should be something like Map<Class<IService>, IService>, but we have no common service base interface yet\r
@@ -206,16 +199,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 \r
     // ****************************** APPLICATION CONTEXT *************************************************/\r
 \r
-    @Override\r
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException{\r
-        this.applicationContext = applicationContext;\r
-    }\r
-\r
-    @Override\r
-    public PlatformTransactionManager getTransactionManager() throws UnsupportedOperationException {\r
-        throw new UnsupportedOperationException("getTransactionManager is not implemented for CdmApplicationRemoteConfiguration");\r
-    }\r
-\r
     public IEditGeoService getEditGeoService() {\r
         return (IEditGeoService) getService(IEditGeoService.class, "/remoting/editgeo.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
@@ -236,11 +219,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
 \r
  // ****************************** GETTER *************************************************/\r
 \r
-    @Override\r
-    public final Object getBean(String name){\r
-        throw new UnsupportedOperationException("getBean is not implemented for CdmApplicationRemoteConfiguration");\r
-    }\r
-\r
     @Override\r
     public IAccountRegistrationService getAccountRegistrationService() {\r
         return (IAccountRegistrationService) getService(IAccountRegistrationService.class, "/remoting/accountregistrationservice.service", new AuthenticatingHttpInvokerRequestExecutor());\r
@@ -291,6 +269,16 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return (IDescriptionService) getService(IDescriptionService.class, "/remoting/description.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
+    @Override\r
+    public IDistributionService getDistributionService(){\r
+        return (IDistributionService) getService(IDistributionService.class, "/remoting/distribution.service", new AuthenticatingHttpInvokerRequestExecutor());\r
+    }\r
+\r
+    @Override\r
+    public IDescriptionElementService getDescriptionElementService(){\r
+        return (IDescriptionElementService) getService(IDescriptionElementService.class, "/remoting/descriptionelement.service", new AuthenticatingHttpInvokerRequestExecutor());\r
+    }\r
+\r
     @Override\r
     public IOccurrenceService getOccurrenceService(){\r
         return (IOccurrenceService) getService(IOccurrenceService.class, "/remoting/occurrence.service", new AuthenticatingHttpInvokerRequestExecutor());\r
@@ -385,31 +373,16 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return new ProviderManager(Arrays.asList((AuthenticationProvider)daoAuthenticationProvider));\r
     }\r
 \r
-\r
-    @Override\r
-    public ConversationHolder NewConversation() {\r
-        return new ConversationHolderMock();\r
-    }\r
-\r
     @Override\r
     public ICollectionService getCollectionService(){\r
         return (ICollectionService) getService(ICollectionService.class, "/remoting/collection.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
-    @Override\r
-    public IFeatureTreeService getFeatureTreeService(){\r
-        return (IFeatureTreeService) getService(IFeatureTreeService.class, "/remoting/featuretree.service", new AuthenticatingHttpInvokerRequestExecutor());\r
-    }\r
     @Override\r
     public ITermTreeService getTermTreeService() {\r
        return (ITermTreeService) getService(ITermTreeService.class, "/remoting/termtree.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
-    @Override\r
-    public IFeatureNodeService getFeatureNodeService(){\r
-        return (IFeatureNodeService) getService(IFeatureNodeService.class, "/remoting/featurenode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
-    }\r
-\r
        @Override\r
        public ITermNodeService getTermNodeService() {\r
         return (ITermNodeService) getService(ITermNodeService.class, "/remoting/termnode.service", new AuthenticatingHttpInvokerRequestExecutor());\r
@@ -450,6 +423,11 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return (IRegistrationService) getService(IRegistrationService.class, "/remoting/registration.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
+    @Override\r
+    public IRegistrationWorkingSetService getRegistrationWorkingSetService() {\r
+        return (IRegistrationWorkingSetService) getService(IRegistrationWorkingSetService.class, "/remoting/registrationworkingset.service", new AuthenticatingHttpInvokerRequestExecutor());\r
+    }\r
+\r
     @Override\r
     public IGroupService getGroupService(){\r
         return (IGroupService) getService(IGroupService.class, "/remoting/group.service", new AuthenticatingHttpInvokerRequestExecutor());\r
@@ -500,26 +478,6 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return cdmPermissionEvaluator;\r
     }\r
 \r
-    @Override\r
-    public TransactionStatus startTransaction() throws UnsupportedOperationException {\r
-        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-    }\r
-\r
-    @Override\r
-    public TransactionStatus startTransaction(Boolean readOnly) throws UnsupportedOperationException {\r
-        throw new UnsupportedOperationException("startTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-    }\r
-\r
-    @Override\r
-    public void commitTransaction(TransactionStatus txStatus) throws UnsupportedOperationException {\r
-        throw new UnsupportedOperationException("commitTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-    }\r
-\r
-       @Override\r
-       public void rollbackTransaction(TransactionStatus arg0) {\r
-        throw new UnsupportedOperationException("rollbackTransaction is not implemented for CdmApplicationRemoteConfiguration");\r
-       }\r
-\r
     @Override\r
     public void authenticate(String username, String password){\r
         UsernamePasswordAuthenticationToken tokenForUser = new UsernamePasswordAuthenticationToken(username, password);\r