X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultAgentCli.java;fp=org.argeo.slc.core%2Fsrc%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultAgentCli.java;h=e02d50f2f30af2ba6bc1788c83fb6cbed2f0f3f2;hb=c4282a516108d936112fbd4b91291563ec30a5e4;hp=f790a7945552c4febda588504abd804a461dccc3;hpb=a922e3cb35c6182dbbb40c29eee42f7320c298ee;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgentCli.java b/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgentCli.java index f790a7945..e02d50f2f 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgentCli.java +++ b/org.argeo.slc.core/src/org/argeo/slc/core/execution/DefaultAgentCli.java @@ -10,7 +10,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.security.OsAuthenticationToken; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -20,9 +19,6 @@ import org.argeo.slc.execution.ExecutionSpec; import org.argeo.slc.execution.ExecutionSpecAttribute; import org.argeo.slc.execution.SlcAgent; import org.argeo.slc.execution.SlcAgentCli; -import org.springframework.security.core.Authentication; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.core.context.SecurityContextHolder; /** * Authenticates thread and executes synchronously a command line execution. @@ -33,18 +29,18 @@ public class DefaultAgentCli implements SlcAgentCli { private final static String UTF8 = "UTF-8"; private SlcAgent agent; - private AuthenticationManager authenticationManager; +// private AuthenticationManager authenticationManager; private Long timeout = 24 * 60 * 60 * 1000l; public String process(String[] args) { - if (SecurityContextHolder.getContext().getAuthentication() == null) { - OsAuthenticationToken oat = new OsAuthenticationToken(); - Authentication authentication = authenticationManager - .authenticate(oat); - SecurityContextHolder.getContext() - .setAuthentication(authentication); - } +// if (SecurityContextHolder.getContext().getAuthentication() == null) { +// OsAuthenticationToken oat = new OsAuthenticationToken(); +// Authentication authentication = authenticationManager +// .authenticate(oat); +// SecurityContextHolder.getContext() +// .setAuthentication(authentication); +// } if (args.length > 0 && args[0].equals("help")) { StringBuilder buf = new StringBuilder(); @@ -230,10 +226,10 @@ public class DefaultAgentCli implements SlcAgentCli { this.agent = agent; } - public void setAuthenticationManager( - AuthenticationManager authenticationManager) { - this.authenticationManager = authenticationManager; - } +// public void setAuthenticationManager( +// AuthenticationManager authenticationManager) { +// this.authenticationManager = authenticationManager; +// } public void setTimeout(Long timeout) { this.timeout = timeout;