Return-Path: <conor@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 31763 invoked by uid 500); 19 Nov 2000 09:08:58 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 31759 invoked by uid 1142); 19 Nov 2000 09:08:58 -0000
Date: 19 Nov 2000 09:08:58 -0000
Message-ID: <20001119090858.31758.qmail@locus.apache.org>
From: conor@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb
 DDCreator.java Ejbc.java EjbcHelper.java

conor       00/11/19 01:08:57

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        DDCreator.java Ejbc.java EjbcHelper.java
  Log:
  Set arguments using the Commandline method rather than the deprecated setArgs
  method.
  
  Revision  Changes    Path
  1.6       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
  
  Index: DDCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DDCreator.java	2000/07/31 12:09:29	1.5
  +++ DDCreator.java	2000/11/19 09:08:57	1.6
  @@ -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 @@
           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");
  
  
  
  1.9       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
  
  Index: Ejbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Ejbc.java	2000/11/19 08:59:23	1.8
  +++ Ejbc.java	2000/11/19 09:08:57	1.9
  @@ -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 @@
               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");
  
  
  
  1.6       +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
  
  Index: EjbcHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EjbcHelper.java	2000/11/19 08:59:23	1.5
  +++ EjbcHelper.java	2000/11/19 09:08:57	1.6
  @@ -142,7 +142,6 @@
       
           String[] args = new String[v.size()];
           v.copyInto(args);
  -        System.out.println("args: "+args);
           return args;
       }