merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / taxeditor / service / CdmServiceRequestExecutor.java

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 439e84507f0f4ea37282dba5004e6ae1feb52eb8..218d94dd85531cb159d8be325f7ed0b0473df27c 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
@@ -6,12 +6,11 @@ import java.io.OutputStream;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.remoting.support.RemoteInvocation;
 import org.springframework.remoting.support.RemoteInvocationResult;
-import org.springframework.security.remoting.httpinvoker.AuthenticationSimpleHttpInvokerRequestExecutor;
 
-public abstract class CdmServiceRequestExecutor extends AuthenticationSimpleHttpInvokerRequestExecutor {
-       
+public abstract class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerRequestExecutor {
+
        private RemoteInvocation currentRemoteInvocation;
-       
+
        @Override
        protected void writeRemoteInvocation(RemoteInvocation invocation, OutputStream os) throws IOException {
                currentRemoteInvocation = invocation;
@@ -24,17 +23,17 @@ public abstract class CdmServiceRequestExecutor extends AuthenticationSimpleHttp
                                        throws java.io.IOException,
                                        java.lang.ClassNotFoundException {
                RemoteInvocationResult rir = fromCache(currentRemoteInvocation);
-       
+
                if(rir == null) {
                        rir = super.doExecuteRequest(config, baos);
                        cache(currentRemoteInvocation, rir);
-               } 
-               
+               }
+
                currentRemoteInvocation = null;
                return rir;
        }
-       
+
        public abstract void cache(RemoteInvocation ri, RemoteInvocationResult rir);
-       
+
        public abstract RemoteInvocationResult fromCache(RemoteInvocation ri);
 }