ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners NoPrefixProjectListener.java
Date Fri, 01 Mar 2002 08:54:20 GMT
donaldp     02/03/01 00:54:20

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/core
                        StringToFileConverter.java
               proposal/myrmidon/src/java/org/apache/antlib/vfile
                        DefaultFileSet.java FilteredFileList.java
                        ListFilesTask.java
               proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors
                        AbstractNameFileSelector.java AndFileSelector.java
                        BaseNameFileSelector.java
                        ExistenceFileSelector.java
                        IsEmptyFolderSelector.java IsFileSelector.java
                        IsFolderSelector.java NameFileSelector.java
                        NotFileSelector.java OrFileSelector.java
                        UrlFileSelector.java
               proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local
                        LocalFileSystemProvider.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
                        DefaultConfigurer.java NoSuchPropertyException.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
                        DefaultMasterConverter.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
                        DefaultClassLoaderManager.java DefaultDeployer.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
                        AspectAwareExecutor.java
               proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role
                        RoleInfo.java
               proposal/myrmidon/src/java/org/apache/myrmidon/listeners
                        NoPrefixProjectListener.java
  Log:
  restyle via IDEA
  
  Revision  Changes    Path
  1.7       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
  
  Index: StringToFileConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StringToFileConverter.java	21 Feb 2002 10:16:42 -0000	1.6
  +++ StringToFileConverter.java	1 Mar 2002 08:54:19 -0000	1.7
  @@ -8,12 +8,12 @@
   package org.apache.antlib.core;
   
   import java.io.File;
  +import org.apache.aut.converter.AbstractConverter;
  +import org.apache.aut.converter.ConverterException;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.aut.converter.AbstractConverter;
  -import org.apache.aut.converter.ConverterException;
   
   /**
    * String to file converter
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
  
  Index: DefaultFileSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultFileSet.java	28 Feb 2002 04:49:32 -0000	1.2
  +++ DefaultFileSet.java	1 Mar 2002 08:54:19 -0000	1.3
  @@ -8,6 +8,7 @@
   package org.apache.antlib.vfile;
   
   import java.util.ArrayList;
  +import org.apache.antlib.vfile.selectors.AndFileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.aut.vfs.FileSystemException;
   import org.apache.aut.vfs.FileType;
  @@ -15,7 +16,6 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.selectors.AndFileSelector;
   
   /**
    * A file set, that contains those files under a directory that match
  
  
  
  1.3       +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
  
  Index: FilteredFileList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FilteredFileList.java	28 Feb 2002 04:49:32 -0000	1.2
  +++ FilteredFileList.java	1 Mar 2002 08:54:19 -0000	1.3
  @@ -8,16 +8,16 @@
   package org.apache.antlib.vfile;
   
   import java.util.ArrayList;
  +import org.apache.antlib.vfile.selectors.AndFileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.selectors.AndFileSelector;
   
   /**
    * A file-list which filters another.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="filtered-path"
    * @ant:type type="v-path" name="filtered-path"
  @@ -67,6 +67,6 @@
               }
           }
   
  -        return (FileObject[])acceptedFiles.toArray( new FileObject[acceptedFiles.size()
] );
  +        return (FileObject[])acceptedFiles.toArray( new FileObject[ acceptedFiles.size()
] );
       }
   }
  
  
  
  1.3       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java
  
  Index: ListFilesTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ListFilesTask.java	27 Feb 2002 12:05:36 -0000	1.2
  +++ ListFilesTask.java	1 Mar 2002 08:54:19 -0000	1.3
  @@ -15,7 +15,7 @@
    * A debug task, which prints out the files in a file list.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/27 12:05:36 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:task name="v-list-path"
    */
  @@ -40,7 +40,7 @@
           final FileObject[] files = m_files.listFiles( getContext() );
           for( int i = 0; i < files.length; i++ )
           {
  -            FileObject file = files[i ];
  +            FileObject file = files[ i ];
               getLogger().info( file.toString() );
           }
       }
  
  
  
  1.2       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java
  
  Index: AbstractNameFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractNameFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ AbstractNameFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -7,7 +7,10 @@
    */
   package org.apache.antlib.vfile.selectors;
   
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.oro.text.GlobCompiler;
  @@ -15,15 +18,12 @@
   import org.apache.oro.text.regex.Pattern;
   import org.apache.oro.text.regex.Perl5Compiler;
   import org.apache.oro.text.regex.Perl5Matcher;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * An abstract file selector that selects files based on name.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    */
   public abstract class AbstractNameFileSelector
       implements FileSelector
  
  
  
  1.2       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
  
  Index: AndFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AndFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ AndFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -8,17 +8,17 @@
   package org.apache.antlib.vfile.selectors;
   
   import java.util.ArrayList;
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector that performs an AND of nested selectors.  Performs
    * lazy evaluation.  Returns true when no nested elements are supplied.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="and-selector"
    * @ant:type type="v-file-selector" name="and"
  @@ -46,8 +46,8 @@
       {
           for( int i = 0; i < m_selectors.size(); i++ )
           {
  -            final FileSelector fileSelector = (FileSelector)m_selectors.get(i );
  -            if( ! fileSelector.accept( file, path, context ) )
  +            final FileSelector fileSelector = (FileSelector)m_selectors.get( i );
  +            if( !fileSelector.accept( file, path, context ) )
               {
                   return false;
               }
  
  
  
  1.2       +1 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java
  
  Index: BaseNameFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/BaseNameFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseNameFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ BaseNameFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -8,13 +8,12 @@
   package org.apache.antlib.vfile.selectors;
   
   import org.apache.aut.vfs.FileObject;
  -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector;
   
   /**
    * A file selector that selects files based on their base-name.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="basename-selector"
    * @ant:type type="v-file-selector" name="basename"
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
  
  Index: ExistenceFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExistenceFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ ExistenceFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -7,17 +7,17 @@
    */
   package org.apache.antlib.vfile.selectors;
   
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.aut.vfs.FileSystemException;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector that only selects files that exist.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="exists-selector"
    * @ant:type type="v-file-selector" name="exists"
  
  
  
  1.2       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
  
  Index: IsEmptyFolderSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IsEmptyFolderSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ IsEmptyFolderSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -9,8 +9,8 @@
   
   import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
  -import org.apache.aut.vfs.FileType;
   import org.apache.aut.vfs.FileSystemException;
  +import org.apache.aut.vfs.FileType;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   
  @@ -18,7 +18,7 @@
    * A file selector that selects empty directories.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="is-empty-folder-selector"
    * @ant:type type="v-file-selector" name="is-empty"
  @@ -37,8 +37,8 @@
           try
           {
               return ( file.exists()
  -                     && file.getType() == FileType.FOLDER
  -                     && file.getChildren().length == 0 );
  +                && file.getType() == FileType.FOLDER
  +                && file.getChildren().length == 0 );
           }
           catch( FileSystemException e )
           {
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
  
  Index: IsFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IsFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ IsFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -7,18 +7,18 @@
    */
   package org.apache.antlib.vfile.selectors;
   
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.aut.vfs.FileSystemException;
   import org.apache.aut.vfs.FileType;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector which only selects files, not folders.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="is-file-selector"
    * @ant:type type="v-file-selector" name="is-file"
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
  
  Index: IsFolderSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IsFolderSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ IsFolderSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -7,18 +7,18 @@
    */
   package org.apache.antlib.vfile.selectors;
   
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.aut.vfs.FileSystemException;
   import org.apache.aut.vfs.FileType;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector which only selects folders, not files.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="is-folder-selector"
    * @ant:type type="v-file-selector" name="is-folder"
  
  
  
  1.2       +1 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java
  
  Index: NameFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NameFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ NameFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -8,13 +8,12 @@
   package org.apache.antlib.vfile.selectors;
   
   import org.apache.aut.vfs.FileObject;
  -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector;
   
   /**
    * A file selector that selects files based on their name.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="name-selector"
    * @ant:type type="v-file-selector" name="name"
  
  
  
  1.2       +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
  
  Index: NotFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NotFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ NotFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -7,16 +7,16 @@
    */
   package org.apache.antlib.vfile.selectors;
   
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector that negates a nested file selector.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="not-selector"
    * @ant:type type="v-file-selector" name="not"
  @@ -46,6 +46,6 @@
           {
               throw new TaskException( "notfileselector.no-selector.error" );
           }
  -        return ! m_selector.accept( file, path, context );
  +        return !m_selector.accept( file, path, context );
       }
   }
  
  
  
  1.2       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
  
  Index: OrFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OrFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ OrFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -8,17 +8,17 @@
   package org.apache.antlib.vfile.selectors;
   
   import java.util.ArrayList;
  +import org.apache.antlib.vfile.FileSelector;
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.antlib.vfile.FileSelector;
   
   /**
    * A file selector that performs an OR of nested selectors.  Performs
    * lazy evaluation.  Returns true when no nested elements are supplied.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="or-selector"
    * @ant:type type="v-file-selector" name="or"
  @@ -46,7 +46,7 @@
       {
           for( int i = 0; i < m_selectors.size(); i++ )
           {
  -            final FileSelector fileSelector = (FileSelector)m_selectors.get(i );
  +            final FileSelector fileSelector = (FileSelector)m_selectors.get( i );
               if( fileSelector.accept( file, path, context ) )
               {
                   return true;
  @@ -54,6 +54,6 @@
           }
   
           // Return true if there are no selectors, false if there are
  -        return (m_selectors.size() == 0);
  +        return ( m_selectors.size() == 0 );
       }
   }
  
  
  
  1.2       +1 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java
  
  Index: UrlFileSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/UrlFileSelector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UrlFileSelector.java	28 Feb 2002 04:49:32 -0000	1.1
  +++ UrlFileSelector.java	1 Mar 2002 08:54:19 -0000	1.2
  @@ -8,13 +8,12 @@
   package org.apache.antlib.vfile.selectors;
   
   import org.apache.aut.vfs.FileObject;
  -import org.apache.antlib.vfile.selectors.AbstractNameFileSelector;
   
   /**
    * A file selector that selects files based on their URL.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/28 04:49:32 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:19 $
    *
    * @ant:data-type name="url-selector"
    * @ant:type type="v-file-selector" name="url"
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java
  
  Index: LocalFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFileSystemProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalFileSystemProvider.java	15 Feb 2002 07:37:19 -0000	1.2
  +++ LocalFileSystemProvider.java	1 Mar 2002 08:54:19 -0000	1.3
  @@ -7,6 +7,7 @@
    */
   package org.apache.aut.vfs.provider.local;
   
  +import java.io.File;
   import org.apache.aut.vfs.FileObject;
   import org.apache.aut.vfs.FileSystemException;
   import org.apache.aut.vfs.provider.AbstractFileSystemProvider;
  @@ -14,7 +15,6 @@
   import org.apache.aut.vfs.provider.FileSystem;
   import org.apache.aut.vfs.provider.FileSystemProvider;
   import org.apache.aut.vfs.provider.ParsedUri;
  -import java.io.File;
   
   /**
    * A file system provider, which uses direct file access.
  
  
  
  1.34      +6 -5      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
  
  Index: DefaultConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- DefaultConfigurer.java	1 Mar 2002 02:13:35 -0000	1.33
  +++ DefaultConfigurer.java	1 Mar 2002 08:54:20 -0000	1.34
  @@ -33,7 +33,7 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.33 $ $Date: 2002/03/01 02:13:35 $
  + * @version $Revision: 1.34 $ $Date: 2002/03/01 08:54:20 $
    * @ant:type type="configurer" name="default"
    */
   public class DefaultConfigurer
  @@ -415,7 +415,7 @@
   
           // Convert the value to the appropriate type
           final Class type = setter.getType();
  -        if( ! type.isInstance( objValue ) )
  +        if( !type.isInstance( objValue ) )
           {
               objValue = m_converter.convert( type, objValue, context );
           }
  @@ -478,7 +478,7 @@
           configureObject( child, element, context );
   
           // Convert the object, if necessary
  -        if( ! type.isInstance( child ) )
  +        if( !type.isInstance( child ) )
           {
               child = m_converter.convert( type, child, context );
           }
  @@ -540,7 +540,8 @@
           // Map the expected type to a role.  If found, instantiate the default
           // type for that role
           final RoleInfo roleInfo = m_roleManager.getRoleByType( type );
  -        if( roleInfo != null ) {
  +        if( roleInfo != null )
  +        {
               final String typeName = roleInfo.getDefaultType();
               if( typeName != null )
               {
  @@ -582,7 +583,7 @@
   
           // Use the generic 'data-type' role.
           final TypeFactory factory = m_typeManager.getFactory( DataType.class );
  -        if( ! factory.canCreate( name ) )
  +        if( !factory.canCreate( name ) )
           {
               throw new NoSuchPropertyException();
           }
  
  
  
  1.5       +1 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java
  
  Index: NoSuchPropertyException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/NoSuchPropertyException.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NoSuchPropertyException.java	24 Feb 2002 07:43:37 -0000	1.4
  +++ NoSuchPropertyException.java	1 Mar 2002 08:54:20 -0000	1.5
  @@ -7,13 +7,11 @@
    */
   package org.apache.myrmidon.components.configurer;
   
  -
  -
   /**
    * A marker exception that is thrown when an unknown property is encountered.
    *
    * @author Adam Murdoch
  - * @version $Revision: 1.4 $ $Date: 2002/02/24 07:43:37 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/01 08:54:20 $
    */
   class NoSuchPropertyException
       extends Exception
  
  
  
  1.21      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
  
  Index: DefaultMasterConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultMasterConverter.java	25 Feb 2002 10:42:43 -0000	1.20
  +++ DefaultMasterConverter.java	1 Mar 2002 08:54:20 -0000	1.21
  @@ -27,7 +27,7 @@
    * Converter engine to handle converting between types.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.20 $ $Date: 2002/02/25 10:42:43 $
  + * @version $Revision: 1.21 $ $Date: 2002/03/01 08:54:20 $
    */
   public class DefaultMasterConverter
       extends AbstractLogEnabled
  @@ -140,7 +140,7 @@
           ArrayList queue = new ArrayList();
           queue.add( originalClass );
   
  -        while( ! queue.isEmpty() )
  +        while( !queue.isEmpty() )
           {
               Class clazz = (Class)queue.remove( 0 );
   
  @@ -152,7 +152,7 @@
               final Class[] interfaces = clazz.getInterfaces();
               for( int i = 0; i < interfaces.length; i++ )
               {
  -                queue.add( interfaces[i ] );
  +                queue.add( interfaces[ i ] );
               }
   
               // Check if we can convert from current class to destination
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java
  
  Index: DefaultClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultClassLoaderManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultClassLoaderManager.java	21 Feb 2002 11:06:41 -0000	1.2
  +++ DefaultClassLoaderManager.java	1 Mar 2002 08:54:20 -0000	1.3
  @@ -24,9 +24,9 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.myrmidon.interfaces.deployer.DeploymentException;
   import org.apache.myrmidon.interfaces.extensions.ExtensionManager;
   
  
  
  
  1.31      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DefaultDeployer.java	25 Feb 2002 10:42:43 -0000	1.30
  +++ DefaultDeployer.java	1 Mar 2002 08:54:20 -0000	1.31
  @@ -35,7 +35,7 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.30 $ $Date: 2002/02/25 10:42:43 $
  + * @version $Revision: 1.31 $ $Date: 2002/03/01 08:54:20 $
    */
   public class DefaultDeployer
       extends AbstractLogEnabled
  @@ -145,7 +145,7 @@
           throws Exception
       {
           final String roleShorthand = definition.getRoleShorthand();
  -        final String roleName  = getRole( roleShorthand ).getName();
  +        final String roleName = getRole( roleShorthand ).getName();
           final String factoryClassName = definition.getFactoryClass();
           handleType( deployment, ServiceFactory.class, roleName, factoryClassName );
       }
  @@ -277,7 +277,7 @@
       private RoleInfo getRole( final String roleShorthand )
           throws DeploymentException
       {
  -        final RoleInfo roleInfo =  m_roleManager.getRoleByShorthandName( roleShorthand
);
  +        final RoleInfo roleInfo = m_roleManager.getRoleByShorthandName( roleShorthand );
           if( null == roleInfo )
           {
               final String message = REZ.getString( "unknown-role4name.error", roleShorthand
);
  
  
  
  1.20      +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
  
  Index: AspectAwareExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AspectAwareExecutor.java	26 Feb 2002 23:21:07 -0000	1.19
  +++ AspectAwareExecutor.java	1 Mar 2002 08:54:20 -0000	1.20
  @@ -16,8 +16,8 @@
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.myrmidon.api.Task;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.interfaces.aspect.AspectManager;
  @@ -28,7 +28,7 @@
    * the aspects helpers.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.19 $ $Date: 2002/02/26 23:21:07 $
  + * @version $Revision: 1.20 $ $Date: 2002/03/01 08:54:20 $
    */
   public class AspectAwareExecutor
       extends DefaultExecutor
  
  
  
  1.3       +3 -5      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java
  
  Index: RoleInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RoleInfo.java	25 Feb 2002 10:42:44 -0000	1.2
  +++ RoleInfo.java	1 Mar 2002 08:54:20 -0000	1.3
  @@ -7,13 +7,11 @@
    */
   package org.apache.myrmidon.interfaces.role;
   
  -
  -
   /**
    * A role definition.  Role definitions are immutable.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/25 10:42:44 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:20 $
    */
   public final class RoleInfo
   {
  @@ -87,7 +85,7 @@
           {
               return false;
           }
  -        if( ! m_name.equals( role.m_name ) )
  +        if( !m_name.equals( role.m_name ) )
           {
               return false;
           }
  @@ -95,7 +93,7 @@
           {
               return false;
           }
  -        if( m_shorthand != null && ! m_shorthand.equals( role.m_shorthand ) )
  +        if( m_shorthand != null && !m_shorthand.equals( role.m_shorthand ) )
           {
               return false;
           }
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java
  
  Index: NoPrefixProjectListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/NoPrefixProjectListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NoPrefixProjectListener.java	1 Mar 2002 02:13:36 -0000	1.3
  +++ NoPrefixProjectListener.java	1 Mar 2002 08:54:20 -0000	1.4
  @@ -11,9 +11,9 @@
    * A project listener that emulated the Ant 1.x -emacs mode.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/03/01 02:13:36 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/01 08:54:20 $
    * @ant:type type="listener" name="noprefix"
  -  */
  + */
   public class NoPrefixProjectListener
       extends DefaultProjectListener
   {
  
  
  

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