#58: refactored shell to be accessible outside agent

pongasoft · May 27, 2013 · 28a564d · 28a564d
1 parent 194b34f
commit 28a564d
Show file tree

Hide file tree

Showing 35 changed files with 2,673 additions and 1,606 deletions.
diff --git a/....linkedin.glu.agent-cli-impl/src/main/groovy/org/linkedin/glu/agent/cli/ClientMain.groovy b/....linkedin.glu.agent-cli-impl/src/main/groovy/org/linkedin/glu/agent/cli/ClientMain.groovy
@@ -21,6 +21,7 @@ package org.linkedin.glu.agent.cli
 import org.linkedin.glu.agent.api.Agent
 import org.linkedin.glu.agent.rest.client.AgentFactory
 import org.linkedin.glu.agent.rest.client.AgentFactoryImpl
+import org.linkedin.glu.groovy.utils.io.GluGroovyIOUtils
 import org.linkedin.groovy.util.config.Config
 import org.linkedin.groovy.util.state.StateMachine
 import org.linkedin.util.lifecycle.Startable
@@ -168,7 +169,7 @@ class ClientMain implements Startable
 
     InputStream mis  = agent.streamCommandResults(args).stream
 
-    exitValue = AgentRestUtils.demultiplexExecStream(mis, System.out, System.err) as int
+    exitValue = GluGroovyIOUtils.demultiplexExecStream(mis, System.out, System.err) as int
   }
 
   boolean waitForCommandNoTimeOutException(Agent agent, def args)

diff --git a/agent/org.linkedin.glu.agent-impl/build.gradle b/agent/org.linkedin.glu.agent-impl/build.gradle
@@ -36,7 +36,6 @@ dependencies {
   runtime spec.external.ivy
 
   testRuntime project(':utils:org.linkedin.glu.utils.log4j-test-config')
-  testRuntime spec.external.ivy
 }
 
 idea.module.iml {

diff --git a/....glu.agent-impl/src/main/groovy/org/linkedin/glu/agent/impl/capabilities/ShellExec.groovy b/....glu.agent-impl/src/main/groovy/org/linkedin/glu/agent/impl/capabilities/ShellExec.groovy
@@ -18,7 +18,7 @@ package org.linkedin.glu.agent.impl.capabilities
 
 import org.apache.tools.ant.taskdefs.Execute
 import org.linkedin.glu.agent.api.ShellExecException
-import org.linkedin.glu.commands.impl.StreamType
+import org.linkedin.glu.groovy.utils.io.StreamType
 import org.linkedin.glu.groovy.utils.GluGroovyLangUtils
 import org.linkedin.glu.groovy.utils.io.InputGeneratorStream
 import org.linkedin.glu.groovy.utils.json.GluGroovyJsonUtils