ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
Date Thu, 10 Jan 2002 13:59:39 GMT
bodewig     02/01/10 05:59:39

  Modified:    src/main/org/apache/tools/ant/taskdefs Ant.java
                        AntStructure.java Available.java BUnzip2.java
                        BZip2.java CallTarget.java Chmod.java Copy.java
                        Copydir.java Copyfile.java Cvs.java Definer.java
                        Delete.java Deltree.java Ear.java Echo.java
                        Exec.java ExecTask.java Execute.java
                        ExecuteJava.java ExecuteOn.java
                        ExecuteWatchdog.java Exit.java Expand.java
                        Filter.java FixCRLF.java GUnzip.java GZip.java
                        GenerateKey.java Get.java Jar.java Java.java
                        Javac.java Javadoc.java KeySubst.java LoadFile.java
                        LogOutputStream.java MatchingTask.java Mkdir.java
                        Move.java Pack.java PathConvert.java Property.java
                        PumpStreamHandler.java Rename.java Replace.java
                        Rmic.java SQLExec.java SendEmail.java SignJar.java
                        Tar.java TaskOutputStream.java Taskdef.java
                        Touch.java Transform.java Tstamp.java Unpack.java
                        Untar.java UpToDate.java WaitFor.java War.java
                        XSLTLiaison.java XSLTProcess.java Zip.java
                        defaults.properties
               src/main/org/apache/tools/ant/taskdefs/condition Equals.java
               src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
                        Cab.java IContract.java Javah.java NetRexxC.java
                        RenameExtensions.java Rpm.java Script.java
                        StyleBook.java TraXLiaison.java XalanLiaison.java
                        XslpLiaison.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        Depend.java
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        CSharp.java Ilasm.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        DDCreator.java DDCreatorHelper.java
                        DescriptorHandler.java EJBDeploymentTool.java
                        EjbJar.java EjbcHelper.java
                        GenericDeploymentTool.java
                        IPlanetDeploymentTool.java IPlanetEjbc.java
                        IPlanetEjbcTask.java JbossDeploymentTool.java
                        WLRun.java WLStop.java WeblogicDeploymentTool.java
                        WeblogicTOPLinkDeploymentTool.java
                        WebsphereDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntTool.java VAJAntToolGUI.java
                        VAJBuildInfo.java VAJExport.java
                        VAJExportServlet.java VAJImport.java
                        VAJImportServlet.java VAJLoadProjects.java
                        VAJLoadServlet.java VAJToolsServlet.java
                        VAJUtil.java VAJWorkspaceScanner.java
               src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JJTree.java JavaCC.java
               src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java WLJspc.java
               src/main/org/apache/tools/ant/taskdefs/optional/junit
                        AggregateTransformer.java BaseTest.java
                        BatchTest.java Enumerations.java
                        FormatterElement.java JUnitResultFormatter.java
                        JUnitTask.java JUnitTest.java JUnitTestRunner.java
                        PlainJUnitResultFormatter.java
                        SummaryJUnitResultFormatter.java
                        XMLJUnitResultFormatter.java Xalan1Executor.java
                        Xalan2Executor.java XalanExecutor.java
               src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        AbstractMetamataTask.java MAudit.java
                        MAuditStreamHandler.java MMetrics.java
                        MMetricsStreamHandler.java MParse.java
               src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
               src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Add.java P4Base.java P4Change.java P4Delete.java
                        P4Edit.java P4Handler.java P4HandlerAdapter.java
                        P4Have.java P4Label.java P4Reopen.java
                        P4Revert.java P4Submit.java P4Sync.java
                        SimpleP4OutputHandler.java package.html
               src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java PvcsProject.java
               src/main/org/apache/tools/ant/taskdefs/optional/scm
                        AntStarTeamCheckOut.java
               src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        CovMerge.java CovReport.java Coverage.java
                        Filters.java ReportFilters.java Socket.java
                        StringUtil.java Triggers.java
               src/main/org/apache/tools/ant/taskdefs/optional/sound
                        AntSoundPlayer.java SoundTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        StarTeamCheckout.java StarTeamLabel.java
                        StarTeamTask.java TreeBasedTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java MSVSSCHECKIN.java MSVSSCHECKOUT.java
                        MSVSSGET.java MSVSSHISTORY.java MSVSSLABEL.java
  Log:
  License police on task definitions:
  
  (1) Make sure there is a Copyright notice on all files.
  
  (2) Make sure all years in which a file has been modified are
  listed.
  
  (3) Make sure the format is consistent, i.e. separate consecutive
  years with a dash, not a comma.
  
  (4) Change some references from Tomcat to Ant.
  
  Revision  Changes    Path
  1.37      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Ant.java	13 Dec 2001 11:56:25 -0000	1.36
  +++ Ant.java	10 Jan 2002 13:59:31 -0000	1.37
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.17      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  
  Index: AntStructure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AntStructure.java	8 Jan 2002 20:14:46 -0000	1.16
  +++ AntStructure.java	10 Jan 2002 13:59:31 -0000	1.17
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -77,7 +77,7 @@
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   
   public class AntStructure extends Task {
  
  
  
  1.32      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Available.java	7 Jan 2002 15:01:13 -0000	1.31
  +++ Available.java	10 Jan 2002 13:59:31 -0000	1.32
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  
  Index: BUnzip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BUnzip2.java	15 Nov 2001 09:14:10 -0000	1.1
  +++ BUnzip2.java	10 Jan 2002 13:59:31 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BZip2.java
  
  Index: BZip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/BZip2.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BZip2.java	15 Nov 2001 09:14:10 -0000	1.1
  +++ BZip2.java	10 Jan 2002 13:59:31 -0000	1.2
  @@ -1,8 +1,7 @@
  -
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
  
  Index: CallTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CallTarget.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CallTarget.java	10 Dec 2001 10:10:35 -0000	1.12
  +++ CallTarget.java	10 Jan 2002 13:59:31 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.19      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Chmod.java	9 Jan 2002 21:59:21 -0000	1.18
  +++ Chmod.java	10 Jan 2002 13:59:31 -0000	1.19
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Copy.java	6 Dec 2001 16:29:37 -0000	1.25
  +++ Copy.java	10 Jan 2002 13:59:31 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.20      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
  
  Index: Copydir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Copydir.java	28 Oct 2001 21:26:29 -0000	1.19
  +++ Copydir.java	10 Jan 2002 13:59:31 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
  
  Index: Copyfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Copyfile.java	28 Oct 2001 21:26:29 -0000	1.11
  +++ Copyfile.java	10 Jan 2002 13:59:31 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.20      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java
  
  Index: Cvs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Cvs.java	8 Jan 2002 20:21:58 -0000	1.19
  +++ Cvs.java	10 Jan 2002 13:59:31 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
  
  Index: Definer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Definer.java	2 Nov 2001 14:37:33 -0000	1.9
  +++ Definer.java	10 Jan 2002 13:59:31 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.23      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Delete.java	8 Jan 2002 22:42:23 -0000	1.22
  +++ Delete.java	10 Jan 2002 13:59:31 -0000	1.23
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
  
  Index: Deltree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Deltree.java	27 Nov 2001 18:04:52 -0000	1.11
  +++ Deltree.java	10 Jan 2002 13:59:31 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Ear.java	8 Jan 2002 22:42:52 -0000	1.7
  +++ Ear.java	10 Jan 2002 13:59:31 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Echo.java	12 Dec 2001 09:17:36 -0000	1.10
  +++ Echo.java	10 Jan 2002 13:59:31 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.23      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Exec.java	8 Jan 2002 20:21:58 -0000	1.22
  +++ Exec.java	10 Jan 2002 13:59:31 -0000	1.23
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ExecTask.java	8 Jan 2002 22:23:19 -0000	1.25
  +++ ExecTask.java	10 Jan 2002 13:59:31 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.29      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Execute.java	8 Jan 2002 22:15:33 -0000	1.28
  +++ Execute.java	10 Jan 2002 13:59:31 -0000	1.29
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ExecuteJava.java	28 Oct 2001 21:26:29 -0000	1.17
  +++ ExecuteJava.java	10 Jan 2002 13:59:31 -0000	1.18
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.20      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ExecuteOn.java	21 Nov 2001 17:29:43 -0000	1.19
  +++ ExecuteOn.java	10 Jan 2002 13:59:31 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
  
  Index: ExecuteWatchdog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExecuteWatchdog.java	31 Jan 2001 15:55:47 -0000	1.5
  +++ ExecuteWatchdog.java	10 Jan 2002 13:59:31 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
  
  Index: Exit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Exit.java	24 Dec 2001 08:39:07 -0000	1.9
  +++ Exit.java	10 Jan 2002 13:59:31 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.23      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Expand.java	30 Dec 2001 19:39:23 -0000	1.22
  +++ Expand.java	10 Jan 2002 13:59:31 -0000	1.23
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Filter.java	28 Oct 2001 21:26:29 -0000	1.10
  +++ Filter.java	10 Jan 2002 13:59:31 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.26      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- FixCRLF.java	11 Dec 2001 13:54:35 -0000	1.25
  +++ FixCRLF.java	10 Jan 2002 13:59:31 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -115,7 +115,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.25 $ $Name:  $
  + * @version $Revision: 1.26 $ $Name:  $
    */
   
   public class FixCRLF extends MatchingTask {
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GUnzip.java	15 Nov 2001 09:14:10 -0000	1.7
  +++ GUnzip.java	10 Jan 2002 13:59:31 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
  
  Index: GZip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- GZip.java	15 Nov 2001 09:14:10 -0000	1.13
  +++ GZip.java	10 Jan 2002 13:59:31 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GenerateKey.java	8 Jan 2002 22:24:44 -0000	1.6
  +++ GenerateKey.java	10 Jan 2002 13:59:31 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Get.java	8 Jan 2002 20:21:58 -0000	1.12
  +++ Get.java	10 Jan 2002 13:59:31 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.32      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Jar.java	7 Jan 2002 06:20:56 -0000	1.31
  +++ Jar.java	10 Jan 2002 13:59:31 -0000	1.32
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.31      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Java.java	28 Oct 2001 21:26:29 -0000	1.30
  +++ Java.java	10 Jan 2002 13:59:31 -0000	1.31
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.79      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- Javac.java	7 Dec 2001 20:45:38 -0000	1.78
  +++ Javac.java	10 Jan 2002 13:59:31 -0000	1.79
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.70      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- Javadoc.java	8 Jan 2002 22:44:34 -0000	1.69
  +++ Javadoc.java	10 Jan 2002 13:59:31 -0000	1.70
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
  
  Index: KeySubst.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/KeySubst.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- KeySubst.java	28 Oct 2001 21:26:29 -0000	1.7
  +++ KeySubst.java	10 Jan 2002 13:59:31 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
  
  Index: LoadFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoadFile.java	30 Dec 2001 19:39:23 -0000	1.3
  +++ LoadFile.java	10 Jan 2002 13:59:31 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    *  The Apache Software License, Version 1.1
    *
  - *  Copyright (c) 1999 The Apache Software Foundation.  All rights
  + *  Copyright (c) 2001 The Apache Software Foundation.  All rights
    *  reserved.
    *
    *  Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java
  
  Index: LogOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LogOutputStream.java	8 Jan 2002 22:20:56 -0000	1.4
  +++ LogOutputStream.java	10 Jan 2002 13:59:31 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- MatchingTask.java	28 Oct 2001 21:26:29 -0000	1.16
  +++ MatchingTask.java	10 Jan 2002 13:59:31 -0000	1.17
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Mkdir.java	30 Dec 2001 19:39:23 -0000	1.12
  +++ Mkdir.java	10 Jan 2002 13:59:31 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Move.java	8 Jan 2002 22:37:33 -0000	1.11
  +++ Move.java	10 Jan 2002 13:59:31 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Pack.java	15 Nov 2001 09:14:10 -0000	1.1
  +++ Pack.java	10 Jan 2002 13:59:31 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  
  Index: PathConvert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PathConvert.java	8 Jan 2002 22:25:54 -0000	1.6
  +++ PathConvert.java	10 Jan 2002 13:59:31 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.42      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Property.java	8 Jan 2002 22:36:47 -0000	1.41
  +++ Property.java	10 Jan 2002 13:59:31 -0000	1.42
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
  
  Index: PumpStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PumpStreamHandler.java	13 Jul 2001 12:54:30 -0000	1.3
  +++ PumpStreamHandler.java	10 Jan 2002 13:59:31 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java
  
  Index: Rename.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Rename.java	7 Jul 2001 13:51:11 -0000	1.6
  +++ Rename.java	10 Jan 2002 13:59:31 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.21      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Replace.java	22 Nov 2001 08:41:49 -0000	1.20
  +++ Replace.java	10 Jan 2002 13:59:31 -0000	1.21
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.27      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Rmic.java	28 Oct 2001 21:26:29 -0000	1.26
  +++ Rmic.java	10 Jan 2002 13:59:31 -0000	1.27
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.31      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- SQLExec.java	8 Jan 2002 19:59:44 -0000	1.30
  +++ SQLExec.java	10 Jan 2002 13:59:31 -0000	1.31
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
  
  Index: SendEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SendEmail.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SendEmail.java	8 Jan 2002 10:50:43 -0000	1.8
  +++ SendEmail.java	10 Jan 2002 13:59:32 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SignJar.java	8 Jan 2002 19:59:44 -0000	1.12
  +++ SignJar.java	10 Jan 2002 13:59:32 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.21      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Tar.java	8 Jan 2002 19:59:44 -0000	1.20
  +++ Tar.java	10 Jan 2002 13:59:32 -0000	1.21
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
  
  Index: TaskOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TaskOutputStream.java	28 Oct 2001 21:26:29 -0000	1.5
  +++ TaskOutputStream.java	10 Jan 2002 13:59:32 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
  
  Index: Taskdef.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Taskdef.java	2 Nov 2001 14:37:33 -0000	1.16
  +++ Taskdef.java	10 Jan 2002 13:59:32 -0000	1.17
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Touch.java	10 Dec 2001 16:05:08 -0000	1.13
  +++ Touch.java	10 Jan 2002 13:59:32 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Transform.java
  
  Index: Transform.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Transform.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Transform.java	12 Jul 2001 12:06:45 -0000	1.3
  +++ Transform.java	10 Jan 2002 13:59:32 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.17      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Tstamp.java	5 Dec 2001 01:15:57 -0000	1.16
  +++ Tstamp.java	10 Jan 2002 13:59:32 -0000	1.17
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Unpack.java
  
  Index: Unpack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Unpack.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Unpack.java	30 Dec 2001 19:39:23 -0000	1.4
  +++ Unpack.java	10 Jan 2002 13:59:32 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java
  
  Index: Untar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Untar.java	21 Nov 2001 22:36:12 -0000	1.17
  +++ Untar.java	10 Jan 2002 13:59:32 -0000	1.18
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- UpToDate.java	8 Jan 2002 19:59:44 -0000	1.9
  +++ UpToDate.java	10 Jan 2002 13:59:32 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
  
  Index: WaitFor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WaitFor.java	12 Dec 2001 09:03:31 -0000	1.4
  +++ WaitFor.java	10 Jan 2002 13:59:32 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- War.java	8 Jan 2002 19:56:55 -0000	1.17
  +++ War.java	10 Jan 2002 13:59:32 -0000	1.18
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
  
  Index: XSLTLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XSLTLiaison.java	26 Nov 2001 18:10:45 -0000	1.7
  +++ XSLTLiaison.java	10 Jan 2002 13:59:32 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.33      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- XSLTProcess.java	9 Jan 2002 09:08:39 -0000	1.32
  +++ XSLTProcess.java	10 Jan 2002 13:59:32 -0000	1.33
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.59      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Zip.java	8 Jan 2002 19:52:36 -0000	1.58
  +++ Zip.java	10 Jan 2002 13:59:32 -0000	1.59
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.105     +0 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
  
  Index: defaults.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- defaults.properties	7 Jan 2002 04:08:36 -0000	1.104
  +++ defaults.properties	10 Jan 2002 13:59:32 -0000	1.105
  @@ -137,7 +137,6 @@
   # deprecated ant tasks (kept for back compatibility)
   starteam=org.apache.tools.ant.taskdefs.optional.scm.AntStarTeamCheckOut
   javadoc2=org.apache.tools.ant.taskdefs.Javadoc
  -#compileTask=org.apache.tools.ant.taskdefs.CompileTask
   copydir=org.apache.tools.ant.taskdefs.Copydir
   copyfile=org.apache.tools.ant.taskdefs.Copyfile
   deltree=org.apache.tools.ant.taskdefs.Deltree
  
  
  
  1.4       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
  
  Index: Equals.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Equals.java	8 Jan 2002 08:52:32 -0000	1.3
  +++ Equals.java	10 Jan 2002 13:59:34 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -60,7 +60,7 @@
    * Simple String comparison condition.
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class Equals implements Condition {
   
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ANTLR.java	8 Jan 2002 23:28:37 -0000	1.7
  +++ ANTLR.java	10 Jan 2002 13:59:34 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.16      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  
  Index: Cab.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Cab.java	8 Jan 2002 23:31:05 -0000	1.15
  +++ Cab.java	10 Jan 2002 13:59:34 -0000	1.16
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/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	28 Oct 2001 21:30:18 -0000	1.4
  +++ IContract.java	10 Jan 2002 13:59:34 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Javah.java	28 Oct 2001 21:30:18 -0000	1.7
  +++ Javah.java	10 Jan 2002 13:59:34 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  
  Index: NetRexxC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- NetRexxC.java	8 Jan 2002 22:51:39 -0000	1.11
  +++ NetRexxC.java	10 Jan 2002 13:59:34 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java
  
  Index: RenameExtensions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RenameExtensions.java	28 Oct 2001 21:30:18 -0000	1.9
  +++ RenameExtensions.java	10 Jan 2002 13:59:34 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    * 
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Rpm.java	8 Jan 2002 19:59:44 -0000	1.3
  +++ Rpm.java	10 Jan 2002 13:59:34 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
  
  Index: Script.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Script.java	8 Jan 2002 19:59:44 -0000	1.9
  +++ Script.java	10 Jan 2002 13:59:34 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java
  
  Index: StyleBook.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StyleBook.java	28 Oct 2001 21:30:18 -0000	1.4
  +++ StyleBook.java	10 Jan 2002 13:59:34 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
  
  Index: TraXLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TraXLiaison.java	8 Jan 2002 19:59:44 -0000	1.8
  +++ TraXLiaison.java	10 Jan 2002 13:59:34 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java
  
  Index: XalanLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XalanLiaison.java	8 Jan 2002 19:55:11 -0000	1.9
  +++ XalanLiaison.java	10 Jan 2002 13:59:34 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java
  
  Index: XslpLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XslpLiaison.java	8 Jan 2002 19:54:29 -0000	1.10
  +++ XslpLiaison.java	10 Jan 2002 13:59:34 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.15      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  
  Index: Depend.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Depend.java	8 Jan 2002 23:47:35 -0000	1.14
  +++ Depend.java	10 Jan 2002 13:59:35 -0000	1.15
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.13      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
  
  Index: CSharp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CSharp.java	8 Jan 2002 23:53:53 -0000	1.12
  +++ CSharp.java	10 Jan 2002 13:59:35 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
  
  Index: Ilasm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Ilasm.java	8 Jan 2002 23:53:53 -0000	1.10
  +++ Ilasm.java	10 Jan 2002 13:59:35 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DDCreator.java	28 Oct 2001 21:30:20 -0000	1.9
  +++ DDCreator.java	10 Jan 2002 13:59:35 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
  
  Index: DDCreatorHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DDCreatorHelper.java	7 Aug 2001 12:39:34 -0000	1.5
  +++ DDCreatorHelper.java	10 Jan 2002 13:59:35 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.19      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
  
  Index: DescriptorHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DescriptorHandler.java	22 Nov 2001 08:46:55 -0000	1.18
  +++ DescriptorHandler.java	10 Jan 2002 13:59:35 -0000	1.19
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
  
  Index: EJBDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EJBDeploymentTool.java	28 Oct 2001 21:30:20 -0000	1.10
  +++ EJBDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
  
  Index: EjbJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- EjbJar.java	11 Dec 2001 14:18:52 -0000	1.25
  +++ EjbJar.java	10 Jan 2002 13:59:35 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000, 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EjbcHelper.java	28 Oct 2001 21:30:20 -0000	1.10
  +++ EjbcHelper.java	10 Jan 2002 13:59:35 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.26      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  
  Index: GenericDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- GenericDeploymentTool.java	8 Jan 2002 22:22:46 -0000	1.25
  +++ GenericDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.26
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
  
  Index: IPlanetDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- IPlanetDeploymentTool.java	28 Oct 2001 21:30:20 -0000	1.4
  +++ IPlanetDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
  
  Index: IPlanetEjbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- IPlanetEjbc.java	8 Jan 2002 09:33:39 -0000	1.4
  +++ IPlanetEjbc.java	10 Jan 2002 13:59:35 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
  
  Index: IPlanetEjbcTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IPlanetEjbcTask.java	27 Nov 2001 18:04:52 -0000	1.2
  +++ IPlanetEjbcTask.java	10 Jan 2002 13:59:35 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
  
  Index: JbossDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JbossDeploymentTool.java	28 Oct 2001 21:30:20 -0000	1.4
  +++ JbossDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
  
  Index: WLRun.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WLRun.java	28 Oct 2001 21:30:20 -0000	1.13
  +++ WLRun.java	10 Jan 2002 13:59:35 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000, 2001 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
  
  Index: WLStop.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- WLStop.java	10 Jan 2002 06:46:25 -0000	1.9
  +++ WLStop.java	10 Jan 2002 13:59:35 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.33      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- WeblogicDeploymentTool.java	28 Oct 2001 21:30:20 -0000	1.32
  +++ WeblogicDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.33
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
  
  Index: WeblogicTOPLinkDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WeblogicTOPLinkDeploymentTool.java	28 Oct 2001 21:30:20 -0000	1.8
  +++ WeblogicTOPLinkDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +856 -856  jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebsphereDeploymentTool.java	8 Jan 2002 19:56:56 -0000	1.2
  +++ WebsphereDeploymentTool.java	10 Jan 2002 13:59:35 -0000	1.3
  @@ -1,857 +1,857 @@
  -/*

  - * The Apache Software License, Version 1.1

  - *

  - * Copyright (c) 2000 The Apache Software Foundation.  All rights

  - * reserved.

  - *

  - * Redistribution and use in source and binary forms, with or without

  - * modification, are permitted provided that the following conditions

  - * are met:

  - *

  - * 1. Redistributions of source code must retain the above copyright

  - *    notice, this list of conditions and the following disclaimer.

  - *

  - * 2. Redistributions in binary form must reproduce the above copyright

  - *    notice, this list of conditions and the following disclaimer in

  - *    the documentation and/or other materials provided with the

  - *    distribution.

  - *

  - * 3. The end-user documentation included with the redistribution, if

  - *    any, must include the following acknowasegement:

  - *       "This product includes software developed by the

  - *        Apache Software Foundation (http://www.apache.org/)."

  - *    Alternately, this acknowasegement may appear in the software itself,

  - *    if and wherever such third-party acknowasegements normally appear.

  - *

  - * 4. The names "The Jakarta Project", "Ant", and "Apache Software

  - *    Foundation" must not be used to endorse or promote products derived

  - *    from this software without prior written permission. For written

  - *    permission, please contact apache@apache.org.

  - *

  - * 5. Products derived from this software may not be called "Apache"

  - *    nor may "Apache" appear in their names without prior written

  - *    permission of the Apache Group.

  - *

  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED

  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR

  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF

  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT

  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  - * SUCH DAMAGE.

  - * ====================================================================

  - *

  - * This software consists of voluntary contributions made by many

  - * individuals on behalf of the Apache Software Foundation.  For more

  - * information on the Apache Software Foundation, please see

  - * <http://www.apache.org/>.

  - */

  -

  -package org.apache.tools.ant.taskdefs.optional.ejb;

  -

  -import java.io.*;

  -import java.util.jar.*;

  -import java.util.*;

  -import java.net.*;

  -

  -import javax.xml.parsers.*;

  -import org.xml.sax.*;

  -

  -import org.apache.tools.ant.*;

  -import org.apache.tools.ant.taskdefs.*;

  -import org.apache.tools.ant.types.*;

  -import org.apache.tools.ant.taskdefs.ExecTask;

  -/**

  - * Websphere deployment tool that augments the ejbjar task.

  - * @author <mailto:msahu@interkeel.com>Maneesh Sahu</mailto>

  - */

  -public class WebsphereDeploymentTool extends GenericDeploymentTool {

  -    /**

  -     * Enumerated attribute with the values for the database vendor types

  -     */

  -    public static class DBVendor extends EnumeratedAttribute {

  -	public String[] getValues() {

  -	    return new String[] {

  -		"SQL92", "SQL99", "DB2UDBWIN_V71", "DB2UDBOS390_V6", "DB2UDBAS400_V4R5",

  -		"ORACLE_V8", "INFORMIX_V92", "SYBASE_V1192", "MSSQLSERVER_V7", "MYSQL_V323"

  -	    };

  -	}

  -    }

  -	

  -    public static final String PUBLICID_EJB11

  -	= "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";

  -    public static final String PUBLICID_EJB20

  -	= "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";

  -    protected static final String SCHEMA_DIR = "Schema/";

  -	

  -    protected static final String WAS_EXT = "ibm-ejb-jar-ext.xmi";

  -    protected static final String WAS_BND = "ibm-ejb-jar-bnd.xmi";

  -    protected static final String WAS_CMP_MAP = "Map.mapxmi";

  -    protected static final String WAS_CMP_SCHEMA = "Schema.dbxmi";

  -	

  -    /** Instance variable that stores the suffix for the websphere jarfile. */

  -    private String jarSuffix = ".jar";

  -	

  -    /** Instance variable that stores the location of the ejb 1.1 DTD file. */

  -    private String ejb11DTD;

  -	

  -    /** Instance variable that determines whether generic ejb jars are kept. */

  -	

  -    private boolean keepgenerated = false;

  -	

  -    private String additionalArgs = "";

  -	

  -    private boolean keepGeneric = false;

  -	

  -    private String compiler = null;

  -	

  -    private boolean alwaysRebuild = true;

  -

  -    private boolean ejbdeploy = true;

  -

  -    /**

  -     * Indicates if the old CMP location convention is to be used.

  -     */

  -    private boolean newCMP = false;

  -

  -    /** The classpath to the websphere classes. */

  -    private Path wasClasspath = null;

  -

  -    /** The DB Vendor name, the EJB is persisted against */

  -    private String dbVendor;

  -	

  -    /** The name of the database to create. (For top-down mapping only) */

  -    private String dbName;

  -	

  -    /** The name of the schema to create. (For top-down mappings only) */

  -    private String dbSchema;

  -	

  -    /** true - Only generate the deployment code, do not run RMIC or Javac */

  -    private boolean codegen;

  -	

  -    /** true - Only output error messages, suppress informational messages */

  -    private boolean quiet = true;

  -	

  -    /** true - Disable the validation steps */

  -    private boolean novalidate;

  -	

  -    /** true - Disable warning and informational messages */

  -    private boolean nowarn;

  -	

  -    /** true - Disable informational messages */

  -    private boolean noinform;

  -	

  -    /** true - Enable internal tracing */

  -    private boolean trace;

  -	

  -    /** Additional options for RMIC */

  -    private String rmicOptions;

  -	

  -    /** true-  Use the WebSphere 3.5 compatible mapping rules */

  -    private boolean use35MappingRules;

  -	

  -    /** the scratchdir for the ejbdeploy operation */

  -    private String tempdir = "_ejbdeploy_temp";

  -	

  -    /**

  -     * Get the classpath to the websphere classpaths

  -     */

  -    public Path createWASClasspath() {

  -	if (wasClasspath == null) {

  -	    wasClasspath = new Path(getTask().getProject());

  -	}

  -	return wasClasspath.createPath();

  -    }

  -	

  -    public void setWASClasspath(Path wasClasspath) {

  -	this.wasClasspath = wasClasspath;

  -    }

  -	

  -    /**

  -     * Sets the DB Vendor for the Entity Bean mapping

  -     */

  -    public void setDbvendor(DBVendor dbvendor) {

  -	this.dbVendor = dbvendor.getValue();

  -    }

  -	

  -    /**

  -     * Sets the name of the Database to create

  -     * @param String

  -     */

  -    public void setDbname(String dbName) {

  -	this.dbName = dbName;

  -    }

  -	

  -    /**

  -     * Sets the name of the schema to create

  -     * @param String

  -     */

  -    public void setDbschema(String dbSchema) {

  -	this.dbSchema = dbSchema;

  -    }

  -	

  -    /**

  -     * (true) Only generate the deployment code, do not run RMIC or Javac

  -     * @param boolean

  -     */

  -    public void setCodegen(boolean codegen) {

  -	this.codegen = codegen;

  -    }

  -	

  -    /**

  -     * (true) Only output error messages, suppress informational messages

  -     * @param boolean

  -     */

  -    public void setQuiet(boolean quiet) {

  -	this.quiet = quiet;

  -    }

  -	

  -    /**

  -     * (true) Disable the validation steps

  -     * @param boolean

  -     */

  -    public void setNovalidate(boolean novalidate) {

  -	this.novalidate = novalidate;

  -    }

  -	

  -    /**

  -     * (true) Disable warning and informational messages

  -     * @param boolean

  -     */

  -    public void setNowarn(boolean nowarn) {

  -	this.nowarn = nowarn;

  -    }

  -	

  -    /**

  -     * (true) Disable informational messages

  -     * @param boolean

  -     */

  -    public void setNoinform(boolean noinfom) {

  -	this.noinform = noinform;

  -    }

  -	

  -    /**

  -     * (true)  Enable internal tracing

  -     * @param boolean

  -     */

  -    public void setTrace(boolean trace) {

  -	this.trace = trace;

  -    }

  -	

  -    /**

  -     * (true) Use the WebSphere 3.5 compatible mapping rules

  -     * @param boolean

  -     */

  -    public void setUse35(boolean attr) {

  -	use35MappingRules = attr;

  -    }

  -	

  -    /**

  -     * The compiler (switch <code>-compiler</code>) to use

  -     */

  -    public void setCompiler(String compiler) {

  -	this.compiler = compiler;

  -    }

  -	

  -    /**

  -     * Set the rebuild flag to false to only update changes in the

  -     * jar rather than rerunning ejbdeploy

  -     */

  -    public void setRebuild(boolean rebuild) {

  -	this.alwaysRebuild = rebuild;

  -    }

  -	

  -	

  -    /**

  -     * Setter used to store the suffix for the generated websphere jar file.

  -     * @param inString the string to use as the suffix.

  -     */

  -    public void setSuffix(String inString) {

  -	this.jarSuffix = inString;

  -    }

  -	

  -    /**

  -     * Setter used to store the value of keepGeneric

  -     * @param inValue a string, either 'true' or 'false'.

  -     */

  -    public void setKeepgeneric(boolean inValue) {

  -	this.keepGeneric = inValue;

  -    }

  -	

  -    /**

  -     * Sets whether -keepgenerated is passed to ejbdeploy (that is,

  -     * the .java source files are kept).

  -     * @param inValue either 'true' or 'false'

  -     */

  -    public void setKeepgenerated(String inValue) {

  -	this.keepgenerated = Boolean.valueOf(inValue).booleanValue();

  -    }

  -	

  -    /**

  -     * Decide, wether ejbdeploy should be called or not

  -     * @param ejbdeploy 

  -     */

  -    public void setEjbdeploy(boolean ejbdeploy) {

  -	this.ejbdeploy = ejbdeploy;

  -    }

  -

  -    /**

  -     * sets some additional args to send to ejbdeploy.

  -     */

  -    public void setArgs(String args) {

  -	this.additionalArgs = args;

  -    }

  -	

  -    /**

  -     * Setter used to store the location of the Sun's Generic EJB DTD.

  -     * This can be a file on the system or a resource on the classpath.

  -     * @param inString the string to use as the DTD location.

  -     */

  -    public void setEJBdtd(String inString) {

  -	this.ejb11DTD = inString;

  -    }

  -	

  -    /**

  -     * Set the value of the oldCMP scheme. This is an antonym for

  -     * newCMP

  -     */

  -    public void setOldCMP(boolean oldCMP) {

  -	this.newCMP = !oldCMP;

  -    }

  -	

  -    /**

  -     * Set the value of the newCMP scheme. The old CMP scheme locates the

  -     * websphere CMP descriptor based on the naming convention where the

  -     * websphere CMP file is expected to be named with the bean name as the prefix.

  -     *

  -     * Under this scheme the name of the CMP descriptor does not match the name

  -     * actually used in the main websphere EJB descriptor. Also, descriptors which

  -     * contain multiple CMP references could not be used.

  -     *

  -     */

  -    public void setNewCMP(boolean newCMP) {

  -	this.newCMP = newCMP;

  -    }

  -	

  -    /**

  -     * Sets the temporary directory for the ejbdeploy task

  -     */

  -    public void setTempdir(String tempdir) {

  -	this.tempdir = tempdir;

  -    }

  -	

  -    protected DescriptorHandler getDescriptorHandler(File srcDir) {

  -	DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir);

  -	// register all the DTDs, both the ones that are known and

  -	// any supplied by the user

  -	handler.registerDTD(PUBLICID_EJB11, ejb11DTD);

  -		

  -	for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {

  -	    EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();

  -	    handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());

  -	}

  -		

  -	return handler;

  -    }

  -	

  -    protected DescriptorHandler getWebsphereDescriptorHandler(final File srcDir) {

  -	DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir) {

  -		protected void processElement() {

  -		}

  -	    };

  -		

  -	for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {

  -	    EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();

  -	    handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());

  -	}

  -	return handler;

  -    }

  -	

  -    /**

  -     * Add any vendor specific files which should be included in the

  -     * EJB Jar.

  -     */

  -    protected void addVendorFiles(Hashtable ejbFiles, String baseName) {

  -

  -	String ddPrefix = (usingBaseJarName() ? "" : baseName);

  -	String dbPrefix = (dbVendor == null)? "": dbVendor + "-";

  -		

  -	// Get the Extensions document

  -	File websphereEXT = new File(getConfig().descriptorDir, ddPrefix + WAS_EXT);

  -	if (websphereEXT.exists()) {

  -	    ejbFiles.put(META_DIR + WAS_EXT,

  -			 websphereEXT);

  -	} else {

  -	    log("Unable to locate websphere extensions. It was expected to be in " +

  -		websphereEXT.getPath(), Project.MSG_VERBOSE);

  -	}

  -		

  -	File websphereBND = new File(getConfig().descriptorDir, ddPrefix + WAS_BND);

  -	if (websphereBND.exists()) {

  -	    ejbFiles.put(META_DIR + WAS_BND,

  -			 websphereBND);

  -	}else {

  -	    log("Unable to locate websphere bindings. It was expected to be in " +

  -		websphereBND.getPath(), Project.MSG_VERBOSE);

  -	}

  -		

  -	if (!newCMP) {

  -	    log("The old method for locating CMP files has been DEPRECATED.", Project.MSG_VERBOSE);

  -	    log("Please adjust your websphere descriptor and set newCMP=\"true\" " +

  -		"to use the new CMP descriptor inclusion mechanism. ", Project.MSG_VERBOSE);

  -	}

  -	else {

  -	    // We attempt to put in the MAP and Schema files of CMP beans

  -	    try

  -		{

  -				// Add the Map file

  -		    File websphereMAP = new File(getConfig().descriptorDir,

  -						 ddPrefix + dbPrefix + WAS_CMP_MAP);

  -		    if (websphereMAP.exists()) {

  -			ejbFiles.put(META_DIR + WAS_CMP_MAP,

  -				     websphereMAP);

  -		    } else {

  -			log("Unable to locate the websphere Map: " +

  -			    websphereMAP.getPath(), Project.MSG_VERBOSE);

  -		    }

  -		    File websphereSchema = new File(getConfig().descriptorDir,

  -						    ddPrefix + dbPrefix + WAS_CMP_SCHEMA);

  -		    if (websphereSchema.exists()) {

  -			ejbFiles.put(META_DIR + SCHEMA_DIR + WAS_CMP_SCHEMA,

  -				     websphereSchema);

  -		    } else {

  -			log("Unable to locate the websphere Schema: " +

  -			    websphereSchema.getPath(), Project.MSG_VERBOSE);

  -		    }

  -				// Theres nothing else to see here...keep moving sonny

  -		}

  -	    catch(Exception e)

  -		{

  -		    String msg = "Exception while adding Vendor specific files: " +

  -			e.toString();

  -		    throw new BuildException(msg, e);

  -		}

  -	}

  -    }

  -	

  -    /**

  -     * Get the vendor specific name of the Jar that will be output. The modification date

  -     * of this jar will be checked against the dependent bean classes.

  -     */

  -    File getVendorOutputJarFile(String baseName) {

  -	return new File(getDestDir(), baseName + jarSuffix);

  -    }

  -	

  -    /**

  -     * Gets the options for the EJB Deploy operation

  -     * @return String

  -     */

  -    protected String getOptions() {

  -	// Set the options

  -	StringBuffer options = new StringBuffer();

  -	if (dbVendor != null) {

  -	    options.append(" -dbvendor ").append(dbVendor);

  -	}

  -	if (dbName != null) {

  -	    options.append(" -dbname \"").append(dbName).append("\"");

  -	}

  -		

  -	if (dbSchema != null) {

  -	    options.append(" -dbschema \"").append(dbSchema).append("\"");

  -	}

  -		

  -	if (codegen) {

  -	    options.append(" -codegen");

  -	}

  -		

  -	if (quiet) {

  -	    options.append(" -quiet");

  -	}

  -		

  -	if (novalidate) {

  -	    options.append(" -novalidate");

  -	}

  -		

  -	if (nowarn) {

  -	    options.append(" -nowarn");

  -	}

  -		

  -	if (noinform) {

  -	    options.append(" -noinform");

  -	}

  -		

  -	if (trace) {

  -	    options.append(" -trace");

  -	}

  -		

  -	if (use35MappingRules) {

  -	    options.append(" -35");

  -	}

  -		

  -	if (rmicOptions != null) {

  -	    options.append(" -rmic \"").append(rmicOptions).append("\"");

  -	}

  -		

  -	return options.toString();

  -    } // end getOptions

  -	

  -    /**

  -     * Helper method invoked by execute() for each websphere jar to be built.

  -     * Encapsulates the logic of constructing a java task for calling

  -     * websphere.ejbdeploy and executing it.

  -     * @param sourceJar java.io.File representing the source (EJB1.1) jarfile.

  -     * @param destJar java.io.File representing the destination, websphere

  -     *        jarfile.

  -     */

  -    private void buildWebsphereJar(File sourceJar, File destJar) {

  -	try {

  -	    if (ejbdeploy) {

  -		String args =

  -		    " " + sourceJar.getPath() +

  -		    " " + tempdir +

  -		    " " + destJar.getPath() +

  -		    " " + getOptions();

  -

  -		if (getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0) {

  +/*
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowasegement:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowasegement may appear in the software itself,
  + *    if and wherever such third-party acknowasegements normally appear.
  + *
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
  + *    Foundation" must not be used to endorse or promote products derived
  + *    from this software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache"
  + *    nor may "Apache" appear in their names without prior written
  + *    permission of the Apache Group.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + */
  +
  +package org.apache.tools.ant.taskdefs.optional.ejb;
  +
  +import java.io.*;
  +import java.util.jar.*;
  +import java.util.*;
  +import java.net.*;
  +
  +import javax.xml.parsers.*;
  +import org.xml.sax.*;
  +
  +import org.apache.tools.ant.*;
  +import org.apache.tools.ant.taskdefs.*;
  +import org.apache.tools.ant.types.*;
  +import org.apache.tools.ant.taskdefs.ExecTask;
  +/**
  + * Websphere deployment tool that augments the ejbjar task.
  + * @author <mailto:msahu@interkeel.com>Maneesh Sahu</mailto>
  + */
  +public class WebsphereDeploymentTool extends GenericDeploymentTool {
  +    /**
  +     * Enumerated attribute with the values for the database vendor types
  +     */
  +    public static class DBVendor extends EnumeratedAttribute {
  +	public String[] getValues() {
  +	    return new String[] {
  +		"SQL92", "SQL99", "DB2UDBWIN_V71", "DB2UDBOS390_V6", "DB2UDBAS400_V4R5",
  +		"ORACLE_V8", "INFORMIX_V92", "SYBASE_V1192", "MSSQLSERVER_V7", "MYSQL_V323"
  +	    };
  +	}
  +    }
  +	
  +    public static final String PUBLICID_EJB11
  +	= "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
  +    public static final String PUBLICID_EJB20
  +	= "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";
  +    protected static final String SCHEMA_DIR = "Schema/";
  +	
  +    protected static final String WAS_EXT = "ibm-ejb-jar-ext.xmi";
  +    protected static final String WAS_BND = "ibm-ejb-jar-bnd.xmi";
  +    protected static final String WAS_CMP_MAP = "Map.mapxmi";
  +    protected static final String WAS_CMP_SCHEMA = "Schema.dbxmi";
  +	
  +    /** Instance variable that stores the suffix for the websphere jarfile. */
  +    private String jarSuffix = ".jar";
  +	
  +    /** Instance variable that stores the location of the ejb 1.1 DTD file. */
  +    private String ejb11DTD;
  +	
  +    /** Instance variable that determines whether generic ejb jars are kept. */
  +	
  +    private boolean keepgenerated = false;
  +	
  +    private String additionalArgs = "";
  +	
  +    private boolean keepGeneric = false;
  +	
  +    private String compiler = null;
  +	
  +    private boolean alwaysRebuild = true;
  +
  +    private boolean ejbdeploy = true;
  +
  +    /**
  +     * Indicates if the old CMP location convention is to be used.
  +     */
  +    private boolean newCMP = false;
  +
  +    /** The classpath to the websphere classes. */
  +    private Path wasClasspath = null;
  +
  +    /** The DB Vendor name, the EJB is persisted against */
  +    private String dbVendor;
  +	
  +    /** The name of the database to create. (For top-down mapping only) */
  +    private String dbName;
  +	
  +    /** The name of the schema to create. (For top-down mappings only) */
  +    private String dbSchema;
  +	
  +    /** true - Only generate the deployment code, do not run RMIC or Javac */
  +    private boolean codegen;
  +	
  +    /** true - Only output error messages, suppress informational messages */
  +    private boolean quiet = true;
  +	
  +    /** true - Disable the validation steps */
  +    private boolean novalidate;
  +	
  +    /** true - Disable warning and informational messages */
  +    private boolean nowarn;
  +	
  +    /** true - Disable informational messages */
  +    private boolean noinform;
  +	
  +    /** true - Enable internal tracing */
  +    private boolean trace;
  +	
  +    /** Additional options for RMIC */
  +    private String rmicOptions;
  +	
  +    /** true-  Use the WebSphere 3.5 compatible mapping rules */
  +    private boolean use35MappingRules;
  +	
  +    /** the scratchdir for the ejbdeploy operation */
  +    private String tempdir = "_ejbdeploy_temp";
  +	
  +    /**
  +     * Get the classpath to the websphere classpaths
  +     */
  +    public Path createWASClasspath() {
  +	if (wasClasspath == null) {
  +	    wasClasspath = new Path(getTask().getProject());
  +	}
  +	return wasClasspath.createPath();
  +    }
  +	
  +    public void setWASClasspath(Path wasClasspath) {
  +	this.wasClasspath = wasClasspath;
  +    }
  +	
  +    /**
  +     * Sets the DB Vendor for the Entity Bean mapping
  +     */
  +    public void setDbvendor(DBVendor dbvendor) {
  +	this.dbVendor = dbvendor.getValue();
  +    }
  +	
  +    /**
  +     * Sets the name of the Database to create
  +     * @param String
  +     */
  +    public void setDbname(String dbName) {
  +	this.dbName = dbName;
  +    }
  +	
  +    /**
  +     * Sets the name of the schema to create
  +     * @param String
  +     */
  +    public void setDbschema(String dbSchema) {
  +	this.dbSchema = dbSchema;
  +    }
  +	
  +    /**
  +     * (true) Only generate the deployment code, do not run RMIC or Javac
  +     * @param boolean
  +     */
  +    public void setCodegen(boolean codegen) {
  +	this.codegen = codegen;
  +    }
  +	
  +    /**
  +     * (true) Only output error messages, suppress informational messages
  +     * @param boolean
  +     */
  +    public void setQuiet(boolean quiet) {
  +	this.quiet = quiet;
  +    }
  +	
  +    /**
  +     * (true) Disable the validation steps
  +     * @param boolean
  +     */
  +    public void setNovalidate(boolean novalidate) {
  +	this.novalidate = novalidate;
  +    }
  +	
  +    /**
  +     * (true) Disable warning and informational messages
  +     * @param boolean
  +     */
  +    public void setNowarn(boolean nowarn) {
  +	this.nowarn = nowarn;
  +    }
  +	
  +    /**
  +     * (true) Disable informational messages
  +     * @param boolean
  +     */
  +    public void setNoinform(boolean noinfom) {
  +	this.noinform = noinform;
  +    }
  +	
  +    /**
  +     * (true)  Enable internal tracing
  +     * @param boolean
  +     */
  +    public void setTrace(boolean trace) {
  +	this.trace = trace;
  +    }
  +	
  +    /**
  +     * (true) Use the WebSphere 3.5 compatible mapping rules
  +     * @param boolean
  +     */
  +    public void setUse35(boolean attr) {
  +	use35MappingRules = attr;
  +    }
  +	
  +    /**
  +     * The compiler (switch <code>-compiler</code>) to use
  +     */
  +    public void setCompiler(String compiler) {
  +	this.compiler = compiler;
  +    }
  +	
  +    /**
  +     * Set the rebuild flag to false to only update changes in the
  +     * jar rather than rerunning ejbdeploy
  +     */
  +    public void setRebuild(boolean rebuild) {
  +	this.alwaysRebuild = rebuild;
  +    }
  +	
  +	
  +    /**
  +     * Setter used to store the suffix for the generated websphere jar file.
  +     * @param inString the string to use as the suffix.
  +     */
  +    public void setSuffix(String inString) {
  +	this.jarSuffix = inString;
  +    }
  +	
  +    /**
  +     * Setter used to store the value of keepGeneric
  +     * @param inValue a string, either 'true' or 'false'.
  +     */
  +    public void setKeepgeneric(boolean inValue) {
  +	this.keepGeneric = inValue;
  +    }
  +	
  +    /**
  +     * Sets whether -keepgenerated is passed to ejbdeploy (that is,
  +     * the .java source files are kept).
  +     * @param inValue either 'true' or 'false'
  +     */
  +    public void setKeepgenerated(String inValue) {
  +	this.keepgenerated = Boolean.valueOf(inValue).booleanValue();
  +    }
  +	
  +    /**
  +     * Decide, wether ejbdeploy should be called or not
  +     * @param ejbdeploy 
  +     */
  +    public void setEjbdeploy(boolean ejbdeploy) {
  +	this.ejbdeploy = ejbdeploy;
  +    }
  +
  +    /**
  +     * sets some additional args to send to ejbdeploy.
  +     */
  +    public void setArgs(String args) {
  +	this.additionalArgs = args;
  +    }
  +	
  +    /**
  +     * Setter used to store the location of the Sun's Generic EJB DTD.
  +     * This can be a file on the system or a resource on the classpath.
  +     * @param inString the string to use as the DTD location.
  +     */
  +    public void setEJBdtd(String inString) {
  +	this.ejb11DTD = inString;
  +    }
  +	
  +    /**
  +     * Set the value of the oldCMP scheme. This is an antonym for
  +     * newCMP
  +     */
  +    public void setOldCMP(boolean oldCMP) {
  +	this.newCMP = !oldCMP;
  +    }
  +	
  +    /**
  +     * Set the value of the newCMP scheme. The old CMP scheme locates the
  +     * websphere CMP descriptor based on the naming convention where the
  +     * websphere CMP file is expected to be named with the bean name as the prefix.
  +     *
  +     * Under this scheme the name of the CMP descriptor does not match the name
  +     * actually used in the main websphere EJB descriptor. Also, descriptors which
  +     * contain multiple CMP references could not be used.
  +     *
  +     */
  +    public void setNewCMP(boolean newCMP) {
  +	this.newCMP = newCMP;
  +    }
  +	
  +    /**
  +     * Sets the temporary directory for the ejbdeploy task
  +     */
  +    public void setTempdir(String tempdir) {
  +	this.tempdir = tempdir;
  +    }
  +	
  +    protected DescriptorHandler getDescriptorHandler(File srcDir) {
  +	DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir);
  +	// register all the DTDs, both the ones that are known and
  +	// any supplied by the user
  +	handler.registerDTD(PUBLICID_EJB11, ejb11DTD);
  +		
  +	for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
  +	    EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();
  +	    handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
  +	}
  +		
  +	return handler;
  +    }
  +	
  +    protected DescriptorHandler getWebsphereDescriptorHandler(final File srcDir) {
  +	DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir) {
  +		protected void processElement() {
  +		}
  +	    };
  +		
  +	for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
  +	    EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();
  +	    handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
  +	}
  +	return handler;
  +    }
  +	
  +    /**
  +     * Add any vendor specific files which should be included in the
  +     * EJB Jar.
  +     */
  +    protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
  +
  +	String ddPrefix = (usingBaseJarName() ? "" : baseName);
  +	String dbPrefix = (dbVendor == null)? "": dbVendor + "-";
  +		
  +	// Get the Extensions document
  +	File websphereEXT = new File(getConfig().descriptorDir, ddPrefix + WAS_EXT);
  +	if (websphereEXT.exists()) {
  +	    ejbFiles.put(META_DIR + WAS_EXT,
  +			 websphereEXT);
  +	} else {
  +	    log("Unable to locate websphere extensions. It was expected to be in " +
  +		websphereEXT.getPath(), Project.MSG_VERBOSE);
  +	}
  +		
  +	File websphereBND = new File(getConfig().descriptorDir, ddPrefix + WAS_BND);
  +	if (websphereBND.exists()) {
  +	    ejbFiles.put(META_DIR + WAS_BND,
  +			 websphereBND);
  +	}else {
  +	    log("Unable to locate websphere bindings. It was expected to be in " +
  +		websphereBND.getPath(), Project.MSG_VERBOSE);
  +	}
  +		
  +	if (!newCMP) {
  +	    log("The old method for locating CMP files has been DEPRECATED.", Project.MSG_VERBOSE);
  +	    log("Please adjust your websphere descriptor and set newCMP=\"true\" " +
  +		"to use the new CMP descriptor inclusion mechanism. ", Project.MSG_VERBOSE);
  +	}
  +	else {
  +	    // We attempt to put in the MAP and Schema files of CMP beans
  +	    try
  +		{
  +				// Add the Map file
  +		    File websphereMAP = new File(getConfig().descriptorDir,
  +						 ddPrefix + dbPrefix + WAS_CMP_MAP);
  +		    if (websphereMAP.exists()) {
  +			ejbFiles.put(META_DIR + WAS_CMP_MAP,
  +				     websphereMAP);
  +		    } else {
  +			log("Unable to locate the websphere Map: " +
  +			    websphereMAP.getPath(), Project.MSG_VERBOSE);
  +		    }
  +		    File websphereSchema = new File(getConfig().descriptorDir,
  +						    ddPrefix + dbPrefix + WAS_CMP_SCHEMA);
  +		    if (websphereSchema.exists()) {
  +			ejbFiles.put(META_DIR + SCHEMA_DIR + WAS_CMP_SCHEMA,
  +				     websphereSchema);
  +		    } else {
  +			log("Unable to locate the websphere Schema: " +
  +			    websphereSchema.getPath(), Project.MSG_VERBOSE);
  +		    }
  +				// Theres nothing else to see here...keep moving sonny
  +		}
  +	    catch(Exception e)
  +		{
  +		    String msg = "Exception while adding Vendor specific files: " +
  +			e.toString();
  +		    throw new BuildException(msg, e);
  +		}
  +	}
  +    }
  +	
  +    /**
  +     * Get the vendor specific name of the Jar that will be output. The modification date
  +     * of this jar will be checked against the dependent bean classes.
  +     */
  +    File getVendorOutputJarFile(String baseName) {
  +	return new File(getDestDir(), baseName + jarSuffix);
  +    }
  +	
  +    /**
  +     * Gets the options for the EJB Deploy operation
  +     * @return String
  +     */
  +    protected String getOptions() {
  +	// Set the options
  +	StringBuffer options = new StringBuffer();
  +	if (dbVendor != null) {
  +	    options.append(" -dbvendor ").append(dbVendor);
  +	}
  +	if (dbName != null) {
  +	    options.append(" -dbname \"").append(dbName).append("\"");
  +	}
  +		
  +	if (dbSchema != null) {
  +	    options.append(" -dbschema \"").append(dbSchema).append("\"");
  +	}
  +		
  +	if (codegen) {
  +	    options.append(" -codegen");
  +	}
  +		
  +	if (quiet) {
  +	    options.append(" -quiet");
  +	}
  +		
  +	if (novalidate) {
  +	    options.append(" -novalidate");
  +	}
  +		
  +	if (nowarn) {
  +	    options.append(" -nowarn");
  +	}
  +		
  +	if (noinform) {
  +	    options.append(" -noinform");
  +	}
  +		
  +	if (trace) {
  +	    options.append(" -trace");
  +	}
  +		
  +	if (use35MappingRules) {
  +	    options.append(" -35");
  +	}
  +		
  +	if (rmicOptions != null) {
  +	    options.append(" -rmic \"").append(rmicOptions).append("\"");
  +	}
  +		
  +	return options.toString();
  +    } // end getOptions
  +	
  +    /**
  +     * Helper method invoked by execute() for each websphere jar to be built.
  +     * Encapsulates the logic of constructing a java task for calling
  +     * websphere.ejbdeploy and executing it.
  +     * @param sourceJar java.io.File representing the source (EJB1.1) jarfile.
  +     * @param destJar java.io.File representing the destination, websphere
  +     *        jarfile.
  +     */
  +    private void buildWebsphereJar(File sourceJar, File destJar) {
  +	try {
  +	    if (ejbdeploy) {
  +		String args =
  +		    " " + sourceJar.getPath() +
  +		    " " + tempdir +
  +		    " " + destJar.getPath() +
  +		    " " + getOptions();
  +
  +		if (getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0) {
   		    args += " -cp " + getCombinedClasspath();
  -                }

  -

  -		// Why do my ""'s get stripped away???

  -		log("EJB Deploy Options: " + args, Project.MSG_VERBOSE);

  -			

  -		Java javaTask = (Java)getTask().getProject().createTask("java");

  -		// Set the JvmArgs

  -		javaTask.createJvmarg().setValue("-Xms64m");

  -		javaTask.createJvmarg().setValue("-Xmx128m");

  -

  -		// Set the Environment variable

  -		Environment.Variable var = new Environment.Variable();

  -		var.setKey("websphere.lib.dir");

  -		var.setValue(getTask().getProject().getProperty("websphere.home") + "/lib");

  -		javaTask.addSysproperty(var);

  -

  -		// Set the working directory

  -		javaTask.setDir(new File(getTask().getProject().getProperty("websphere.home")));

  -

  -		// Set the Java class name

  -		javaTask.setTaskName("ejbdeploy");

  -		javaTask.setClassname("com.ibm.etools.ejbdeploy.EJBDeploy");

  -

  -		Commandline.Argument arguments = javaTask.createArg();

  -		arguments.setLine(args);

  -

  -		Path classpath = wasClasspath;

  -		if (classpath == null) {

  -		    classpath = getCombinedClasspath();

  -		}

  -

  -		if (classpath != null) {

  -		    javaTask.setClasspath(classpath);

  -		    javaTask.setFork(true);

  -		}

  -		else {

  -		    javaTask.setFork(true);

  -		}

  -

  -		log("Calling websphere.ejbdeploy for " + sourceJar.toString(),

  -		    Project.MSG_VERBOSE);

  -

  -		javaTask.execute();

  -	    }

  -	}

  -	catch (Exception e) {

  -	    // Have to catch this because of the semantics of calling main()

  -	    String msg = "Exception while calling ejbdeploy. Details: " + e.toString();

  -	    throw new BuildException(msg, e);

  -	}

  -    }

  -	

  -    /**

  -     * Method used to encapsulate the writing of the JAR file. Iterates over the

  -     * filenames/java.io.Files in the Hashtable stored on the instance variable

  -     * ejbFiles.

  -     */

  -    protected void writeJar(String baseName, File jarFile, Hashtable files, String publicId)

  -	throws BuildException

  -    {

  -	if (ejbdeploy) {

  -	    // create the -generic.jar, if required

  -	    File genericJarFile = super.getVendorOutputJarFile(baseName);

  -	    super.writeJar(baseName, genericJarFile, files, publicId);

  -

  -	    // create the output .jar, if required

  -	    if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {

  -		buildWebsphereJar(genericJarFile, jarFile);

  -	    }

  -	    if (!keepGeneric) {

  -		log("deleting generic jar " + genericJarFile.toString(),

  -		    Project.MSG_VERBOSE);

  -		genericJarFile.delete();

  -	    }

  -	}

  -	else {

  -	    // create the "undeployed" output .jar, if required

  -	    super.writeJar(baseName, jarFile, files, publicId);

  -	}

  -	/*

  -	// need to create a generic jar first.

  -	File genericJarFile = super.getVendorOutputJarFile(baseName);

  -	super.writeJar(baseName, genericJarFile, files, publicId);

  -		

  -	if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {

  -	    buildWebsphereJar(genericJarFile, jarFile);

  -	}

  -	if (!keepGeneric) {

  -	    log("deleting generic jar " + genericJarFile.toString(),

  -		Project.MSG_VERBOSE);

  -	    genericJarFile.delete();

  -	}

  -	*/

  -    }

  -	

  -    /**

  -     * Called to validate that the tool parameters have been configured.

  -     *

  -     */

  -    public void validateConfigured() throws BuildException {

  -	super.validateConfigured();

  -    }

  -	

  -	

  -    /**

  -     * Helper method to check to see if a websphere EBJ1.1 jar needs to be rebuilt using

  -     * ejbdeploy.  Called from writeJar it sees if the "Bean" classes  are the only thing that needs

  -     * to be updated and either updates the Jar with the Bean classfile or returns true,

  -     * saying that the whole websphere jar needs to be regened with ejbdeploy.  This allows faster

  -     * build times for working developers.

  -     * <p>

  -     * The way websphere ejbdeploy works is it creates wrappers for the publicly defined methods as

  -     * they are exposed in the remote interface.  If the actual bean changes without changing the

  -     * the method signatures then only the bean classfile needs to be updated and the rest of the

  -     * websphere jar file can remain the same.  If the Interfaces, ie. the method signatures change

  -     * or if the xml deployment dicriptors changed, the whole jar needs to be rebuilt with ejbdeploy.

  -     * This is not strictly true for the xml files.  If the JNDI name changes then the jar doesnt

  -     * have to be rebuild, but if the resources references change then it does.  At this point the

  -     * websphere jar gets rebuilt if the xml files change at all.

  -     *

  -     * @param genericJarFile java.io.File The generic jar file.

  -     * @param websphereJarFile java.io.File The websphere jar file to check to see if it needs to be rebuilt.

  -     */

  -    protected boolean isRebuildRequired(File genericJarFile, File websphereJarFile)

  -    {

  -	boolean rebuild = false;

  -	

  -	JarFile genericJar = null;

  -	JarFile wasJar = null;

  -	File newwasJarFile = null;

  -	JarOutputStream newJarStream = null;

  -		

  -	try

  -	    {

  -		log("Checking if websphere Jar needs to be rebuilt for jar " + websphereJarFile.getName(),

  -		    Project.MSG_VERBOSE);

  -		// Only go forward if the generic and the websphere file both exist

  -		if (genericJarFile.exists() && genericJarFile.isFile()

  -		    && websphereJarFile.exists() && websphereJarFile.isFile())

  -		    {

  -				//open jar files

  -			genericJar = new JarFile(genericJarFile);

  -			wasJar = new JarFile(websphereJarFile);

  -				

  -			Hashtable genericEntries = new Hashtable();

  -			Hashtable wasEntries = new Hashtable();

  -			Hashtable replaceEntries = new Hashtable();

  -				

  -				//get the list of generic jar entries

  -			for (Enumeration e = genericJar.entries(); e.hasMoreElements();)

  -			    {

  -				JarEntry je = (JarEntry)e.nextElement();

  -				genericEntries.put(je.getName().replace('\\', '/'), je);

  -			    }

  -				//get the list of websphere jar entries

  -			for (Enumeration e = wasJar.entries() ; e.hasMoreElements();)

  -			    {

  -				JarEntry je = (JarEntry)e.nextElement();

  -				wasEntries.put(je.getName(), je);

  -			    }

  -				

  -				//Cycle Through generic and make sure its in websphere

  -			ClassLoader genericLoader = getClassLoaderFromJar(genericJarFile);

  -			for (Enumeration e = genericEntries.keys(); e.hasMoreElements();)

  -			    {

  -				String filepath = (String)e.nextElement();

  -				if (wasEntries.containsKey(filepath))    // File name/path match

  -				    {

  -					// Check files see if same

  -					JarEntry genericEntry = (JarEntry)genericEntries.get(filepath);

  -					JarEntry wasEntry = (JarEntry)wasEntries.get(filepath);

  -					if ((genericEntry.getCrc() !=  wasEntry.getCrc())  || // Crc's Match

  -					    (genericEntry.getSize() != wasEntry.getSize()) ) // Size Match

  -					    {

  -						if (genericEntry.getName().endsWith(".class"))

  -						    {

  -							//File are different see if its an object or an interface

  -							String classname = genericEntry.getName().replace(File.separatorChar,'.');

  -							classname = classname.substring(0,classname.lastIndexOf(".class"));

  -							Class genclass = genericLoader.loadClass(classname);

  -							if (genclass.isInterface())

  -							    {

  -								//Interface changed   rebuild jar.

  -								log("Interface " + genclass.getName() + " has changed",Project.MSG_VERBOSE);

  -								rebuild = true;

  -								break;

  -							    }

  -							else

  -							    {

  -								//Object class Changed   update it.

  -								replaceEntries.put(filepath, genericEntry);

  -							    }

  -						    }

  -						else

  -						    {

  -							// is it the manifest. If so ignore it

  -							if (!genericEntry.getName().equals("META-INF/MANIFEST.MF")) {

  -							    //File other then class changed   rebuild

  -							    log("Non class file " + genericEntry.getName() + " has changed",Project.MSG_VERBOSE);

  -							    rebuild = true;

  -							}

  -							break;

  -						    }

  -					    }

  -				    }

  -				else // a file doesnt exist rebuild

  -				    {

  -					log("File " + filepath + " not present in websphere jar",Project.MSG_VERBOSE);

  -					rebuild =  true;

  -					break;

  -				    }

  -			    }

  -				

  -			if (!rebuild)

  -			    {

  -				log("No rebuild needed - updating jar",Project.MSG_VERBOSE);

  -				newwasJarFile = new File(websphereJarFile.getAbsolutePath() + ".temp");

  -				if (newwasJarFile.exists()) {

  -				    newwasJarFile.delete();

  -				}

  -					

  -				newJarStream = new JarOutputStream(new FileOutputStream(newwasJarFile));

  -				newJarStream.setLevel(0);

  -					

  -				//Copy files from old websphere jar

  -				for (Enumeration e = wasEntries.elements() ; e.hasMoreElements();)

  -				    {

  -					byte[] buffer = new byte[1024];

  -					int bytesRead;

  -					InputStream is;

  -					JarEntry je = (JarEntry)e.nextElement();

  -					if (je.getCompressedSize() == -1 ||

  -					    je.getCompressedSize() == je.getSize()) {

  -					    newJarStream.setLevel(0);

  -					}

  -					else {

  -					    newJarStream.setLevel(9);

  -					}

  -						

  -					// Update with changed Bean class

  -					if (replaceEntries.containsKey(je.getName()))

  -					    {

  -						log("Updating Bean class from generic Jar " + je.getName(),

  -						    Project.MSG_VERBOSE);

  -						// Use the entry from the generic jar

  -						je = (JarEntry)replaceEntries.get(je.getName());

  -						is = genericJar.getInputStream(je);

  -					    }

  -					else  //use fle from original websphere jar

  -					    {

  -						is = wasJar.getInputStream(je);

  -					    }

  -					newJarStream.putNextEntry(new JarEntry(je.getName()));

  -						

  -					while ((bytesRead = is.read(buffer)) != -1)

  -					    {

  -						newJarStream.write(buffer,0,bytesRead);

  -					    }

  -					is.close();

  -				    }

  -			    }

  -			else

  -			    {

  -				log("websphere Jar rebuild needed due to changed interface or XML",Project.MSG_VERBOSE);

  -			    }

  -		    }

  -		else

  -		    {

  -			rebuild = true;

  -		    }

  -	    }

  -	catch(ClassNotFoundException cnfe)

  -	    {

  -		String cnfmsg = "ClassNotFoundException while processing ejb-jar file"

  -		    + ". Details: "

  -		    + cnfe.getMessage();

  -		throw new BuildException(cnfmsg, cnfe);

  -	    }

  -	catch(IOException ioe) {

  -	    String msg = "IOException while processing ejb-jar file "

  -		+ ". Details: "

  -		+ ioe.getMessage();

  -	    throw new BuildException(msg, ioe);

  -	}

  -	finally {

  -	    // need to close files and perhaps rename output

  -	    if (genericJar != null) {

  -		try {

  -		    genericJar.close();

  -		}

  -		catch (IOException closeException) {}

  -	    }

  -			

  -	    if (wasJar != null) {

  -		try {

  -		    wasJar.close();

  -		}

  -		catch (IOException closeException) {}

  -	    }

  -			

  -	    if (newJarStream != null) {

  -		try {

  -		    newJarStream.close();

  -		}

  -		catch (IOException closeException) {}

  -				

  -		websphereJarFile.delete();

  -		newwasJarFile.renameTo(websphereJarFile);

  -		if (!websphereJarFile.exists()) {

  -		    rebuild = true;

  -		}

  -	    }

  -	}

  -		

  -	return rebuild;

  -    }

  -	

  -    /**

  -     * Helper method invoked by isRebuildRequired to get a ClassLoader for

  -     * a Jar File passed to it.

  -     *

  -     * @param classjar java.io.File representing jar file to get classes from.

  -     */

  -    protected ClassLoader getClassLoaderFromJar(File classjar) throws IOException

  -    {

  -	Path lookupPath = new Path(getTask().getProject());

  -	lookupPath.setLocation(classjar);

  -	

  -	Path classpath = getCombinedClasspath();

  -	if (classpath != null) {

  -	    lookupPath.append(classpath);

  -	}

  -		

  -	return new AntClassLoader(getTask().getProject(), lookupPath);

  -    }

  -}

  +                }
  +
  +		// Why do my ""'s get stripped away???
  +		log("EJB Deploy Options: " + args, Project.MSG_VERBOSE);
  +			
  +		Java javaTask = (Java)getTask().getProject().createTask("java");
  +		// Set the JvmArgs
  +		javaTask.createJvmarg().setValue("-Xms64m");
  +		javaTask.createJvmarg().setValue("-Xmx128m");
  +
  +		// Set the Environment variable
  +		Environment.Variable var = new Environment.Variable();
  +		var.setKey("websphere.lib.dir");
  +		var.setValue(getTask().getProject().getProperty("websphere.home") + "/lib");
  +		javaTask.addSysproperty(var);
  +
  +		// Set the working directory
  +		javaTask.setDir(new File(getTask().getProject().getProperty("websphere.home")));
  +
  +		// Set the Java class name
  +		javaTask.setTaskName("ejbdeploy");
  +		javaTask.setClassname("com.ibm.etools.ejbdeploy.EJBDeploy");
  +
  +		Commandline.Argument arguments = javaTask.createArg();
  +		arguments.setLine(args);
  +
  +		Path classpath = wasClasspath;
  +		if (classpath == null) {
  +		    classpath = getCombinedClasspath();
  +		}
  +
  +		if (classpath != null) {
  +		    javaTask.setClasspath(classpath);
  +		    javaTask.setFork(true);
  +		}
  +		else {
  +		    javaTask.setFork(true);
  +		}
  +
  +		log("Calling websphere.ejbdeploy for " + sourceJar.toString(),
  +		    Project.MSG_VERBOSE);
  +
  +		javaTask.execute();
  +	    }
  +	}
  +	catch (Exception e) {
  +	    // Have to catch this because of the semantics of calling main()
  +	    String msg = "Exception while calling ejbdeploy. Details: " + e.toString();
  +	    throw new BuildException(msg, e);
  +	}
  +    }
  +	
  +    /**
  +     * Method used to encapsulate the writing of the JAR file. Iterates over the
  +     * filenames/java.io.Files in the Hashtable stored on the instance variable
  +     * ejbFiles.
  +     */
  +    protected void writeJar(String baseName, File jarFile, Hashtable files, String publicId)
  +	throws BuildException
  +    {
  +	if (ejbdeploy) {
  +	    // create the -generic.jar, if required
  +	    File genericJarFile = super.getVendorOutputJarFile(baseName);
  +	    super.writeJar(baseName, genericJarFile, files, publicId);
  +
  +	    // create the output .jar, if required
  +	    if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {
  +		buildWebsphereJar(genericJarFile, jarFile);
  +	    }
  +	    if (!keepGeneric) {
  +		log("deleting generic jar " + genericJarFile.toString(),
  +		    Project.MSG_VERBOSE);
  +		genericJarFile.delete();
  +	    }
  +	}
  +	else {
  +	    // create the "undeployed" output .jar, if required
  +	    super.writeJar(baseName, jarFile, files, publicId);
  +	}
  +	/*
  +	// need to create a generic jar first.
  +	File genericJarFile = super.getVendorOutputJarFile(baseName);
  +	super.writeJar(baseName, genericJarFile, files, publicId);
  +		
  +	if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {
  +	    buildWebsphereJar(genericJarFile, jarFile);
  +	}
  +	if (!keepGeneric) {
  +	    log("deleting generic jar " + genericJarFile.toString(),
  +		Project.MSG_VERBOSE);
  +	    genericJarFile.delete();
  +	}
  +	*/
  +    }
  +	
  +    /**
  +     * Called to validate that the tool parameters have been configured.
  +     *
  +     */
  +    public void validateConfigured() throws BuildException {
  +	super.validateConfigured();
  +    }
  +	
  +	
  +    /**
  +     * Helper method to check to see if a websphere EBJ1.1 jar needs to be rebuilt using
  +     * ejbdeploy.  Called from writeJar it sees if the "Bean" classes  are the only thing that needs
  +     * to be updated and either updates the Jar with the Bean classfile or returns true,
  +     * saying that the whole websphere jar needs to be regened with ejbdeploy.  This allows faster
  +     * build times for working developers.
  +     * <p>
  +     * The way websphere ejbdeploy works is it creates wrappers for the publicly defined methods as
  +     * they are exposed in the remote interface.  If the actual bean changes without changing the
  +     * the method signatures then only the bean classfile needs to be updated and the rest of the
  +     * websphere jar file can remain the same.  If the Interfaces, ie. the method signatures change
  +     * or if the xml deployment dicriptors changed, the whole jar needs to be rebuilt with ejbdeploy.
  +     * This is not strictly true for the xml files.  If the JNDI name changes then the jar doesnt
  +     * have to be rebuild, but if the resources references change then it does.  At this point the
  +     * websphere jar gets rebuilt if the xml files change at all.
  +     *
  +     * @param genericJarFile java.io.File The generic jar file.
  +     * @param websphereJarFile java.io.File The websphere jar file to check to see if it needs to be rebuilt.
  +     */
  +    protected boolean isRebuildRequired(File genericJarFile, File websphereJarFile)
  +    {
  +	boolean rebuild = false;
  +	
  +	JarFile genericJar = null;
  +	JarFile wasJar = null;
  +	File newwasJarFile = null;
  +	JarOutputStream newJarStream = null;
  +		
  +	try
  +	    {
  +		log("Checking if websphere Jar needs to be rebuilt for jar " + websphereJarFile.getName(),
  +		    Project.MSG_VERBOSE);
  +		// Only go forward if the generic and the websphere file both exist
  +		if (genericJarFile.exists() && genericJarFile.isFile()
  +		    && websphereJarFile.exists() && websphereJarFile.isFile())
  +		    {
  +				//open jar files
  +			genericJar = new JarFile(genericJarFile);
  +			wasJar = new JarFile(websphereJarFile);
  +				
  +			Hashtable genericEntries = new Hashtable();
  +			Hashtable wasEntries = new Hashtable();
  +			Hashtable replaceEntries = new Hashtable();
  +				
  +				//get the list of generic jar entries
  +			for (Enumeration e = genericJar.entries(); e.hasMoreElements();)
  +			    {
  +				JarEntry je = (JarEntry)e.nextElement();
  +				genericEntries.put(je.getName().replace('\\', '/'), je);
  +			    }
  +				//get the list of websphere jar entries
  +			for (Enumeration e = wasJar.entries() ; e.hasMoreElements();)
  +			    {
  +				JarEntry je = (JarEntry)e.nextElement();
  +				wasEntries.put(je.getName(), je);
  +			    }
  +				
  +				//Cycle Through generic and make sure its in websphere
  +			ClassLoader genericLoader = getClassLoaderFromJar(genericJarFile);
  +			for (Enumeration e = genericEntries.keys(); e.hasMoreElements();)
  +			    {
  +				String filepath = (String)e.nextElement();
  +				if (wasEntries.containsKey(filepath))    // File name/path match
  +				    {
  +					// Check files see if same
  +					JarEntry genericEntry = (JarEntry)genericEntries.get(filepath);
  +					JarEntry wasEntry = (JarEntry)wasEntries.get(filepath);
  +					if ((genericEntry.getCrc() !=  wasEntry.getCrc())  || // Crc's Match
  +					    (genericEntry.getSize() != wasEntry.getSize()) ) // Size Match
  +					    {
  +						if (genericEntry.getName().endsWith(".class"))
  +						    {
  +							//File are different see if its an object or an interface
  +							String classname = genericEntry.getName().replace(File.separatorChar,'.');
  +							classname = classname.substring(0,classname.lastIndexOf(".class"));
  +							Class genclass = genericLoader.loadClass(classname);
  +							if (genclass.isInterface())
  +							    {
  +								//Interface changed   rebuild jar.
  +								log("Interface " + genclass.getName() + " has changed",Project.MSG_VERBOSE);
  +								rebuild = true;
  +								break;
  +							    }
  +							else
  +							    {
  +								//Object class Changed   update it.
  +								replaceEntries.put(filepath, genericEntry);
  +							    }
  +						    }
  +						else
  +						    {
  +							// is it the manifest. If so ignore it
  +							if (!genericEntry.getName().equals("META-INF/MANIFEST.MF")) {
  +							    //File other then class changed   rebuild
  +							    log("Non class file " + genericEntry.getName() + " has changed",Project.MSG_VERBOSE);
  +							    rebuild = true;
  +							}
  +							break;
  +						    }
  +					    }
  +				    }
  +				else // a file doesnt exist rebuild
  +				    {
  +					log("File " + filepath + " not present in websphere jar",Project.MSG_VERBOSE);
  +					rebuild =  true;
  +					break;
  +				    }
  +			    }
  +				
  +			if (!rebuild)
  +			    {
  +				log("No rebuild needed - updating jar",Project.MSG_VERBOSE);
  +				newwasJarFile = new File(websphereJarFile.getAbsolutePath() + ".temp");
  +				if (newwasJarFile.exists()) {
  +				    newwasJarFile.delete();
  +				}
  +					
  +				newJarStream = new JarOutputStream(new FileOutputStream(newwasJarFile));
  +				newJarStream.setLevel(0);
  +					
  +				//Copy files from old websphere jar
  +				for (Enumeration e = wasEntries.elements() ; e.hasMoreElements();)
  +				    {
  +					byte[] buffer = new byte[1024];
  +					int bytesRead;
  +					InputStream is;
  +					JarEntry je = (JarEntry)e.nextElement();
  +					if (je.getCompressedSize() == -1 ||
  +					    je.getCompressedSize() == je.getSize()) {
  +					    newJarStream.setLevel(0);
  +					}
  +					else {
  +					    newJarStream.setLevel(9);
  +					}
  +						
  +					// Update with changed Bean class
  +					if (replaceEntries.containsKey(je.getName()))
  +					    {
  +						log("Updating Bean class from generic Jar " + je.getName(),
  +						    Project.MSG_VERBOSE);
  +						// Use the entry from the generic jar
  +						je = (JarEntry)replaceEntries.get(je.getName());
  +						is = genericJar.getInputStream(je);
  +					    }
  +					else  //use fle from original websphere jar
  +					    {
  +						is = wasJar.getInputStream(je);
  +					    }
  +					newJarStream.putNextEntry(new JarEntry(je.getName()));
  +						
  +					while ((bytesRead = is.read(buffer)) != -1)
  +					    {
  +						newJarStream.write(buffer,0,bytesRead);
  +					    }
  +					is.close();
  +				    }
  +			    }
  +			else
  +			    {
  +				log("websphere Jar rebuild needed due to changed interface or XML",Project.MSG_VERBOSE);
  +			    }
  +		    }
  +		else
  +		    {
  +			rebuild = true;
  +		    }
  +	    }
  +	catch(ClassNotFoundException cnfe)
  +	    {
  +		String cnfmsg = "ClassNotFoundException while processing ejb-jar file"
  +		    + ". Details: "
  +		    + cnfe.getMessage();
  +		throw new BuildException(cnfmsg, cnfe);
  +	    }
  +	catch(IOException ioe) {
  +	    String msg = "IOException while processing ejb-jar file "
  +		+ ". Details: "
  +		+ ioe.getMessage();
  +	    throw new BuildException(msg, ioe);
  +	}
  +	finally {
  +	    // need to close files and perhaps rename output
  +	    if (genericJar != null) {
  +		try {
  +		    genericJar.close();
  +		}
  +		catch (IOException closeException) {}
  +	    }
  +			
  +	    if (wasJar != null) {
  +		try {
  +		    wasJar.close();
  +		}
  +		catch (IOException closeException) {}
  +	    }
  +			
  +	    if (newJarStream != null) {
  +		try {
  +		    newJarStream.close();
  +		}
  +		catch (IOException closeException) {}
  +				
  +		websphereJarFile.delete();
  +		newwasJarFile.renameTo(websphereJarFile);
  +		if (!websphereJarFile.exists()) {
  +		    rebuild = true;
  +		}
  +	    }
  +	}
  +		
  +	return rebuild;
  +    }
  +	
  +    /**
  +     * Helper method invoked by isRebuildRequired to get a ClassLoader for
  +     * a Jar File passed to it.
  +     *
  +     * @param classjar java.io.File representing jar file to get classes from.
  +     */
  +    protected ClassLoader getClassLoaderFromJar(File classjar) throws IOException
  +    {
  +	Path lookupPath = new Path(getTask().getProject());
  +	lookupPath.setLocation(classjar);
  +	
  +	Path classpath = getCombinedClasspath();
  +	if (classpath != null) {
  +	    lookupPath.append(classpath);
  +	}
  +		
  +	return new AntClassLoader(getTask().getProject(), lookupPath);
  +    }
  +}
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Translate.java	3 Nov 2001 04:01:18 -0000	1.2
  +++ Translate.java	10 Jan 2002 13:59:36 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java
  
  Index: VAJAntTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VAJAntTool.java	27 Nov 2001 18:04:52 -0000	1.4
  +++ VAJAntTool.java	10 Jan 2002 13:59:36 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.6       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VAJAntToolGUI.java	8 Jan 2002 19:56:55 -0000	1.5
  +++ VAJAntToolGUI.java	10 Jan 2002 13:59:36 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.5       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
  
  Index: VAJBuildInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VAJBuildInfo.java	27 Nov 2001 18:04:52 -0000	1.4
  +++ VAJBuildInfo.java	10 Jan 2002 13:59:36 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.7       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
  
  Index: VAJExport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VAJExport.java	27 Nov 2001 18:04:52 -0000	1.6
  +++ VAJExport.java	10 Jan 2002 13:59:36 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -209,4 +209,4 @@
           overwrite = doOverwrite;
       }
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java
  
  Index: VAJExportServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJExportServlet.java	28 Oct 2001 21:30:21 -0000	1.2
  +++ VAJExportServlet.java	10 Jan 2002 13:59:36 -0000	1.3
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.11      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
  
  Index: VAJImport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- VAJImport.java	27 Nov 2001 18:04:52 -0000	1.10
  +++ VAJImport.java	10 Jan 2002 13:59:36 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -229,4 +229,4 @@
                   importClasses, importResources, importSources,
                   useDefaultExcludes);
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
  
  Index: VAJImportServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJImportServlet.java	27 Nov 2001 18:04:52 -0000	1.2
  +++ VAJImportServlet.java	10 Jan 2002 13:59:36 -0000	1.3
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java
  
  Index: VAJLoadProjects.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- VAJLoadProjects.java	28 Oct 2001 21:30:21 -0000	1.7
  +++ VAJLoadProjects.java	10 Jan 2002 13:59:36 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java
  
  Index: VAJLoadServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VAJLoadServlet.java	28 Oct 2001 21:30:21 -0000	1.2
  +++ VAJLoadServlet.java	10 Jan 2002 13:59:36 -0000	1.3
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
  
  Index: VAJToolsServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VAJToolsServlet.java	15 Dec 2001 00:29:43 -0000	1.4
  +++ VAJToolsServlet.java	10 Jan 2002 13:59:36 -0000	1.5
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java
  
  Index: VAJUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VAJUtil.java	27 Nov 2001 18:04:52 -0000	1.6
  +++ VAJUtil.java	10 Jan 2002 13:59:36 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
  
  Index: VAJWorkspaceScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VAJWorkspaceScanner.java	27 Nov 2001 18:04:52 -0000	1.5
  +++ VAJWorkspaceScanner.java	10 Jan 2002 13:59:36 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  
  Index: JJTree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JJTree.java	26 Nov 2001 11:03:52 -0000	1.6
  +++ JJTree.java	10 Jan 2002 13:59:36 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.11      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  
  Index: JavaCC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JavaCC.java	26 Nov 2001 11:03:52 -0000	1.10
  +++ JavaCC.java	10 Jan 2002 13:59:36 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  
  Index: JDependTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JDependTask.java	8 Jan 2002 22:44:56 -0000	1.5
  +++ JDependTask.java	10 Jan 2002 13:59:37 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspC.java	8 Jan 2002 22:25:19 -0000	1.6
  +++ JspC.java	10 Jan 2002 13:59:37 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -99,7 +99,7 @@
    * &lt;/jspc&gt;
    * </pre>
    *
  - * @version $Revision: 1.6 $ $Date: 2002/01/08 22:25:19 $
  + * @version $Revision: 1.7 $ $Date: 2002/01/10 13:59:37 $
    * @author <a href="mailto:mattw@i3sp.com">Matthew Watson</a>
    * <p> Large Amount of cutting and pasting from the Javac task...
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WLJspc.java	22 Nov 2001 08:46:55 -0000	1.3
  +++ WLJspc.java	10 Jan 2002 13:59:37 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
  
  Index: AggregateTransformer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AggregateTransformer.java	27 Nov 2001 18:04:53 -0000	1.9
  +++ AggregateTransformer.java	10 Jan 2002 13:59:37 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
  
  Index: BaseTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseTest.java	9 Dec 2001 13:38:18 -0000	1.5
  +++ BaseTest.java	10 Jan 2002 13:59:37 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
  
  Index: BatchTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- BatchTest.java	9 Dec 2001 13:38:18 -0000	1.9
  +++ BatchTest.java	10 Jan 2002 13:59:37 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java
  
  Index: Enumerations.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Enumerations.java	1 Feb 2001 15:56:41 -0000	1.2
  +++ Enumerations.java	10 Jan 2002 13:59:37 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
  
  Index: FormatterElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FormatterElement.java	24 Jul 2001 13:28:56 -0000	1.6
  +++ FormatterElement.java	10 Jan 2002 13:59:37 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java
  
  Index: JUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JUnitResultFormatter.java	13 Sep 2001 09:19:37 -0000	1.6
  +++ JUnitResultFormatter.java	10 Jan 2002 13:59:37 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.30      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JUnitTask.java	8 Jan 2002 22:20:13 -0000	1.29
  +++ JUnitTask.java	10 Jan 2002 13:59:37 -0000	1.30
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
  
  Index: JUnitTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JUnitTest.java	9 Dec 2001 13:38:18 -0000	1.9
  +++ JUnitTest.java	10 Jan 2002 13:59:37 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.16      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
  
  Index: JUnitTestRunner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JUnitTestRunner.java	15 Dec 2001 00:28:47 -0000	1.15
  +++ JUnitTestRunner.java	10 Jan 2002 13:59:37 -0000	1.16
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
  
  Index: PlainJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PlainJUnitResultFormatter.java	9 Dec 2001 13:38:18 -0000	1.11
  +++ PlainJUnitResultFormatter.java	10 Jan 2002 13:59:37 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
  
  Index: SummaryJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SummaryJUnitResultFormatter.java	3 May 2001 15:04:01 -0000	1.6
  +++ SummaryJUnitResultFormatter.java	10 Jan 2002 13:59:37 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.18      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
  
  Index: XMLJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLJUnitResultFormatter.java	5 Jan 2002 01:39:40 -0000	1.17
  +++ XMLJUnitResultFormatter.java	10 Jan 2002 13:59:37 -0000	1.18
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java
  
  Index: Xalan1Executor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Xalan1Executor.java	25 Nov 2001 19:28:51 -0000	1.1
  +++ Xalan1Executor.java	10 Jan 2002 13:59:37 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java
  
  Index: Xalan2Executor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Xalan2Executor.java	25 Nov 2001 19:28:51 -0000	1.1
  +++ Xalan2Executor.java	10 Jan 2002 13:59:37 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
  
  Index: XalanExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XalanExecutor.java	26 Nov 2001 13:29:43 -0000	1.2
  +++ XalanExecutor.java	10 Jan 2002 13:59:37 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  
  Index: AbstractMetamataTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMetamataTask.java	28 Oct 2001 21:24:41 -0000	1.3
  +++ AbstractMetamataTask.java	10 Jan 2002 13:59:37 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
  
  Index: MAudit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MAudit.java	28 Oct 2001 21:30:22 -0000	1.2
  +++ MAudit.java	10 Jan 2002 13:59:37 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java
  
  Index: MAuditStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MAuditStreamHandler.java	28 Oct 2001 21:30:22 -0000	1.2
  +++ MAuditStreamHandler.java	10 Jan 2002 13:59:37 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
  
  Index: MMetrics.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MMetrics.java	28 Oct 2001 21:30:22 -0000	1.2
  +++ MMetrics.java	10 Jan 2002 13:59:37 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
  
  Index: MMetricsStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MMetricsStreamHandler.java	27 Nov 2001 18:04:53 -0000	1.4
  +++ MMetricsStreamHandler.java	10 Jan 2002 13:59:37 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  
  Index: MParse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MParse.java	28 Oct 2001 21:30:22 -0000	1.5
  +++ MParse.java	10 Jan 2002 13:59:37 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.16      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- FTP.java	8 Jan 2002 20:21:58 -0000	1.15
  +++ FTP.java	10 Jan 2002 13:59:37 -0000	1.16
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
  
  Index: P4Add.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- P4Add.java	9 Jan 2002 00:02:56 -0000	1.4
  +++ P4Add.java	10 Jan 2002 13:59:38 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  
  Index: P4Base.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- P4Base.java	9 Jan 2002 00:03:22 -0000	1.8
  +++ P4Base.java	10 Jan 2002 13:59:38 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.9       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
  
  Index: P4Change.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- P4Change.java	9 Jan 2002 00:03:22 -0000	1.8
  +++ P4Change.java	10 Jan 2002 13:59:38 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java
  
  Index: P4Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- P4Delete.java	9 Jan 2002 00:03:22 -0000	1.4
  +++ P4Delete.java	10 Jan 2002 13:59:38 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java
  
  Index: P4Edit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- P4Edit.java	9 Jan 2002 00:03:22 -0000	1.6
  +++ P4Edit.java	10 Jan 2002 13:59:38 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java
  
  Index: P4Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- P4Handler.java	9 Jan 2002 00:03:22 -0000	1.2
  +++ P4Handler.java	10 Jan 2002 13:59:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999, 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java
  
  Index: P4HandlerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- P4HandlerAdapter.java	9 Jan 2002 00:03:22 -0000	1.4
  +++ P4HandlerAdapter.java	10 Jan 2002 13:59:38 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999, 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java
  
  Index: P4Have.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- P4Have.java	9 Jan 2002 00:03:22 -0000	1.4
  +++ P4Have.java	10 Jan 2002 13:59:38 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java
  
  Index: P4Label.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- P4Label.java	9 Jan 2002 00:03:22 -0000	1.7
  +++ P4Label.java	10 Jan 2002 13:59:38 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java
  
  Index: P4Reopen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Reopen.java	9 Jan 2002 00:03:22 -0000	1.5
  +++ P4Reopen.java	10 Jan 2002 13:59:38 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java
  
  Index: P4Revert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- P4Revert.java	9 Jan 2002 00:03:22 -0000	1.4
  +++ P4Revert.java	10 Jan 2002 13:59:38 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
  
  Index: P4Submit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Submit.java	9 Jan 2002 00:03:22 -0000	1.5
  +++ P4Submit.java	10 Jan 2002 13:59:38 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java
  
  Index: P4Sync.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Sync.java	9 Jan 2002 00:03:22 -0000	1.5
  +++ P4Sync.java	10 Jan 2002 13:59:38 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.7       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java
  
  Index: SimpleP4OutputHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SimpleP4OutputHandler.java	9 Jan 2002 00:03:22 -0000	1.6
  +++ SimpleP4OutputHandler.java	10 Jan 2002 13:59:38 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +3 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package.html	4 Apr 2001 09:12:48 -0000	1.2
  +++ package.html	10 Jan 2002 13:59:38 -0000	1.3
  @@ -23,4 +23,7 @@
   @author <A HREF="mailto:leslie.hughes@rubus.com">Les Hughes</A>
   
   
  +<hr>
  +<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All rights
  +Reserved.</p>
   </body>
  
  
  
  1.7       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Pvcs.java	8 Jan 2002 22:33:07 -0000	1.6
  +++ Pvcs.java	10 Jan 2002 13:59:38 -0000	1.7
  @@ -2,7 +2,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -24,7 +24,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written
    *    permission, please contact apache@apache.org.
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java
  
  Index: PvcsProject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PvcsProject.java	28 Oct 2001 21:30:23 -0000	1.2
  +++ PvcsProject.java	10 Jan 2002 13:59:38 -0000	1.3
  @@ -24,7 +24,7 @@
    *    Alternately, this acknowlegement may appear in the software itself,
    *    if and wherever such third-party acknowlegements normally appear.
    *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  + * 4. The names "The Jakarta Project", "Ant", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
    *    from this software without prior written permission. For written 
    *    permission, please contact apache@apache.org.
  
  
  
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  
  Index: AntStarTeamCheckOut.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AntStarTeamCheckOut.java	18 Dec 2001 22:17:39 -0000	1.9
  +++ AntStarTeamCheckOut.java	10 Jan 2002 13:59:38 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  
  Index: CovMerge.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CovMerge.java	1 Dec 2001 00:00:46 -0000	1.5
  +++ CovMerge.java	10 Jan 2002 13:59:38 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.8       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  
  Index: CovReport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CovReport.java	9 Jan 2002 22:02:33 -0000	1.7
  +++ CovReport.java	10 Jan 2002 13:59:38 -0000	1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  
  Index: Coverage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Coverage.java	1 Dec 2001 00:00:46 -0000	1.5
  +++ Coverage.java	10 Jan 2002 13:59:38 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java
  
  Index: Filters.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Filters.java	18 Nov 2001 11:41:06 -0000	1.3
  +++ Filters.java	10 Jan 2002 13:59:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java
  
  Index: ReportFilters.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ReportFilters.java	18 Nov 2001 11:41:06 -0000	1.3
  +++ ReportFilters.java	10 Jan 2002 13:59:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Socket.java	22 Nov 2001 08:46:55 -0000	1.3
  +++ Socket.java	10 Jan 2002 13:59:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java
  
  Index: StringUtil.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/StringUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringUtil.java	18 Nov 2001 11:41:06 -0000	1.2
  +++ StringUtil.java	10 Jan 2002 13:59:38 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
  
  Index: Triggers.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Triggers.java	8 Jan 2002 23:57:12 -0000	1.3
  +++ Triggers.java	10 Jan 2002 13:59:38 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.6       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
  
  Index: AntSoundPlayer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AntSoundPlayer.java	27 Nov 2001 18:04:54 -0000	1.5
  +++ AntSoundPlayer.java	10 Jan 2002 13:59:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -87,7 +87,7 @@
    * I have only tested this with .WAV and .AIFF sound file formats. Both seem to work fine.
    *
    * @author Nick Pellow
  - * @version $Revision: 1.5 $, $Date: 2001/11/27 18:04:54 $
  + * @version $Revision: 1.6 $, $Date: 2002/01/10 13:59:39 $
    */
   
   public class AntSoundPlayer implements LineListener, BuildListener {
  
  
  
  1.6       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
  
  Index: SoundTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SoundTask.java	27 Nov 2001 17:44:52 -0000	1.5
  +++ SoundTask.java	10 Jan 2002 13:59:39 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -79,7 +79,7 @@
    *   Ant play them back
    *
    * @author Nick Pellow
  - * @version $Revision: 1.5 $, $Date: 2001/11/27 17:44:52 $
  + * @version $Revision: 1.6 $, $Date: 2002/01/10 13:59:39 $
    */
   
   public class SoundTask extends Task {
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
  
  Index: StarTeamCheckout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StarTeamCheckout.java	31 Dec 2001 20:15:57 -0000	1.2
  +++ StarTeamCheckout.java	10 Jan 2002 13:59:39 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
  
  Index: StarTeamLabel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StarTeamLabel.java	18 Dec 2001 22:17:22 -0000	1.1
  +++ StarTeamLabel.java	10 Jan 2002 13:59:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.2       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java
  
  Index: StarTeamTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StarTeamTask.java	18 Dec 2001 22:17:22 -0000	1.1
  +++ StarTeamTask.java	10 Jan 2002 13:59:39 -0000	1.2
  @@ -1,7 +1,7 @@
   /* 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights 
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
  
  Index: TreeBasedTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TreeBasedTask.java	8 Jan 2002 19:59:44 -0000	1.3
  +++ TreeBasedTask.java	10 Jan 2002 13:59:39 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  
  Index: MSVSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MSVSS.java	28 Oct 2001 21:30:24 -0000	1.11
  +++ MSVSS.java	10 Jan 2002 13:59:39 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
  
  Index: MSVSSCHECKIN.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MSVSSCHECKIN.java	28 Oct 2001 21:30:24 -0000	1.2
  +++ MSVSSCHECKIN.java	10 Jan 2002 13:59:39 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
  
  Index: MSVSSCHECKOUT.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MSVSSCHECKOUT.java	28 Oct 2001 21:30:24 -0000	1.2
  +++ MSVSSCHECKOUT.java	10 Jan 2002 13:59:39 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.12      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
  
  Index: MSVSSGET.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MSVSSGET.java	28 Oct 2001 21:30:24 -0000	1.11
  +++ MSVSSGET.java	10 Jan 2002 13:59:39 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.4       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  
  Index: MSVSSHISTORY.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MSVSSHISTORY.java	28 Oct 2001 21:30:24 -0000	1.3
  +++ MSVSSHISTORY.java	10 Jan 2002 13:59:39 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.5       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
  
  Index: MSVSSLABEL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSLABEL.java	28 Oct 2001 21:30:24 -0000	1.4
  +++ MSVSSLABEL.java	10 Jan 2002 13:59:39 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  

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