ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs CVSPass.java Checksum.java Concat.java Copy.java DefBase.java DefaultExcludes.java Delete.java Ear.java Echo.java ExecTask.java Execute.java ExecuteJava.java ExecuteWatchdog.java Exit.java
Date Sat, 13 Sep 2003 12:58:34 GMT
antoine     2003/09/13 05:58:34

  Modified:    src/main/org/apache/tools/ant DirectoryScanner.java
                        FileScanner.java IntrospectionHelper.java
                        ProjectComponent.java
               src/main/org/apache/tools/ant/taskdefs CVSPass.java
                        Checksum.java Concat.java Copy.java DefBase.java
                        DefaultExcludes.java Delete.java Ear.java Echo.java
                        ExecTask.java Execute.java ExecuteJava.java
                        ExecuteWatchdog.java Exit.java
  Log:
  Spelling
  Submitted by: Larry Shatzer (Larry dot Shatzer At Spirent Dot Com)
  
  Revision  Changes    Path
  1.64      +5 -5      ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- DirectoryScanner.java	21 Aug 2003 16:56:12 -0000	1.63
  +++ DirectoryScanner.java	13 Sep 2003 12:58:33 -0000	1.64
  @@ -877,7 +877,7 @@
                       }
                   } catch (IOException ioe) {
                       String msg = "IOException caught while checking "
  -                        + "for links, couldn't get cannonical path!";
  +                        + "for links, couldn't get canonical path!";
                       // will be caught and redirected to Ant's logging system
                       System.err.println(msg);
                       noLinks.addElement(newfiles[i]);
  @@ -1108,7 +1108,7 @@
        * performing a slow scan if one has not already been completed.
        *
        * @return the names of the files which matched at least one of the
  -     *         include patterns and at at least one of the exclude patterns.
  +     *         include patterns and at least one of the exclude patterns.
        *
        * @see #slowScan
        */
  @@ -1385,7 +1385,7 @@
                   }
               } catch (IOException ioe) {
                   String msg = "IOException caught while checking "
  -                    + "for links, couldn't get cannonical path!";
  +                    + "for links, couldn't get canonical path!";
                   // will be caught and redirected to Ant's logging system
                   System.err.println(msg);
                   return false;
  @@ -1402,8 +1402,8 @@
       private Set scannedDirs = new HashSet();
   
       /**
  -     * Has the directorty with the given path relative to the base
  -     * directory allready been scanned?
  +     * Has the directory with the given path relative to the base
  +     * directory already been scanned?
        *
        * <p>Registers the given directory as scanned as a side effect.</p>
        *
  
  
  
  1.13      +2 -2      ant/src/main/org/apache/tools/ant/FileScanner.java
  
  Index: FileScanner.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/FileScanner.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- FileScanner.java	6 Jul 2003 09:57:34 -0000	1.12
  +++ FileScanner.java	13 Sep 2003 12:58:33 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -91,7 +91,7 @@
        * The names are relative to the base directory.
        *
        * @return the names of the files which matched at least one of the
  -     *         include patterns and at at least one of the exclude patterns.
  +     *         include patterns and at least one of the exclude patterns.
        *
        */
       String[] getExcludedFiles();
  
  
  
  1.65      +4 -4      ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
  
  Index: IntrospectionHelper.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- IntrospectionHelper.java	24 Jul 2003 14:20:31 -0000	1.64
  +++ IntrospectionHelper.java	13 Sep 2003 12:58:33 -0000	1.65
  @@ -146,7 +146,7 @@
       // distinction between addConfigured and add. It's obvious what the
       // code *here* does (addConfigured sets both a creator method which
       // calls a no-arg constructor and a storer method which calls the
  -    // method we're looking at, whlie add just sets a creator method
  +    // method we're looking at, while add just sets a creator method
       // which calls the method we're looking at) but it's not at all
       // obvious what the difference in actual *effect* will be later
       // on. I can't see any mention of addConfiguredXXX in "Developing
  @@ -1071,7 +1071,7 @@
               if (polyType != null) {
                   if (!nestedCreator.isPolyMorphic()) {
                       throw new BuildException(
  -                        "Not allowed to use the polymorhic form"
  +                        "Not allowed to use the polymorphic form"
                           + " for this element");
                   }
                   Class elementClass = nestedCreator.getElementClass();
  @@ -1111,8 +1111,8 @@
           }
   
           /**
  -         * Stores the nested elemtnt object using a storage method
  -         * detimined by introspection.
  +         * Stores the nested element object using a storage method
  +         * determined by introspection.
            *
            */
           public void store() {
  
  
  
  1.10      +2 -2      ant/src/main/org/apache/tools/ant/ProjectComponent.java
  
  Index: ProjectComponent.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectComponent.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ProjectComponent.java	6 Jul 2003 09:57:34 -0000	1.9
  +++ ProjectComponent.java	13 Sep 2003 12:58:33 -0000	1.10
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001,2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -106,7 +106,7 @@
       }
   
       /**
  -     * Logs a mesage with the given priority.
  +     * Logs a message with the given priority.
        *
        * @param msg The message to be logged. Should not be <code>null</code>.
        * @param msgLevel the message priority at which this message is
  
  
  
  1.20      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
  
  Index: CVSPass.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CVSPass.java	4 Jul 2003 13:03:37 -0000	1.19
  +++ CVSPass.java	13 Sep 2003 12:58:33 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -116,7 +116,7 @@
       /**
        * Does the work.
        *
  -     * @exception BuildException if someting goes wrong with the build
  +     * @exception BuildException if something goes wrong with the build
        */
       public final void execute() throws BuildException {
           if (cvsRoot == null) {
  
  
  
  1.34      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Checksum.java	19 Jul 2003 11:20:12 -0000	1.33
  +++ Checksum.java	13 Sep 2003 12:58:33 -0000	1.34
  @@ -96,7 +96,7 @@
       private File file = null;
   
       /**
  -     * Root directory in which the checksu files will be written.
  +     * Root directory in which the checksum files will be written.
        * If not specified, the checksum files will be written
        * in the same directory as each file.
        */
  @@ -576,7 +576,7 @@
       }
   
       /**
  -     * Converts an array of characters representing hexidecimal values into an
  +     * Converts an array of characters representing hexadecimal values into an
        * array of bytes of those same values. The returned array will be half the
        * length of the passed array, as it takes two characters to represent any
        * given byte. An exception is thrown if the passed char array has an odd
  
  
  
  1.28      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
  
  Index: Concat.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Concat.java	22 Aug 2003 15:25:44 -0000	1.27
  +++ Concat.java	13 Sep 2003 12:58:33 -0000	1.28
  @@ -303,7 +303,7 @@
       /**
        * Specify the end of line to find and to add if
        * not present at end of each input file. This attribute
  -     * is used in conjuction with fixlastline.
  +     * is used in conjunction with fixlastline.
        * @param crlf the type of new line to add -
        *              cr, mac, lf, unix, crlf, or dos
        * @since Ant 1.6
  @@ -737,7 +737,7 @@
            * Read a character from the current reader object. Advance
            * to the next if the reader is finished.
            * @return the character read, -1 for EOF on the last reader.
  -         * @exception IOException - possiblly thrown by the read for a reader
  +         * @exception IOException - possibly thrown by the read for a reader
            *            object.
            */
           public int read() throws IOException {
  @@ -773,7 +773,7 @@
            * @param cbuf The array to be read into.
            * @param off The offset.
            * @param len The length to read.
  -         * @exception IOException - possiblely thrown by the reads to the
  +         * @exception IOException - possibly thrown by the reads to the
            *            reader objects.
            */
           public int read(char[] cbuf, int off, int len)
  
  
  
  1.65      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Copy.java	25 Jul 2003 08:31:45 -0000	1.64
  +++ Copy.java	13 Sep 2003 12:58:33 -0000	1.65
  @@ -193,7 +193,7 @@
   
       /**
        * Give the copied files the same last modified time as the original files.
  -     * @param preserve if true perserce the modified time, default is false
  +     * @param preserve if true preserve the modified time, default is false
        */
       public void setPreserveLastModified(boolean preserve) {
           preserveLastModified = preserve;
  @@ -537,7 +537,7 @@
        * copied.
        *
        * @param fromDir  The source directory
  -     * @param toDir    The destination dirctory
  +     * @param toDir    The destination directory
        * @param files    A list of files to copy
        * @param dirs     A list of directories to copy
        */
  
  
  
  1.5       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/DefBase.java
  
  Index: DefBase.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DefBase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefBase.java	15 Aug 2003 15:04:29 -0000	1.4
  +++ DefBase.java	13 Sep 2003 12:58:33 -0000	1.5
  @@ -65,7 +65,7 @@
   
   /**
    * Base class for Definitions
  - * handling uri and and class loading.
  + * handling uri and class loading.
    * (This was part of Definer)
    *
    * @author Costin Manolache
  @@ -130,7 +130,7 @@
       }
   
       /**
  -     * @return the class path path for this definition
  +     * @return the classpath for this definition
        */
       public Path getClasspath() {
           return cpDelegate.getClasspath();
  
  
  
  1.7       +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java
  
  Index: DefaultExcludes.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultExcludes.java	25 Jul 2003 16:26:49 -0000	1.6
  +++ DefaultExcludes.java	13 Sep 2003 12:58:33 -0000	1.7
  @@ -80,7 +80,7 @@
       /**
        * Does the work.
        *
  -     * @exception BuildException if someting goes wrong with the build
  +     * @exception BuildException if something goes wrong with the build
        */
       public void execute() throws BuildException {
           if (!defaultrequested && add.equals("") && remove.equals("") &&
!echo) {
  @@ -129,7 +129,7 @@
        * Pattern to remove from the default excludes.
        *
        * @param remove Sets the value for the pattern that
  -     *            should nolonger be excluded.
  +     *            should no longer be excluded.
        */
       public void setRemove(String remove) {
           this.remove = remove;
  
  
  
  1.46      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Delete.java	25 Jul 2003 08:59:39 -0000	1.45
  +++ Delete.java	13 Sep 2003 12:58:33 -0000	1.46
  @@ -444,7 +444,7 @@
       }
   
       /**
  -     * add an arbitary selector
  +     * add an arbitrary selector
        * @param selector the selector to be added
        * @since Ant 1.6
        */
  
  
  
  1.25      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Ear.java	6 Jul 2003 09:57:36 -0000	1.24
  +++ Ear.java	13 Sep 2003 12:58:33 -0000	1.25
  @@ -136,7 +136,7 @@
       }
   
       /**
  -     * Overriden from Zip class to deal with application.xml
  +     * Overridden from Zip class to deal with application.xml
        */
       protected void zipFile(File file, ZipOutputStream zOut, String vPath,
                              int mode)
  
  
  
  1.29      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Echo.java	19 Jul 2003 08:10:59 -0000	1.28
  +++ Echo.java	13 Sep 2003 12:58:33 -0000	1.29
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -81,7 +81,7 @@
       /**
        * Does the work.
        *
  -     * @exception BuildException if someting goes wrong with the build
  +     * @exception BuildException if something goes wrong with the build
        */
       public void execute() throws BuildException {
           if (file == null) {
  
  
  
  1.60      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
  
  Index: ExecTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- ExecTask.java	29 Jul 2003 13:09:11 -0000	1.59
  +++ ExecTask.java	13 Sep 2003 12:58:33 -0000	1.60
  @@ -537,7 +537,7 @@
   
       /**
        * Run the command using the given Execute instance. This may be
  -     * overidden by subclasses
  +     * overridden by subclasses
        *
        * @param exe instance of Execute to run
        *
  
  
  
  1.66      +5 -5      ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- Execute.java	3 Sep 2003 16:47:17 -0000	1.65
  +++ Execute.java	13 Sep 2003 12:58:33 -0000	1.66
  @@ -440,7 +440,7 @@
        * allow the shell to perform additional processing such as associating an
        * executable with a script, etc
        *
  -     * @param useVMLauncher true if exec should launch through thge VM,
  +     * @param useVMLauncher true if exec should launch through the VM,
        *                   false if the shell should be used to launch the
        *                   command.
        */
  @@ -603,7 +603,7 @@
   
       /**
        * test for an untimely death of the process
  -     * @return true iff a watchdog had to kill the process
  +     * @return true if a watchdog had to kill the process
        * @since Ant 1.5
        */
       public boolean killedProcess() {
  @@ -727,7 +727,7 @@
            * @param project       The project that the command is part of
            * @param cmd           The command to execute
            * @param env           The environment for the new process.  If null,
  -         *                      the environment of the current proccess is used.
  +         *                      the environment of the current process is used.
            * @throws IOException  if attempting to run a command in a specific directory
            */
           public Process exec(Project project, String[] cmd, String[] env)
  @@ -746,7 +746,7 @@
            * @param project       The project that the command is part of
            * @param cmd           The command to execute
            * @param env           The environment for the new process.  If null,
  -         *                      the environment of the current proccess is used.
  +         *                      the environment of the current process is used.
            * @param workingDir    The directory to start the command in.  If null,
            *                      the current directory is used
            * @throws IOException  if trying to change directory
  
  
  
  1.38      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ExecuteJava.java	3 Sep 2003 16:47:17 -0000	1.37
  +++ ExecuteJava.java	13 Sep 2003 12:58:33 -0000	1.38
  @@ -166,7 +166,7 @@
                   Task currentThreadTask
                       = project.getThreadTask(Thread.currentThread());
                   project.registerThreadTask(thread, currentThreadTask);
  -                // if we run into a timout, the run-away thread shall not
  +                // if we run into a timeout, the run-away thread shall not
                   // make the VM run forever - if no timeout occurs, Ant's
                   // main thread will still be there to let the new thread
                   // finish
  
  
  
  1.18      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
  
  Index: ExecuteWatchdog.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ExecuteWatchdog.java	25 Jul 2003 12:14:42 -0000	1.17
  +++ ExecuteWatchdog.java	13 Sep 2003 12:58:33 -0000	1.18
  @@ -82,7 +82,7 @@
       /** the process to execute and watch for duration */
       private Process process;
   
  -    /** say whether or not the watchog is currently monitoring a process */
  +    /** say whether or not the watchdog is currently monitoring a process */
       private boolean watch = false;
   
       /** exception that might be thrown during the process execution */
  @@ -91,14 +91,14 @@
       /** say whether or not the process was killed due to running overtime */
       private boolean     killedProcess = false;
   
  -    /** will tell us whether timeout has occured */
  +    /** will tell us whether timeout has occurred */
       private Watchdog watchdog;
   
       /**
        * Creates a new watchdog with a given timeout.
        *
        * @param timeout the timeout for the process in milliseconds.
  -     * It must be greather than 0.
  +     * It must be greater than 0.
        */
       public ExecuteWatchdog(long timeout) {
           watchdog = new Watchdog(timeout);
  
  
  
  1.24      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/Exit.java
  
  Index: Exit.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Exit.java	6 Sep 2003 07:02:31 -0000	1.23
  +++ Exit.java	13 Sep 2003 12:58:33 -0000	1.24
  @@ -111,7 +111,7 @@
        * evaluate both if and unless conditions, and if
        * ifCondition is true or unlessCondition is false, throw a
        * build exception to exit the build.
  -     * The errore message is constructed from the text fields, or from
  +     * The error message is constructed from the text fields, or from
        * the if and unless parameters (if present).
        * @throws BuildException
        */
  @@ -168,7 +168,7 @@
       /**
        * test the unless condition
        * @return true if there is no unless condition,
  -     *  or there is a named property but it doesnt exist
  +     *  or there is a named property but it doesn't exist
        */
       private boolean testUnlessCondition() {
           if (unlessCondition == null || "".equals(unlessCondition)) {
  
  
  

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


Mime
View raw message