ref #8842 claning up - removing obsolete classes and renaming

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

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
similarity index 84%
rename from eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
rename to eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
index f621c0b52c8142bd87ff6fe1de68daf7dd814ce2..6b67d133e83d010766d7eba9eababb9a74f90b62 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/AuthenticatingHttpInvokerRequestExecutor.java
@@ -15,21 +15,20 @@ import org.apache.http.client.methods.HttpPost;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
-
-import eu.etaxonomy.cdm.api.application.CdmApplicationState;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
  * @author cmathew
  * @date 27 Jan 2015
  *
  */
-public class CdmAuthenticatedHttpInvokerRequestExecutor extends TimestampingHttpInvokerRequestExecutor {
+public class AuthenticatingHttpInvokerRequestExecutor extends TimestampingHttpInvokerRequestExecutor {
 
     @Override
     protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
        HttpPost postMethod = super.createHttpPost(config);
 
-        SecurityContext securityContext = CdmApplicationState.getCurrentSecurityContext();
+        SecurityContext securityContext = SecurityContextHolder.getContext();
         if(securityContext != null) {
             Authentication auth = securityContext.getAuthentication();
             if ((auth != null) && (auth.getName() != null) &&