isRemoting is no longer based on a bean in the application context, but

the type of cdm source

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
index 6b76cb92ec7328a5b03b2ce267fe4b22b851bdfe..e6841035b006c86e34fadc4ffca125640c6a7789 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
@@ -64,6 +64,7 @@ import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.model.common.PersistentMultiLanguageText;
@@ -1231,9 +1232,9 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
        
        public static void setConfiguration(ICdmApplicationConfiguration conf) {
                configuration = conf;
-               Boolean isRemoting = (Boolean)configuration.getBean("isRemoting");              
-               if(isRemoting != null) {
-                       remoting = isRemoting.booleanValue();
+                       
+               if(conf instanceof CdmApplicationRemoteController) {
+                       remoting = true;
                } else {
                        remoting = false;
                }

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
index d0b8274468a64abfc4c765a0b76f5446b0295298..4d2db1551f9dc872e5a57a94573326f1870cb469 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
@@ -44,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.stereotype.Component;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -429,9 +430,9 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
        
        public static void setConfiguration(ICdmApplicationConfiguration conf) {
                configuration = conf;
-               Boolean isRemoting = (Boolean)configuration.getBean("isRemoting");
-               if(isRemoting != null) {
-                       remoting = isRemoting.booleanValue();
+               
+               if(conf instanceof CdmApplicationRemoteController) {
+                       remoting = true;
                } else {
                        remoting = false;
                }

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
index 29bacfa4330ef795d38752fc3c3bb1fada2da9c4..4b121cf02957ea483cced8e927a6f447bcf5f324 100644 (file)
--- 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
@@ -440,13 +440,39 @@
                </property>\r
        </bean>\r
        \r
-          <bean id="primerService"\r
+       <bean id="primerService"\r
                class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
                <property name="serviceUrl">\r
                        <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/primer.service</value>\r
                </property>\r
                <property name="serviceInterface">\r
-                       <value>eu.etaxonomy.cdm.api.service.IPrimerService</value>\r
+                       <value>eu.etaxonomy.cdm.api.service.molecular.IPrimerService</value>\r
+               </property>\r
+               <property name="httpInvokerRequestExecutor">\r
+                       <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\r
+               </property>\r
+       </bean>\r
+       \r
+       <bean id="amplificationService"\r
+               class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
+               <property name="serviceUrl">\r
+                       <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/amplification.service</value>\r
+               </property>\r
+               <property name="serviceInterface">\r
+                       <value>eu.etaxonomy.cdm.api.service.molecular.IAmplificationService</value>\r
+               </property>\r
+               <property name="httpInvokerRequestExecutor">\r
+                       <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\r
+               </property>\r
+       </bean>\r
+       \r
+       <bean id="sequenceService"\r
+               class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
+               <property name="serviceUrl">\r
+                       <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/sequence.service</value>\r
+               </property>\r
+               <property name="serviceInterface">\r
+                       <value>eu.etaxonomy.cdm.api.service.molecular.ISequenceService</value>\r
                </property>\r
                <property name="httpInvokerRequestExecutor">\r
                        <bean class="org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor" />\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 b55fc4cae2a31de16de2118b6cf9ae8e1de62fc1..825c80acd487e13ccdecc357c9f3487f5d091ab1 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
@@ -7,9 +7,6 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
        \r
-       <bean id="isRemoting" class="java.lang.Boolean">\r
-       <constructor-arg value="true" />\r
-       </bean> \r
        \r
     <!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->\r
         \r