Browse Source

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
master
Conor MacNeill 24 years ago
parent
commit
bb8fa6184b
3 changed files with 8 additions and 11 deletions
  1. +4
    -5
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
  2. +4
    -5
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
  3. +0
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java

+ 4
- 5
src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java View File

@@ -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");


+ 4
- 5
src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java View File

@@ -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");


+ 0
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java View File

@@ -142,7 +142,6 @@ public class EjbcHelper {
String[] args = new String[v.size()];
v.copyInto(args);
System.out.println("args: "+args);
return args;
}



Loading…
Cancel
Save