You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2001/11/17 08:05:04 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier SarVerifier.java

donaldp     01/11/16 23:05:04

  Modified:    src/java/org/apache/avalon/phoenix/tools/assembler
                        Assembler.java
               src/java/org/apache/avalon/phoenix/tools/infobuilder
                        BlockInfoBuilder.java
               src/java/org/apache/avalon/phoenix/tools/installer
                        FileDigest.java Installation.java Installer.java
               src/java/org/apache/avalon/phoenix/tools/tasks Sar.java
               src/java/org/apache/avalon/phoenix/tools/verifier
                        SarVerifier.java
  Log:
  Ran style formatter over codebase to homogenize it.
  
  Revision  Changes    Path
  1.4       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java
  
  Index: Assembler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Assembler.java	2001/11/09 21:14:31	1.3
  +++ Assembler.java	2001/11/17 07:05:04	1.4
  @@ -24,7 +24,6 @@
   import org.apache.avalon.phoenix.metainfo.BlockInfo;
   import org.apache.avalon.phoenix.tools.infobuilder.BlockInfoBuilder;
   
  -
   /**
    * Assemble a <code>SarMetaData</code> object from a Configuration
    * object. The Configuration object represents the assembly descriptor
  
  
  
  1.4       +19 -19    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java
  
  Index: BlockInfoBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BlockInfoBuilder.java	2001/11/09 21:14:31	1.3
  +++ BlockInfoBuilder.java	2001/11/17 07:05:04	1.4
  @@ -8,20 +8,19 @@
   package org.apache.avalon.phoenix.tools.infobuilder;
   
   import java.util.ArrayList;
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  -import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
  -import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
  +import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.metainfo.BlockDescriptor;
   import org.apache.avalon.phoenix.metainfo.BlockInfo;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
  +import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
   
   /**
  - * A BlockInfoBuilder is responsible for building <code>BlockInfo</code> 
  + * A BlockInfoBuilder is responsible for building <code>BlockInfo</code>
    * objects from Configuration objects. The format for Configuration object
    * is specified in the BlockInfo specification.
    *
  @@ -64,9 +63,9 @@
   
           if( getLogger().isDebugEnabled() )
           {
  -            final String message = REZ.getString( "blockinfo-created", 
  -                                                  classname, 
  -                                                  new Integer( services.length ), 
  +            final String message = REZ.getString( "blockinfo-created",
  +                                                  classname,
  +                                                  new Integer( services.length ),
                                                     new Integer( dependencies.length ) );
               getLogger().debug( message );
           }
  @@ -83,7 +82,7 @@
        * @return the created DependencyDescriptor
        * @exception ConfigurationException if an error occurs
        */
  -    private DependencyDescriptor[] buildDependencies( final String classname, 
  +    private DependencyDescriptor[] buildDependencies( final String classname,
                                                         final Configuration configuration )
           throws ConfigurationException
       {
  @@ -92,12 +91,12 @@
   
           for( int i = 0; i < elements.length; i++ )
           {
  -            final DependencyDescriptor dependency = 
  +            final DependencyDescriptor dependency =
                   buildDependency( classname, elements[ i ] );
               dependencies.add( dependency );
           }
   
  -        return (DependencyDescriptor[])dependencies.toArray( new DependencyDescriptor[0] );
  +        return (DependencyDescriptor[])dependencies.toArray( new DependencyDescriptor[ 0 ] );
       }
   
       /**
  @@ -109,7 +108,7 @@
        * @return the created DependencyDescriptor
        * @exception ConfigurationException if an error occurs
        */
  -    private DependencyDescriptor buildDependency( final String classname, 
  +    private DependencyDescriptor buildDependency( final String classname,
                                                     final Configuration dependency )
           throws ConfigurationException
       {
  @@ -117,15 +116,16 @@
           String role = dependency.getChild( "role" ).getValue( null );
   
           //default to name of service if role unspecified
  -        if( null == role ) role = service.getName();
  +        if( null == role )
  +            role = service.getName();
           else
           {
  -            //If role is specified and it is the same as 
  +            //If role is specified and it is the same as
               //service name then warn that it is redundent.
               if( role.equals( service.getName() ) )
               {
                   final String message = REZ.getString( "redundent-role", classname, role );
  -                getLogger().warn( message ); 
  +                getLogger().warn( message );
               }
           }
   
  @@ -167,7 +167,7 @@
           throws ConfigurationException
       {
           final String name = service.getAttribute( "name" );
  -        final Version version =  buildVersion( service.getAttribute( "version" ) );
  +        final Version version = buildVersion( service.getAttribute( "version" ) );
           return new ServiceDescriptor( name, version );
       }
   
  @@ -196,7 +196,7 @@
               return null;
           }
   
  -        final Version version =  buildVersion( block.getChild("version").getValue() );
  +        final Version version = buildVersion( block.getChild( "version" ).getValue() );
   
           return new BlockDescriptor( classname, version );
       }
  
  
  
  1.5       +3 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/FileDigest.java
  
  Index: FileDigest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/FileDigest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileDigest.java	2001/11/01 22:47:40	1.4
  +++ FileDigest.java	2001/11/17 07:05:04	1.5
  @@ -3,7 +3,7 @@
   import java.io.File;
   
   /**
  - * FileDigest holds file deployment information. Information 
  + * FileDigest holds file deployment information. Information
    * used to verify if file was modified since deployment.
    */
   public class FileDigest
  @@ -16,12 +16,12 @@
        * @param the file.
        * @param the checksum value of the file.
        */
  -    public FileDigest(final File file, final long checksum)
  +    public FileDigest( final File file, final long checksum )
       {
           m_file = file;
           m_checksum = checksum;
       }
  -        
  +
       /** Retrieve the file.
        *
        * @return the file.
  
  
  
  1.8       +12 -12    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installation.java
  
  Index: Installation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installation.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Installation.java	2001/11/10 20:39:42	1.7
  +++ Installation.java	2001/11/17 07:05:04	1.8
  @@ -20,28 +20,28 @@
   public final class Installation
   {
       ///The source of installation (usually a directory in .sar format or a .sar file)
  -    private final File         m_source;
  +    private final File m_source;
   
       ///Directory in which application is installed
  -    private final File         m_directory;
  +    private final File m_directory;
   
       ///URL to block configuration data
  -    private final String       m_config;
  +    private final String m_config;
   
       ///URL to assembly data
  -    private final String       m_assembly;
  +    private final String m_assembly;
   
       ///URL to application configuration data
  -    private final String       m_environment;
  +    private final String m_environment;
   
       ///ClassPath for application
  -    private final String[]     m_classPath;
  -        
  +    private final String[] m_classPath;
  +
       ///Info for expanded files
       private final FileDigest[] m_digests;
  -    
  +
       ///Installation timestamp
  -    private final long         m_timestamp;
  +    private final long m_timestamp;
   
       public Installation( final File source,
                            final File directory,
  @@ -122,7 +122,7 @@
       {
           return m_classPath;
       }
  -    
  +
       /** Retrieve file digests.
        *
        * @return the file digest list.
  @@ -130,8 +130,8 @@
       public FileDigest[] getFileDigests()
       {
           return m_digests;
  -    }    
  -    
  +    }
  +
       /** Retrieve the timestamp.
        *
        * @return the timestamp when installation occured.
  
  
  
  1.21      +83 -80    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java
  
  Index: Installer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Installer.java	2001/11/12 07:29:22	1.20
  +++ Installer.java	2001/11/17 07:05:04	1.21
  @@ -8,22 +8,20 @@
   package org.apache.avalon.phoenix.tools.installer;
   
   import java.io.File;
  -import java.io.FileOutputStream;
   import java.io.FileInputStream;
  +import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.Collection;
   import java.util.ArrayList;
   import java.util.Enumeration;
  -import java.util.zip.ZipEntry;
  -import java.util.zip.ZipException;
  -import java.util.zip.ZipFile;
   import java.util.zip.CRC32;
  -import java.util.zip.Checksum;
   import java.util.zip.CheckedInputStream;
  +import java.util.zip.Checksum;
  +import java.util.zip.ZipEntry;
  +import java.util.zip.ZipFile;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.io.ExtensionFileFilter;
  @@ -43,25 +41,25 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( Installer.class );
   
  -    private static final String    OLD_ASSEMBLY_XML  = "conf" + File.separator + "assembly.xml";
  +    private static final String OLD_ASSEMBLY_XML = "conf" + File.separator + "assembly.xml";
   
  -    private static final String    OLD_CONFIG_XML    = "conf" + File.separator + "config.xml";
  -    private static final String    OLD_SERVER_XML    = "conf" + File.separator + "server.xml";
  -    private static final String    OLD_BLOCKS        = "blocks";
  -    private static final String    OLD_LIB           = "lib";
  -
  -    private static final String    META_INF     = "META-INF";   
  -    private static final String    SAR_INF      = "SAR-INF";   
  -    private static final String    LIB          = "SAR-INF/lib";   
  -    private static final String    ASSEMBLY_XML = "SAR-INF/assembly.xml";
  -    private static final String    CONFIG_XML   = "SAR-INF/config.xml";
  -    private static final String    SERVER_XML   = "SAR-INF/server.xml";
  -    private static final String    ENV_XML      = "SAR-INF/environment.xml";
  +    private static final String OLD_CONFIG_XML = "conf" + File.separator + "config.xml";
  +    private static final String OLD_SERVER_XML = "conf" + File.separator + "server.xml";
  +    private static final String OLD_BLOCKS = "blocks";
  +    private static final String OLD_LIB = "lib";
  +
  +    private static final String META_INF = "META-INF";
  +    private static final String SAR_INF = "SAR-INF";
  +    private static final String LIB = "SAR-INF/lib";
  +    private static final String ASSEMBLY_XML = "SAR-INF/assembly.xml";
  +    private static final String CONFIG_XML = "SAR-INF/config.xml";
  +    private static final String SERVER_XML = "SAR-INF/server.xml";
  +    private static final String ENV_XML = "SAR-INF/environment.xml";
   
       //The names on the native filesystem
  -    private static final String    FS_CONFIG_XML   = "SAR-INF" + File.separator + "config.xml";
  -    private static final String    FS_SERVER_XML   = "SAR-INF" + File.separator + "server.xml";
  -    private static final String    FS_ENV_XML      = "SAR-INF" + File.separator + "environment.xml";
  +    private static final String FS_CONFIG_XML = "SAR-INF" + File.separator + "config.xml";
  +    private static final String FS_SERVER_XML = "SAR-INF" + File.separator + "server.xml";
  +    private static final String FS_ENV_XML = "SAR-INF" + File.separator + "environment.xml";
   
       /**
        * Uninstall the Sar designated installation.
  @@ -74,39 +72,39 @@
       {
           final FileDigest[] infos = installation.getFileDigests();
           final Checksum checksum = new CRC32();
  -                
  +
           if( infos != null )
           {
               for( int i = 0; i < infos.length; i++ )
               {
  -                final File file = infos[i].getFile();
  +                final File file = infos[ i ].getFile();
                   final File parent = file.getParentFile();
  -                                
  +
                   final String message = REZ.getString( "skip-removal", file );
  -                
  +
                   if( file.exists() )
  -                {                    
  +                {
                       if( file.lastModified() <= installation.getTimestamp() )
                       {
  -                        getLogger().debug( message );                        
  +                        getLogger().debug( message );
                           continue;
                       }
  -                    
  +
                       checksum( file, checksum );
   
  -                    if( checksum.getValue() != infos[i].getChecksum() )
  +                    if( checksum.getValue() != infos[ i ].getChecksum() )
                       {
  -                        getLogger().debug( message );                        
  +                        getLogger().debug( message );
                           continue;
                       }
  -                        
  -                    file.delete();                                                
  +
  +                    file.delete();
                       if( 0 == parent.list().length ) parent.delete();
                   }
               }
           }
       }
  -    
  +
       /**
        * Utility method to compute the checksum for a given file.
        * @param file the computed file.
  @@ -116,19 +114,19 @@
       {
           checksum.reset();
   
  -        InputStream input = null;        
  -        try 
  -        {                           
  +        InputStream input = null;
  +        try
  +        {
               input = new CheckedInputStream( new FileInputStream( file ), checksum );
               IOUtil.toByteArray( input );
  -        } 
  +        }
           catch( final IOException ioe )
           {
               final String message = REZ.getString( "checksum-failure", file );
               getLogger().warn( message );
  -        }     
  -        finally 
  -        {                        
  +        }
  +        finally
  +        {
               IOUtil.shutdownStream( input );
           }
       }
  @@ -147,7 +145,7 @@
           {
               final String notice = REZ.getString( "installing-sar", url );
               getLogger().info( notice );
  -            
  +
               final File file = getFileFor( url );
               if( file.isDirectory() )
               {
  @@ -201,8 +199,8 @@
               final ZipEntry entry = (ZipEntry)entries.nextElement();
               final String name = fixName( entry.getName() );
   
  -            if( name.startsWith( OLD_BLOCKS ) || 
  -                name.startsWith( OLD_LIB ) || 
  +            if( name.startsWith( OLD_BLOCKS ) ||
  +                name.startsWith( OLD_LIB ) ||
                   name.equals( "conf/assembly.xml" ) ||
                   name.equals( "conf/config.xml" ) ||
                   name.equals( "conf/server.xml" ) )
  @@ -239,7 +237,7 @@
       private void lock()
       {
       }
  -    
  +
       /**
        * Utility method to unlock repository to allow other installers to access it.
        * Currently a no-op.
  @@ -249,21 +247,21 @@
       }
   
       /**
  -     * Install a new style sar. 
  +     * Install a new style sar.
        *
        * @param url the url designator of sar
        * @param file the file of sar
        * @param zipFile the ZipFile representing sar
        * @return the Installation object
        */
  -    private Installation install( final URL url, 
  -                                  final File file, 
  +    private Installation install( final URL url,
  +                                  final File file,
                                     final ZipFile zipFile )
           throws InstallationException
       {
           final File directory = getDestinationFor( file );
   
  -        //Question: Should we be making sure that 
  +        //Question: Should we be making sure that
           //this directory is created?
           directory.mkdirs();
   
  @@ -286,17 +284,17 @@
               //Don't expand anything below SAR-INF directory unless they
               //are the config.xml or server.xml files which will be expanded
               //as a special case atm.
  -            if( name.startsWith( SAR_INF ) && 
  -                !name.equals( SERVER_XML ) && 
  -                !name.equals( ENV_XML ) && 
  +            if( name.startsWith( SAR_INF ) &&
  +                !name.equals( SERVER_XML ) &&
  +                !name.equals( ENV_XML ) &&
                   !name.equals( CONFIG_XML ) )
               {
                   expand = false;
   
  -                //Grab all the jar files in the 
  +                //Grab all the jar files in the
                   //directory SAR-INF/lib
  -                if( name.startsWith( LIB ) && 
  -                    name.endsWith( ".jar" ) && 
  +                if( name.startsWith( LIB ) &&
  +                    name.endsWith( ".jar" ) &&
                       LIB.length() == name.lastIndexOf( "/" ) )
                   {
                       isJar = true;
  @@ -351,15 +349,15 @@
           final String assembly = "jar:" + getURLAsString( file ) + "!/" + ASSEMBLY_XML;
           final String config = getURLAsString( new File( directory, FS_CONFIG_XML ) );
           final String environment = getURLAsString( envFile );
  -        final FileDigest[] fileDigests = (FileDigest[])digests.toArray( new FileDigest[0] );
  +        final FileDigest[] fileDigests = (FileDigest[])digests.toArray( new FileDigest[ 0 ] );
           final long timestamp = System.currentTimeMillis();
   
  -        return new Installation( file, directory, config, assembly, environment, 
  +        return new Installation( file, directory, config, assembly, environment,
                                    classPath, fileDigests, timestamp );
       }
   
       /**
  -     * Fix the specified name so that it does not start 
  +     * Fix the specified name so that it does not start
        * with a "/" character.
        *
        * @param name the name to fix
  @@ -367,8 +365,10 @@
        */
       private String fixName( final String name )
       {
  -        if( name.startsWith( "/" ) ) return name.substring( 1 );
  -        else return name;
  +        if( name.startsWith( "/" ) )
  +            return name.substring( 1 );
  +        else
  +            return name;
       }
   
       /**
  @@ -378,8 +378,8 @@
        * @param zipFile the ZipFile object for sar
        * @return the Installaiton
        */
  -    private Installation installDeprecated( final URL url, 
  -                                            final File file, 
  +    private Installation installDeprecated( final URL url,
  +                                            final File file,
                                               final ZipFile zipFile )
           throws InstallationException
       {
  @@ -414,7 +414,7 @@
           final String config = getURLAsString( new File( directory, OLD_CONFIG_XML ) );
           final String assembly = getURLAsString( new File( directory, OLD_ASSEMBLY_XML ) );
           final String server = getURLAsString( new File( directory, OLD_SERVER_XML ) );
  -        final FileDigest[] fileDigests = (FileDigest[])digests.toArray( new FileDigest[0] );
  +        final FileDigest[] fileDigests = (FileDigest[])digests.toArray( new FileDigest[ 0 ] );
           final long timestamp = System.currentTimeMillis();
   
           return new Installation( file, directory, config, assembly, server, classPath, fileDigests, timestamp );
  @@ -437,7 +437,7 @@
   
           return new Installation( directory, directory, config, assembly, server, classPath, null, timestamp );
       }
  -   
  +
       /**
        * Get File object for URL.
        * Currently it assumes that URL is a file URL but in the
  @@ -468,7 +468,7 @@
   
           return file;
       }
  -    
  +
       /**
        * Expand specified entry from specified zipfile into specified location.
        *
  @@ -478,14 +478,14 @@
        * @param digests the digests for the expanded files.
        * @exception IOException if an error occurs
        */
  -    private void expandZipEntry( final ZipFile zipFile, 
  -                                 final ZipEntry entry, 
  -                                 final File file, 
  +    private void expandZipEntry( final ZipFile zipFile,
  +                                 final ZipEntry entry,
  +                                 final File file,
                                    final ArrayList digests )
           throws InstallationException
  -    {        
  +    {
           if( entry.isDirectory() ) return;
  - 
  +
           InputStream input = null;
           OutputStream output = null;
   
  @@ -493,12 +493,12 @@
           {
               file.getParentFile().mkdirs();
               output = new FileOutputStream( file );
  -            input =  zipFile.getInputStream( entry );
  -            IOUtil.copy( input, output );            
  +            input = zipFile.getInputStream( entry );
  +            IOUtil.copy( input, output );
           }
           catch( final IOException ioe )
           {
  -            final String message = 
  +            final String message =
                   REZ.getString( "failed-to-expand", entry.getName(), file, ioe.getMessage() );
               throw new InstallationException( message, ioe );
           }
  @@ -506,8 +506,8 @@
           {
               IOUtil.shutdownStream( input );
               IOUtil.shutdownStream( output );
  -        }        
  -        
  +        }
  +
           final long checksum = entry.getCrc();
           final long modified = file.lastModified();
           final FileDigest info = new FileDigest( file, checksum );
  @@ -526,7 +526,7 @@
           final String base =
               FileUtil.removeExtension( FileUtil.removePath( file.getName() ) );
   
  -        return (new File( file.getParentFile(), base )).getAbsoluteFile();
  +        return ( new File( file.getParentFile(), base ) ).getAbsoluteFile();
       }
   
       /**
  @@ -540,9 +540,9 @@
           final File libDir = new File( directory, "lib" );
   
           final ArrayList urls = new ArrayList();
  -        getURLsAsStrings( urls, blockDir, new String[] { ".bar" } );
  -        getURLsAsStrings( urls, libDir, new String[] { ".jar", ".zip" } );
  -        return (String[])urls.toArray( new String[0] );
  +        getURLsAsStrings( urls, blockDir, new String[]{ ".bar" } );
  +        getURLsAsStrings( urls, libDir, new String[]{ ".jar", ".zip" } );
  +        return (String[])urls.toArray( new String[ 0 ] );
       }
   
       /**
  @@ -572,7 +572,10 @@
        */
       private String getURLAsString( final File file )
       {
  -        try { return file.toURL().toExternalForm(); }
  +        try
  +        {
  +            return file.toURL().toExternalForm();
  +        }
           catch( final MalformedURLException mue )
           {
               return null;
  
  
  
  1.7       +13 -16    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java
  
  Index: Sar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/tasks/Sar.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Sar.java	2001/11/10 20:37:18	1.6
  +++ Sar.java	2001/11/17 07:05:04	1.7
  @@ -8,9 +8,6 @@
   package org.apache.avalon.phoenix.tools.tasks;
   
   import java.io.File;
  -import org.apache.tools.ant.BuildException;
  -import org.apache.tools.ant.taskdefs.Jar;
  -import org.apache.tools.ant.types.ZipFileSet;
   
   /**
    * Creates a Sar archive.
  @@ -18,14 +15,14 @@
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    */
  -public class Sar 
  -    extends Jar 
  +public class Sar
  +    extends Jar
   {
  -    private File      m_config;
  -    private File      m_assembly;
  -    private File      m_environment;
  +    private File m_config;
  +    private File m_assembly;
  +    private File m_environment;
   
  -    public Sar() 
  +    public Sar()
       {
           archiveType = "sar";
           emptyBehavior = "fail";
  @@ -36,7 +33,7 @@
           setZipfile( file );
       }
   
  -    public void setConfig( final File config ) 
  +    public void setConfig( final File config )
       {
           m_config = config;
   
  @@ -51,7 +48,7 @@
           }
       }
   
  -    public void setAssembly( final File assembly ) 
  +    public void setAssembly( final File assembly )
       {
           m_assembly = assembly;
   
  @@ -66,13 +63,13 @@
           }
       }
   
  -    public void setServer( final File server ) 
  +    public void setServer( final File server )
       {
           System.err.println( "DEPRECATED: Server attribute of sar task is deprecated" );
           setEnvironment( server );
       }
   
  -    public void setEnvironment( final File environment ) 
  +    public void setEnvironment( final File environment )
       {
           m_environment = environment;
   
  @@ -89,11 +86,11 @@
   
       public void addLib( final ZipFileSet zipFileSet )
       {
  -        zipFileSet.setPrefix( "SAR-INF/lib");
  +        zipFileSet.setPrefix( "SAR-INF/lib" );
           super.addFileset( zipFileSet );
       }
   
  -    public void execute() throws BuildException 
  +    public void execute() throws BuildException
       {
           if( null == m_config )
           {
  @@ -124,7 +121,7 @@
           super.addFileset( zipFileSet );
       }
   
  -    protected void cleanUp() 
  +    protected void cleanUp()
       {
           super.cleanUp();
   
  
  
  
  1.7       +1 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
  
  Index: SarVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SarVerifier.java	2001/11/09 21:14:31	1.6
  +++ SarVerifier.java	2001/11/17 07:05:04	1.7
  @@ -8,11 +8,9 @@
   package org.apache.avalon.phoenix.tools.verifier;
   
   import java.util.ArrayList;
  -import java.util.HashMap;
   import java.util.Stack;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.phoenix.Block;
   import org.apache.avalon.phoenix.BlockListener;
  @@ -59,7 +57,7 @@
           ResourceManager.getPackageResources( SarVerifier.class );
   
       /**
  -     * Verify the specified <code>SarMetaData</code> object. 
  +     * Verify the specified <code>SarMetaData</code> object.
        * The rules used to verify <code>SarMetaData</code> are specified
        * in the Class javadocs.
        *
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>