Fixed some compile errors due to tasks relying on deprecated behaviour in Ant1.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270191 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -160,96 +160,84 @@ public class GenerateKey extends Task
             throw new TaskException( "dname must be set" );
         }
 
-        final StringBuffer sb = new StringBuffer();
+        log( "Generating Key for " + alias );
+        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        cmd.setExecutable( "keytool" );
 
-        sb.append( "keytool -genkey " );
+        cmd.createArg().setValue( "-genkey " );
 
         if( verbose )
         {
-            sb.append( "-v " );
+            cmd.createArg().setValue( "-v " );
         }
 
-        sb.append( "-alias \"" );
-        sb.append( alias );
-        sb.append( "\" " );
+        cmd.createArg().setValue( "-alias" );
+        cmd.createArg().setValue( alias );
 
         if( null != dname )
         {
-            sb.append( "-dname \"" );
-            sb.append( dname );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-dname" );
+            cmd.createArg().setValue( dname );
         }
 
         if( null != expandedDname )
         {
-            sb.append( "-dname \"" );
-            sb.append( expandedDname );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-dname" );
+            cmd.createArg().setValue( expandedDname.toString() );
         }
 
         if( null != keystore )
         {
-            sb.append( "-keystore \"" );
-            sb.append( keystore );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keystore" );
+            cmd.createArg().setValue( keystore );
         }
 
         if( null != storepass )
         {
-            sb.append( "-storepass \"" );
-            sb.append( storepass );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-storepass" );
+            cmd.createArg().setValue( storepass );
         }
 
         if( null != storetype )
         {
-            sb.append( "-storetype \"" );
-            sb.append( storetype );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-storetype" );
+            cmd.createArg().setValue( storetype );
         }
 
-        sb.append( "-keypass \"" );
+        cmd.createArg().setValue( "-keypass" );
         if( null != keypass )
         {
-            sb.append( keypass );
+            cmd.createArg().setValue( keypass );
         }
         else
         {
-            sb.append( storepass );
+            cmd.createArg().setValue( storepass );
         }
-        sb.append( "\" " );
 
         if( null != sigalg )
         {
-            sb.append( "-sigalg \"" );
-            sb.append( sigalg );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-sigalg" );
+            cmd.createArg().setValue( sigalg );
         }
 
         if( null != keyalg )
         {
-            sb.append( "-keyalg \"" );
-            sb.append( keyalg );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keyalg" );
+            cmd.createArg().setValue( keyalg );
         }
 
         if( 0 < keysize )
         {
-            sb.append( "-keysize \"" );
-            sb.append( keysize );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keysize" );
+            cmd.createArg().setValue( "" + keysize );
         }
 
         if( 0 < validity )
         {
-            sb.append( "-validity \"" );
-            sb.append( validity );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-validity" );
+            cmd.createArg().setValue( "" + validity );
         }
 
-        log( "Generating Key for " + alias );
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
-        cmd.setCommand( new Commandline( sb.toString() ) );
         cmd.setFailonerror( true );
         cmd.execute();
     }

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java

@@ -17,6 +17,7 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.rmic.RmicAdapter;
 import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory;
+import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.FileNameMapper;
@@ -680,7 +681,15 @@ public class Rmic extends MatchingTask
             File newFile = new File( sourceBaseFile, sourceFileName );
             try
             {
-                FileUtils.newFileUtils().copyFile( oldFile, newFile, filtering );
+                if( filtering )
+                {
+                    final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() );
+                    FileUtils.newFileUtils().copyFile( oldFile, newFile, filters );
+                }
+                else
+                {
+                    FileUtils.newFileUtils().copyFile( oldFile, newFile );
+                }
                 oldFile.delete();
             }
             catch( IOException ioe )

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java

@@ -165,7 +165,7 @@ public class Cab extends MatchingTask
                     exec.setOutput( outFile );
                 }
 
-                exec.setCommand( createCommand( listFile ) );
+                setupCommand( listFile, exec );
                 exec.execute();
 
                 if( outFile != null )
@@ -280,30 +280,27 @@ public class Cab extends MatchingTask
      * @param listFile Description of Parameter
      * @return Description of the Returned Value
      */
-    protected Commandline createCommand( File listFile )
+    protected void setupCommand( File listFile, ExecTask exec )
         throws TaskException
     {
-        Commandline command = new Commandline();
-        command.setExecutable( "cabarc" );
-        command.createArgument().setValue( "-r" );
-        command.createArgument().setValue( "-p" );
+        exec.setExecutable( "cabarc" );
+        exec.createArg().setValue( "-r" );
+        exec.createArg().setValue( "-p" );
 
         if( !doCompress )
         {
-            command.createArgument().setValue( "-m" );
-            command.createArgument().setValue( "none" );
+            exec.createArg().setValue( "-m" );
+            exec.createArg().setValue( "none" );
         }
 
         if( cmdOptions != null )
         {
-            command.createArgument().setLine( cmdOptions );
+            exec.createArg().setLine( cmdOptions );
         }
 
-        command.createArgument().setValue( "n" );
-        command.createArgument().setFile( cabFile );
-        command.createArgument().setValue( "@" + listFile.getAbsolutePath() );
-
-        return command;
+        exec.createArg().setValue( "n" );
+        exec.createArg().setFile( cabFile );
+        exec.createArg().setValue( "@" + listFile.getAbsolutePath() );
     }
 
     /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java

@@ -229,7 +229,7 @@ public class WLJspc extends MatchingTask
             System.out.println( "arg = " + arg );
 
             helperTask.clearArgs();
-            helperTask.setArgs( arg );
+            helperTask.createArg().setValue( arg );
             helperTask.setClasspath( compileClasspath );
             if( helperTask.executeJava() != 0 )
             {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -160,96 +160,84 @@ public class GenerateKey extends Task
             throw new TaskException( "dname must be set" );
         }
 
