ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types CommandlineJava.java
Date Sat, 12 Jan 2002 23:57:41 GMT
donaldp     02/01/12 15:57:41

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/types
                        CommandlineJava.java
  Log:
  Starting to clean this adaptor
  
  Revision  Changes    Path
  1.16      +5 -10     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CommandlineJava.java	12 Jan 2002 05:01:23 -0000	1.15
  +++ CommandlineJava.java	12 Jan 2002 23:57:41 -0000	1.16
  @@ -9,6 +9,7 @@
   
   import org.apache.myrmidon.api.TaskException;
   import org.apache.aut.nativelib.Os;
  +import org.apache.avalon.excalibur.util.StringUtil;
   import java.io.File;
   
   /**
  @@ -178,14 +179,6 @@
           sysProperties.addVariable( sysp );
       }
   
  -    /**
  -     * Clear out the java arguments.
  -     */
  -    public void clearJavaArgs()
  -    {
  -        javaCommand.clearArgs();
  -    }
  -
       public Argument createArgument()
       {
           return javaCommand.createArgument();
  @@ -239,7 +232,8 @@
       {
           try
           {
  -            return Commandline.toString( getCommandline() );
  +            String[] line = getCommandline();
  +            return StringUtil.join( line, " " );
           }
           catch( TaskException e )
           {
  @@ -249,7 +243,8 @@
   
       private Commandline getActualVMCommand()
       {
  -        Commandline actualVMCommand = (Commandline)vmCommand.clone();
  +        Commandline actualVMCommand = new Commandline();
  +        //(Commandline)vmCommand.clone();
           if( maxMemory != null )
           {
               actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory );
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message