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/util FileNameMapper.java
Date Sun, 16 Dec 2001 04:12:40 GMT
donaldp     01/12/15 20:12:40

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant
                        DefaultLogger.java Project.java ProjectHelper.java
                        UnknownElement.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        ExecuteOn.java ExecuteStreamHandler.java
                        FixCRLF.java GenerateKey.java Get.java Javadoc.java
                        RecorderEntry.java Rmic.java SignJar.java Tar.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
                        Cab.java IContract.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        Continuus.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandDeploymentTool.java DDCreator.java Ejbc.java
                        WLRun.java WeblogicDeploymentTool.java
                        WebsphereDeploymentTool.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntToolGUI.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        WLJspc.java
               proposal/myrmidon/src/main/org/apache/tools/ant/util
                        FileNameMapper.java
  Log:
  Fix a few more instances where TaskException was treated as a runtime exception.
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
  
  Index: DefaultLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultLogger.java	2001/12/16 01:01:19	1.2
  +++ DefaultLogger.java	2001/12/16 04:12:39	1.3
  @@ -165,7 +165,7 @@
               // Print out the name of the task if we're in one
               if( event.getTask() != null )
               {
  -                String name = event.getTask().getTaskName();
  +                String name = event.getTask().getName();
   
                   if( !emacsMode )
                   {
  
  
  
  1.4       +0 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Project.java	2001/12/16 03:10:44	1.3
  +++ Project.java	2001/12/16 04:12:39	1.4
  @@ -842,9 +842,6 @@
               task.setProject( this );
               task.setTaskType( taskType );
   
  -            // set default value, can be changed by the user
  -            task.setTaskName( taskType );
  -
               String msg = "   +Task: " + taskType;
               log( msg, MSG_DEBUG );
               addCreatedTask( taskType, task );
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectHelper.java	2001/12/16 03:10:44	1.4
  +++ ProjectHelper.java	2001/12/16 04:12:39	1.5
  @@ -1015,7 +1015,6 @@
                   task = new UnknownElement( tag );
                   task.setProject( project );
                   task.setTaskType( tag );
  -                task.setTaskName( tag );
               }
   
               configureId( task, attrs );
  
  
  
  1.4       +0 -11     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UnknownElement.java	2001/12/16 03:10:44	1.3
  +++ UnknownElement.java	2001/12/16 04:12:39	1.4
  @@ -65,17 +65,6 @@
       }
   
       /**
  -     * Get the name to use in logging messages.
  -     *
  -     * @return the name to use in logging messages.
  -     */
  -    public String getTaskName()
  -    {
  -        return realThing == null || !( realThing instanceof Task ) ?
  -            super.getTaskName() : ( (Task)realThing ).getTaskName();
  -    }
  -
  -    /**
        * Adds a child element to this element.
        *
        * @param child The feature to be added to the Child attribute
  
  
  
  1.7       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExecuteOn.java	2001/12/16 02:05:41	1.6
  +++ ExecuteOn.java	2001/12/16 04:12:39	1.7
  @@ -296,6 +296,7 @@
        * @return The Commandline value
        */
       protected String[] getCommandline( String srcFile, File baseDir )
  +        throws TaskException
       {
           return getCommandline( new String[]{srcFile}, new File[]{baseDir} );
       }
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
  
  Index: ExecuteStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExecuteStreamHandler.java	2001/12/16 01:31:38	1.3
  +++ ExecuteStreamHandler.java	2001/12/16 04:12:39	1.4
  @@ -46,7 +46,7 @@
        * @exception IOException Description of Exception
        */
       void setProcessOutputStream( InputStream is )
  -        throws IOException;
  +        throws TaskException, IOException;
   
       /**
        * Start handling of the streams.
  
  
  
  1.5       +5 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FixCRLF.java	2001/12/16 02:05:41	1.4
  +++ FixCRLF.java	2001/12/16 04:12:39	1.5
  @@ -66,7 +66,7 @@
    *
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  - * @version $Revision: 1.4 $ $Name:  $
  + * @version $Revision: 1.5 $ $Name:  $
    */
   
   public class FixCRLF extends MatchingTask
  @@ -921,17 +921,18 @@
               {
                   throw new NoSuchElementException( "OneLiner" );
               }
  -            BufferLine tmpLine =
  -                new BufferLine( line.toString(), eolStr.toString() );
  +
               try
               {
  +                BufferLine tmpLine =
  +                    new BufferLine( line.toString(), eolStr.toString() );
                   nextLine();
  +                return tmpLine;
               }
               catch( TaskException e )
               {
                   throw new NoSuchElementException();
               }
  -            return tmpLine;
           }
   
           protected void nextLine()
  
  
  
  1.4       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GenerateKey.java	2001/12/16 01:01:19	1.3
  +++ GenerateKey.java	2001/12/16 04:12:39	1.4
  @@ -251,7 +251,6 @@
           final ExecTask cmd = (ExecTask)project.createTask( "exec" );
           cmd.setCommand( new Commandline( sb.toString() ) );
           cmd.setFailonerror( true );
  -        cmd.setTaskName( getTaskName() );
           cmd.execute();
       }
   
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Get.java	2001/12/16 03:10:44	1.4
  +++ Get.java	2001/12/16 04:12:39	1.5
  @@ -304,7 +304,6 @@
           {
               Touch touch = (Touch)project.createTask( "touch" );
               touch.setOwningTarget( target );
  -            touch.setTaskName( getTaskName() );
               touch.setFile( file );
               touch.setMillis( timemillis );
               touch.touch();
  
  
  
  1.5       +1 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Javadoc.java	2001/12/16 02:05:41	1.4
  +++ Javadoc.java	2001/12/16 04:12:39	1.5
  @@ -204,6 +204,7 @@
       }
   
       public void setDocletPath( Path src )
  +        throws TaskException
       {
           if( doclet == null )
           {
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
  
  Index: RecorderEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RecorderEntry.java	2001/12/16 00:38:01	1.2
  +++ RecorderEntry.java	2001/12/16 04:12:39	1.3
  @@ -151,7 +151,7 @@
           StringBuffer buf = new StringBuffer();
           if( event.getTask() != null )
           {
  -            String name = "[" + event.getTask().getTaskName() + "]";
  +            String name = "[" + event.getTask().getName() + "]";
               /**
                * @todo replace 12 with DefaultLogger.LEFT_COLUMN_SIZE
                */
  
  
  
  1.7       +5 -0      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Rmic.java	2001/12/16 02:05:41	1.6
  +++ Rmic.java	2001/12/16 04:12:39	1.7
  @@ -110,6 +110,7 @@
        * @param classpath The new Classpath value
        */
       public void setClasspath( Path classpath )
  +        throws TaskException
       {
           if( compileClasspath == null )
           {
  @@ -127,6 +128,7 @@
        * @param r The new ClasspathRef value
        */
       public void setClasspathRef( Reference r )
  +        throws TaskException
       {
           createClasspath().setRefid( r );
       }
  @@ -147,6 +149,7 @@
        * @param extdirs The new Extdirs value
        */
       public void setExtdirs( Path extdirs )
  +        throws TaskException
       {
           if( this.extdirs == null )
           {
  @@ -493,6 +496,7 @@
        * @return Description of the Returned Value
        */
       public Path createClasspath()
  +        throws TaskException
       {
           if( compileClasspath == null )
           {
  @@ -507,6 +511,7 @@
        * @return Description of the Returned Value
        */
       public Path createExtdirs()
  +        throws TaskException
       {
           if( extdirs == null )
           {
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SignJar.java	2001/12/16 00:38:01	1.2
  +++ SignJar.java	2001/12/16 04:12:39	1.3
  @@ -328,7 +328,6 @@
   
           log( "Signing Jar : " + jarSource.getAbsolutePath() );
           cmd.setFailonerror( true );
  -        cmd.setTaskName( getTaskName() );
           cmd.execute();
       }
   
  
  
  
  1.6       +15 -2     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Tar.java	2001/12/16 02:05:41	1.5
  +++ Tar.java	2001/12/16 04:12:39	1.6
  @@ -33,9 +33,22 @@
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
    */
   
  -public class Tar extends MatchingTask
  +public class Tar
  +    extends MatchingTask
   {
  -    private TarLongFileMode longFileMode = new TarLongFileMode();
  +    private TarLongFileMode longFileMode = createMode();
  +
  +    private TarLongFileMode createMode()
  +    {
  +        try
  +        {
  +            return new TarLongFileMode();
  +        }
  +        catch( TaskException e )
  +        {
  +            throw new IllegalStateException( e.getMessage() );
  +        }
  +    }
   
       Vector filesets = new Vector();
       Vector fileSetFiles = new Vector();
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  
  Index: Cab.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cab.java	2001/12/16 00:33:54	1.2
  +++ Cab.java	2001/12/16 04:12:39	1.3
  @@ -318,7 +318,6 @@
       {
           ExecTask exec = (ExecTask)project.createTask( "exec" );
           exec.setOwningTarget( this.getOwningTarget() );
  -        exec.setTaskName( this.getTaskName() );
           exec.setDescription( this.getDescription() );
   
           return exec;
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- IContract.java	2001/12/16 01:31:38	1.4
  +++ IContract.java	2001/12/16 04:12:39	1.5
  @@ -765,7 +765,6 @@
   
               // Create a forked java process
               Java iContract = (Java)project.createTask( "java" );
  -            iContract.setTaskName( getTaskName() );
               iContract.setFork( true );
               iContract.setClassname( "com.reliablesystems.iContract.Tool" );
               iContract.setClasspath( iContractClasspath );
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  
  Index: Continuus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Continuus.java	2001/12/16 02:05:42	1.4
  +++ Continuus.java	2001/12/16 04:12:39	1.5
  @@ -124,8 +124,8 @@
       }
   
       protected int run( Commandline cmd )
  +        throws TaskException
       {
           return run( cmd, new LogStreamHandler( this, Project.MSG_VERBOSE, Project.MSG_WARN
) );
       }
  -
   }
  
  
  
  1.5       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
  
  Index: BorlandDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BorlandDeploymentTool.java	2001/12/16 01:31:38	1.4
  +++ BorlandDeploymentTool.java	2001/12/16 04:12:39	1.5
  @@ -434,7 +434,6 @@
               {
                   gentask.setClasspath( classpath );
               }
  -            gentask.setTaskName( "generate client" );
               gentask.execute();
           }
           catch( Exception e )
  @@ -491,7 +490,6 @@
               args += " " + sourceJar.getPath();
   
               javaTask = (Java)getTask().getProject().createTask( "java" );
  -            javaTask.setTaskName( "verify" );
               javaTask.setClassname( VERIFY );
               Commandline.Argument arguments = javaTask.createArg();
               arguments.setLine( args );
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
  
  Index: DDCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DDCreator.java	2001/12/16 00:37:02	1.2
  +++ DDCreator.java	2001/12/16 04:12:39	1.3
  @@ -120,7 +120,6 @@
           String systemClassPath = System.getProperty( "java.class.path" );
           String execClassPath = project.translatePath( systemClassPath + ":" + classpath
);
           Java ddCreatorTask = (Java)project.createTask( "java" );
  -        ddCreatorTask.setTaskName( getTaskName() );
           ddCreatorTask.setFork( true );
           ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper"
);
           Commandline.Argument arguments = ddCreatorTask.createArg();
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
  
  Index: Ejbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Ejbc.java	2001/12/16 00:37:02	1.2
  +++ Ejbc.java	2001/12/16 04:12:39	1.3
  @@ -167,7 +167,6 @@
           String[] files = ds.getIncludedFiles();
   
           Java helperTask = (Java)project.createTask( "java" );
  -        helperTask.setTaskName( getTaskName() );
           helperTask.setFork( true );
           helperTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper"
);
           String args = "";
  
  
  
  1.5       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
  
  Index: WLRun.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WLRun.java	2001/12/16 01:31:38	1.4
  +++ WLRun.java	2001/12/16 04:12:39	1.5
  @@ -313,7 +313,6 @@
           }
   
           Java weblogicServer = (Java)project.createTask( "java" );
  -        weblogicServer.setTaskName( getTaskName() );
           weblogicServer.setFork( true );
           weblogicServer.setClassname( weblogicMainClass );
   
  @@ -364,7 +363,6 @@
           }
   
           Java weblogicServer = (Java)project.createTask( "java" );
  -        weblogicServer.setTaskName( getTaskName() );
           weblogicServer.setFork( true );
           weblogicServer.setDir( weblogicSystemHome );
           weblogicServer.setClassname( weblogicMainClass );
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WeblogicDeploymentTool.java	2001/12/16 01:31:38	1.4
  +++ WeblogicDeploymentTool.java	2001/12/16 04:12:39	1.5
  @@ -773,7 +773,6 @@
           try
           {
               javaTask = (Java)getTask().getProject().createTask( "java" );
  -            javaTask.setTaskName( "ejbc" );
   
               if( getJvmDebugLevel() != null )
               {
  
  
  
  1.4       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebsphereDeploymentTool.java	2001/12/16 01:31:38	1.3
  +++ WebsphereDeploymentTool.java	2001/12/16 04:12:39	1.4
  @@ -981,8 +981,6 @@
   
   
                   // Set the Java class name
  -
  -                javaTask.setTaskName( "ejbdeploy" );
                   javaTask.setClassname( "com.ibm.etools.ejbdeploy.EJBDeploy" );
                   Commandline.Argument arguments = javaTask.createArg();
                   arguments.setLine( args );
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJAntToolGUI.java	2001/12/16 00:36:41	1.2
  +++ VAJAntToolGUI.java	2001/12/16 04:12:40	1.3
  @@ -1765,7 +1765,7 @@
               {
                   String msg = "";
                   if( event.getTask() != null )
  -                    msg = "[" + event.getTask().getTaskName() + "] ";
  +                    msg = "[" + event.getTask().getName() + "] ";
                   getMessageTextArea().append( lineSeparator + msg + event.getMessage() );
               }
           }
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WLJspc.java	2001/12/16 02:05:42	1.4
  +++ WLJspc.java	2001/12/16 04:12:40	1.5
  @@ -174,7 +174,6 @@
           Java helperTask = (Java)project.createTask( "java" );
           helperTask.setFork( true );
           helperTask.setClassname( "weblogic.jspc" );
  -        helperTask.setTaskName( getTaskName() );
           String[] args = new String[ 12 ];
   
           File jspFile = null;
  
  
  
  1.3       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java
  
  Index: FileNameMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileNameMapper.java	2001/12/16 02:05:43	1.2
  +++ FileNameMapper.java	2001/12/16 04:12:40	1.3
  @@ -51,5 +51,6 @@
        *      basedirectory.
        * @return Description of the Returned Value
        */
  -    String[] mapFileName( String sourceFileName );
  +    String[] mapFileName( String sourceFileName )
  +        throws TaskException;
   }
  
  
  

--
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