-        final StringBuffer sb = new StringBuffer();
+        log( "Generating Key for " + alias );
+        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        cmd.setExecutable( "keytool" );
 
-        sb.append( "keytool -genkey " );
+        cmd.createArg().setValue( "-genkey " );
 
         if( verbose )
         {
-            sb.append( "-v " );
+            cmd.createArg().setValue( "-v " );
         }
 
-        sb.append( "-alias \"" );
-        sb.append( alias );
-        sb.append( "\" " );
+        cmd.createArg().setValue( "-alias" );
+        cmd.createArg().setValue( alias );
 
         if( null != dname )
         {
-            sb.append( "-dname \"" );
-            sb.append( dname );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-dname" );
+            cmd.createArg().setValue( dname );
         }
 
         if( null != expandedDname )
         {
-            sb.append( "-dname \"" );
-            sb.append( expandedDname );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-dname" );
+            cmd.createArg().setValue( expandedDname.toString() );
         }
 
         if( null != keystore )
         {
-            sb.append( "-keystore \"" );
-            sb.append( keystore );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keystore" );
+            cmd.createArg().setValue( keystore );
         }
 
         if( null != storepass )
         {
-            sb.append( "-storepass \"" );
-            sb.append( storepass );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-storepass" );
+            cmd.createArg().setValue( storepass );
         }
 
         if( null != storetype )
         {
-            sb.append( "-storetype \"" );
-            sb.append( storetype );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-storetype" );
+            cmd.createArg().setValue( storetype );
         }
 
-        sb.append( "-keypass \"" );
+        cmd.createArg().setValue( "-keypass" );
         if( null != keypass )
         {
-            sb.append( keypass );
+            cmd.createArg().setValue( keypass );
         }
         else
         {
-            sb.append( storepass );
+            cmd.createArg().setValue( storepass );
         }
-        sb.append( "\" " );
 
         if( null != sigalg )
         {
-            sb.append( "-sigalg \"" );
-            sb.append( sigalg );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-sigalg" );
+            cmd.createArg().setValue( sigalg );
         }
 
         if( null != keyalg )
         {
-            sb.append( "-keyalg \"" );
-            sb.append( keyalg );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keyalg" );
+            cmd.createArg().setValue( keyalg );
         }
 
         if( 0 < keysize )
         {
-            sb.append( "-keysize \"" );
-            sb.append( keysize );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-keysize" );
+            cmd.createArg().setValue( "" + keysize );
         }
 
         if( 0 < validity )
         {
-            sb.append( "-validity \"" );
-            sb.append( validity );
-            sb.append( "\" " );
+            cmd.createArg().setValue( "-validity" );
+            cmd.createArg().setValue( "" + validity );
         }
 
-        log( "Generating Key for " + alias );
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
-        cmd.setCommand( new Commandline( sb.toString() ) );
         cmd.setFailonerror( true );
         cmd.execute();
     }

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java

@@ -17,6 +17,7 @@ import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.rmic.RmicAdapter;
 import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory;
+import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.FileNameMapper;
@@ -680,7 +681,15 @@ public class Rmic extends MatchingTask
             File newFile = new File( sourceBaseFile, sourceFileName );
             try
             {
-                FileUtils.newFileUtils().copyFile( oldFile, newFile, filtering );
+                if( filtering )
+                {
+                    final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() );
+                    FileUtils.newFileUtils().copyFile( oldFile, newFile, filters );
+                }
+                else
+                {
+                    FileUtils.newFileUtils().copyFile( oldFile, newFile );
+                }
                 oldFile.delete();
             }
             catch( IOException ioe )

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java

@@ -165,7 +165,7 @@ public class Cab extends MatchingTask
                     exec.setOutput( outFile );
                 }
 
-                exec.setCommand( createCommand( listFile ) );
+                setupCommand( listFile, exec );
                 exec.execute();
 
                 if( outFile != null )
@@ -280,30 +280,27 @@ public class Cab extends MatchingTask
      * @param listFile Description of Parameter
      * @return Description of the Returned Value
      */
-    protected Commandline createCommand( File listFile )
+    protected void setupCommand( File listFile, ExecTask exec )
         throws TaskException
     {
-        Commandline command = new Commandline();
-        command.setExecutable( "cabarc" );
-        command.createArgument().setValue( "-r" );
-        command.createArgument().setValue( "-p" );
+        exec.setExecutable( "cabarc" );
+        exec.createArg().setValue( "-r" );
+        exec.createArg().setValue( "-p" );
 
         if( !doCompress )
         {
-            command.createArgument().setValue( "-m" );
-            command.createArgument().setValue( "none" );
+            exec.createArg().setValue( "-m" );
+            exec.createArg().setValue( "none" );
         }
 
         if( cmdOptions != null )
         {
-            command.createArgument().setLine( cmdOptions );
+            exec.createArg().setLine( cmdOptions );
         }
 
-        command.createArgument().setValue( "n" );
-        command.createArgument().setFile( cabFile );
-        command.createArgument().setValue( "@" + listFile.getAbsolutePath() );
-
-        return command;
+        exec.createArg().setValue( "n" );
+        exec.createArg().setFile( cabFile );
+        exec.createArg().setValue( "@" + listFile.getAbsolutePath() );
     }
 
     /**

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java

@@ -229,7 +229,7 @@ public class WLJspc extends MatchingTask
             System.out.println( "arg = " + arg );
 
             helperTask.clearArgs();
-            helperTask.setArgs( arg );
+            helperTask.createArg().setValue( arg );
             helperTask.setClasspath( compileClasspath );
             if( helperTask.executeJava() != 0 )
             {