ref #8841 cleaning up application context config - step 1

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 3daaa7a9a3224142c423d19aaa58319d0647c78c..7c0765ba761aa4716a547c50695069fab0f9e3be 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
@@ -103,6 +103,7 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
  *\r
  */\r
 @Component\r
+// TODO split configurations into proper @Configuration class\r
 public class CdmApplicationRemoteConfiguration implements ICdmRepository, ApplicationContextAware  {\r
 \r
     @SuppressWarnings("unused")\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
index 90fab0c977fb8f80abb61b2f978e95bd4412fca4..5335475d65e19bb07aa2b464f77417df46e42467 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
@@ -96,4 +96,11 @@ public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerReques
        public RemoteInvocationResult fromCache(RemoteInvocation ri) {
            return null;
        }
+
+        @Override
+           public void setReadTimeout(int timeout) {
+               logger.info("Read time our set to: " + timeout + " ms");
+               super.setReadTimeout(timeout);
+           }
+
 }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
deleted file mode 100644 (file)
index 7b54c92..0000000
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml
+++ /dev/null
@@ -1,670 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"\r
-  xmlns:tx="http://www.springframework.org/schema/tx"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd\r
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd\r
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">\r
-\r
-\r
-  <bean id="agentService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/agent.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IAgentService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="annotationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/annotation.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IAnnotationService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="auditeventService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/auditevent.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IAuditEventService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="classificationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/classification.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IClassificationService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="collectionService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/collection.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ICollectionService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="commonService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/common.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ICommonService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="descriptionService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/description.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IDescriptionService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="editGeoService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/editgeo.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.ext.geo.IEditGeoService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="featureNodeService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featurenode.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IFeatureNodeService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="featureTreeService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/featuretree.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IFeatureTreeService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="groupService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/group.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IGroupService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="identificationKeyService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/identificationkey.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IIdentificationKeyService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="locationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/location.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ILocationService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="markerService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/marker.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IMarkerService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="mediaService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/media.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IMediaService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="nameService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/name.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.INameService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="occurrenceService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/occurrence.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IOccurrenceService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="polytomousKeyNodeService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskeynode.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="polytomousKeyService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/polytomouskey.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IPolytomousKeyService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="referenceService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/reference.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IReferenceService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="taxonNodeService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxonnode.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ITaxonNodeService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="taxonService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/taxon.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ITaxonService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="termService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/term.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ITermService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.TermServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="userService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting-public/user.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IUserService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean\r
-        class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="vocabularyService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/vocabulary.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IVocabularyService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="descriptiveDataSetService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/descriptivedataset.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="grantedAuthorityService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/grantedauthority.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IGrantedAuthorityService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="databaseService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/database.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IDatabaseService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="lsidAuthorityService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidauthoruty.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDAuthorityService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="lsidMetadataService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsidmetadata.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDMetadataService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="lsiDataService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/lsiddata.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.lsid.LSIDDataService</value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-\r
-\r
-  <bean id="primerService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/primer.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.molecular.IPrimerService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="amplificationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/amplification.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.molecular.IAmplificationService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="sequenceService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/sequence.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.molecular.ISequenceService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="eventBaseService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/eventbase.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IEventBaseService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="entityValidationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityvalidation.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IEntityValidationService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="entityConstraintViolationService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/entityconstraintviolation.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-  \r
-  <bean id="ioService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/io.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.io.service.IIOService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmAuthenticatedHttpInvokerRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-  \r
-   <bean id="longRunningTasksService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/longrunningtasks.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.longrunningService.ILongRunningTasksService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmAuthenticatedHttpInvokerRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-  </bean>\r
-\r
-  <bean id="testService" lazy-init="true"\r
-    class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
-    <property name="serviceUrl">\r
-      <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/test.service\r
-      </value>\r
-    </property>\r
-    <property name="serviceInterface">\r
-      <value>eu.etaxonomy.cdm.api.service.ITestService\r
-      </value>\r
-    </property>\r
-    <property name="httpInvokerRequestExecutor">\r
-      <bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
-        <property name="readTimeout" value="0" />\r
-      </bean>\r
-    </property>\r
-\r
-  </bean>\r
-\r
-\r
-\r
-</beans>\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml
index f09d0c992267aad02f7cee2b7af1d28d7d9cb05e..7bbddf131f31f80e37c5b8de700991498b01abdd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml
@@ -12,8 +12,9 @@
   <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
     <property name="omit" value="false" />
   </bean>
-
-  <context:component-scan base-package="eu/etaxonomy/taxeditor/session" />
+  
+  <bean id="cdmEntitySessionManager" class="eu.etaxonomy.taxeditor.session.CdmEntitySessionManager" />
+  
   <import resource="classpath:/eu/etaxonomy/cdm/remote.xml" />
   <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml" />
 
@@ -31,7 +32,4 @@
     <context:exclude-filter type="regex"
       expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" />
   </context:component-scan>
-
-  <context:component-scan base-package="eu/etaxonomy/taxeditor/remoting/session/mock" />
-
 </beans>

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 7dc046a2e40c02011b2ae00794b1ba4ec4ac8a33..e523362536904251b8e45738b920e23fd8ef3040 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
@@ -5,8 +5,11 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
     http://www.springframework.org/schema/context  http://www.springframework.org/schema/context/spring-context-3.1.xsd">\r
-\r
-  <import resource="classpath:/eu/etaxonomy/cdm/httpInvokerServiceClients.xml" />\r
+    \r
+  <!--\r
+   UNUSED: replaced by CdmApplicationRemoteConfiguration but CdmApplicationRemoteConfiguration should be transformed into \r
+   proper configuration class see type level TODO in this class  \r
+   -->  \r
 \r
   <bean id="cdmEntitySessionManager"  \r
     class="eu.etaxonomy.taxeditor.session.CdmEntitySessionManager" />\r