From bb8fa6184b499fd877d7fb766944dd1b1afacb81 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sun, 19 Nov 2000 09:08:57 +0000 Subject: [PATCH] Set arguments using the Commandline method rather than the deprecated setArgs method. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268209 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/ejb/DDCreator.java | 9 ++++----- .../org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java | 9 ++++----- .../tools/ant/taskdefs/optional/ejb/EjbcHelper.java | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index 5986cac83..8538cb7fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -53,11 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; +import org.apache.tools.ant.*; import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.*; import java.io.File; @@ -128,7 +126,8 @@ public class DDCreator extends MatchingTask { Java ddCreatorTask = (Java)project.createTask("java"); ddCreatorTask.setFork(true); ddCreatorTask.setClassname("org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper"); - ddCreatorTask.setArgs(args); + Commandline.Argument arguments = ddCreatorTask.createArg(); + arguments.setLine(args); ddCreatorTask.setClasspath(new Path(project, execClassPath)); if (ddCreatorTask.executeJava() != 0) { throw new BuildException("Execution of ddcreator helper failed"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 4f165d4e7..1c3af9b74 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -53,11 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; +import org.apache.tools.ant.*; import org.apache.tools.ant.taskdefs.*; -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.*; import java.io.File; @@ -151,7 +149,8 @@ public class Ejbc extends MatchingTask { args += " " + files[i]; } - helperTask.setArgs(args); + Commandline.Argument arguments = helperTask.createArg(); + arguments.setLine(args); helperTask.setClasspath(new Path(project, execClassPath)); if (helperTask.executeJava() != 0) { throw new BuildException("Execution of ejbc helper failed"); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java index d9ab5121b..db67e58d3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java @@ -142,7 +142,6 @@ public class EjbcHelper { String[] args = new String[v.size()]; v.copyInto(args); - System.out.println("args: "+args); return args; }