X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fmaven%2FMavenDeployEnvironment.java;h=223eb300fc2b71ce17aba4def2c85a9f298039c2;hb=25d89428acf5108e3732511573ffc9ed80796d99;hp=d10b073e1e972f9574b8aff3884efbf479b46168;hpb=a7b136d40c14e4559faa5c34dc2b4dd2170ac2d4;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java index d10b073e1..223eb300f 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java @@ -8,7 +8,7 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.ant.AntRegistryUtil; +import org.argeo.slc.ant.AntRunner; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.deploy.DeployEnvironment; @@ -39,7 +39,7 @@ public class MavenDeployEnvironment implements DeployEnvironment { } try { - File tempDir = new File("/tmp/"+UUID.randomUUID().toString()); + File tempDir = new File("/tmp/" + UUID.randomUUID().toString()); tempDir.mkdirs(); targetLocation.mkdirs(); Properties props = new Properties(); @@ -52,9 +52,9 @@ public class MavenDeployEnvironment implements DeployEnvironment { "org/argeo/slc/support/deploy/ant/build.xml"); if (type == null || type.equals("zip")) { - AntRegistryUtil.runAll(antUrl, "deployZip", props); + new AntRunner(antUrl, "deployZip", props).run(); } else if (type.equals("tar.gz")) { - AntRegistryUtil.runAll(antUrl, "deployTarGz", props); + new AntRunner(antUrl, "deployTarGz", props).run(); } else { throw new SlcException("Unknow package type " + type); }