geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r821961 [8/30] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/geronimo-maven-plugin/src/main/java...
Date Mon, 05 Oct 2009 18:54:56 GMT
Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,1259 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.jar;
+
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import org.apache.geronimo.system.plugin.plexus.archiver.ArchiverException;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+/**
+ * Holds the data of a jar manifest.
+ * <p/>
+ * Manifests are processed according to the
+ * {@link <a href="http://java.sun.com/j2se/1.4/docs/guide/jar/jar.html">Jar
+ * file specification.</a>}.
+ * Specifically, a manifest element consists of
+ * a set of attributes and sections. These sections in turn may contain
+ * attributes. Note in particular that this may result in manifest lines
+ * greater than 72 bytes being wrapped and continued on the next
+ * line. If an application can not handle the continuation mechanism, it
+ * is a defect in the application, not this task.
+ *
+ * @since Ant 1.4
+ */
+public class Manifest
+{
+    /**
+     * The standard manifest version header
+     */
+    public static final String ATTRIBUTE_MANIFEST_VERSION
+        = "Manifest-Version";
+
+    /**
+     * The standard Signature Version header
+     */
+    public static final String ATTRIBUTE_SIGNATURE_VERSION
+        = "Signature-Version";
+
+    /**
+     * The Name Attribute is the first in a named section
+     */
+    public static final String ATTRIBUTE_NAME = "Name";
+
+    /**
+     * The From Header is disallowed in a Manifest
+     */
+    public static final String ATTRIBUTE_FROM = "From";
+
+    /**
+     * The Class-Path Header is special - it can be duplicated
+     */
+    public static final String ATTRIBUTE_CLASSPATH = "Class-Path";
+
+    /**
+     * Default Manifest version if one is not specified
+     */
+    public static final String DEFAULT_MANIFEST_VERSION = "1.0";
+
+    /**
+     * The max length of a line in a Manifest
+     */
+    public static final int MAX_LINE_LENGTH = 72;
+
+    /**
+     * Max length of a line section which is continued. Need to allow
+     * for the CRLF.
+     */
+    public static final int MAX_SECTION_LENGTH = MAX_LINE_LENGTH - 2;
+
+    /**
+     * The End-Of-Line marker in manifests
+     */
+    public static final String EOL = "\r\n";
+
+    /**
+     * An attribute for the manifest.
+     * Those attributes that are not nested into a section will be added to the "Main" section.
+     */
+    public static class Attribute
+    {
+        /**
+         * The attribute's name
+         */
+        private String name = null;
+
+        /**
+         * The attribute's value
+         */
+        private Vector values = new Vector();
+
+        /**
+         * For multivalued attributes, this is the index of the attribute
+         * currently being defined.
+         */
+        private int currentIndex = 0;
+
+        /**
+         * Construct an empty attribute
+         */
+        public Attribute()
+        {
+        }
+
+        /**
+         * Construct an attribute by parsing a line from the Manifest
+         *
+         * @param line the line containing the attribute name and value
+         * @throws ManifestException if the line is not valid
+         */
+        public Attribute( String line )
+            throws ManifestException
+        {
+            parse( line );
+        }
+
+        /**
+         * Construct a manifest by specifying its name and value
+         *
+         * @param name  the attribute's name
+         * @param value the Attribute's value
+         */
+        public Attribute( String name, String value )
+        {
+            this.name = name;
+            setValue( value );
+        }
+
+        /**
+         * @see java.lang.Object#hashCode
+         */
+        public int hashCode()
+        {
+            int hashCode = 0;
+
+            if ( name != null )
+            {
+                hashCode += name.hashCode();
+            }
+
+            hashCode += values.hashCode();
+            return hashCode;
+        }
+
+        /**
+         * @see java.lang.Object#equals
+         */
+        public boolean equals( Object rhs )
+        {
+            if ( rhs == null || rhs.getClass() != getClass() )
+            {
+                return false;
+            }
+
+            if ( rhs == this )
+            {
+                return true;
+            }
+
+            Attribute rhsAttribute = (Attribute) rhs;
+            String lhsKey = getKey();
+            String rhsKey = rhsAttribute.getKey();
+            if ( ( lhsKey == null && rhsKey != null ) ||
+                 ( lhsKey != null && rhsKey == null ) ||
+                 !lhsKey.equals( rhsKey ) )
+            {
+                return false;
+            }
+
+            if ( rhsAttribute.values == null )
+            {
+                return false;
+            }
+            return values.equals( rhsAttribute.values );
+        }
+
+        /**
+         * Parse a line into name and value pairs
+         *
+         * @param line the line to be parsed
+         * @throws ManifestException if the line does not contain a colon
+         *                           separating the name and value
+         */
+        public void parse( String line )
+            throws ManifestException
+        {
+            int index = line.indexOf( ": " );
+            if ( index == -1 )
+            {
+                throw new ManifestException( "Manifest line \"" + line
+                                             + "\" is not valid as it does not "
+                                             + "contain a name and a value separated by ': ' " );
+            }
+            name = line.substring( 0, index );
+            setValue( line.substring( index + 2 ) );
+        }
+
+        /**
+         * Set the Attribute's name; required
+         *
+         * @param name the attribute's name
+         */
+        public void setName( String name )
+        {
+            this.name = name;
+        }
+
+        /**
+         * Get the Attribute's name
+         *
+         * @return the attribute's name.
+         */
+        public String getName()
+        {
+            return name;
+        }
+
+        /**
+         * Get the attribute's Key - its name in lower case.
+         *
+         * @return the attribute's key.
+         */
+        public String getKey()
+        {
+            if ( name == null )
+            {
+                return null;
+            }
+            return name.toLowerCase();
+        }
+
+        /**
+         * Set the Attribute's value; required
+         *
+         * @param value the attribute's value
+         */
+        public void setValue( String value )
+        {
+            if ( currentIndex >= values.size() )
+            {
+                values.addElement( value );
+                currentIndex = values.size() - 1;
+            }
+            else
+            {
+                values.setElementAt( value, currentIndex );
+            }
+        }
+
+        /**
+         * Get the Attribute's value.
+         *
+         * @return the attribute's value.
+         */
+        public String getValue()
+        {
+            if ( values.size() == 0 )
+            {
+                return null;
+            }
+
+            String fullValue = "";
+            for ( Enumeration e = getValues(); e.hasMoreElements(); )
+            {
+                String value = (String) e.nextElement();
+                fullValue += value + " ";
+            }
+            return fullValue.trim();
+        }
+
+        /**
+         * Add a new value to this attribute - making it multivalued.
+         *
+         * @param value the attribute's additional value
+         */
+        public void addValue( String value )
+        {
+            currentIndex++;
+            setValue( value );
+        }
+
+        /**
+         * Get all the attribute's values.
+         *
+         * @return an enumeration of the attributes values
+         */
+        public Enumeration getValues()
+        {
+            return values.elements();
+        }
+
+        /**
+         * Add a continuation line from the Manifest file.
+         * <p/>
+         * When lines are too long in a manifest, they are continued on the
+         * next line by starting with a space. This method adds the continuation
+         * data to the attribute value by skipping the first character.
+         *
+         * @param line the continuation line.
+         */
+        public void addContinuation( String line )
+        {
+            String currentValue = (String) values.elementAt( currentIndex );
+            setValue( currentValue + line.substring( 1 ) );
+        }
+
+        /**
+         * Write the attribute out to a print writer.
+         *
+         * @param writer the Writer to which the attribute is written
+         * @throws IOException if the attribute value cannot be written
+         */
+        public void write( PrintWriter writer )
+            throws IOException
+        {
+            StringWriter sWriter = new StringWriter();
+            PrintWriter bufferWriter = new PrintWriter( sWriter );
+            
+            for ( Enumeration e = getValues(); e.hasMoreElements(); )
+            {
+                writeValue( bufferWriter, (String) e.nextElement() );
+            }
+            
+            byte[] convertedToUtf8 = sWriter.toString().getBytes( "UTF-8" );
+            
+            writer.print( new String( convertedToUtf8, "UTF-8" ) );
+        }
+
+        /**
+         * Write a single attribute value out.  Should handle multiple lines of attribute value.
+         *
+         * @param writer the Writer to which the attribute is written
+         * @param value  the attribute value
+         * @throws IOException if the attribute value cannot be written
+         */
+        private void writeValue( PrintWriter writer, String value )
+            throws IOException
+        {
+            String nameValue = name + ": " + value;
+
+            StringTokenizer tokenizer = new StringTokenizer( nameValue, "\n\r" );
+
+            String prefix = "";
+
+            while ( tokenizer.hasMoreTokens() )
+            {
+                writeLine( writer, prefix + tokenizer.nextToken() );
+                prefix = " ";
+            }
+        }
+
+        /**
+         * Write a single Manifest line. Should handle more than 72 characters of line
+         *
+         * @param writer the Writer to which the attribute is written
+         * @param line   the manifest line to be written
+         */
+        private void writeLine( PrintWriter writer, String line )
+            throws IOException
+        {
+            while ( line.getBytes().length > MAX_LINE_LENGTH )
+            {
+                // try to find a MAX_LINE_LENGTH byte section
+                int breakIndex = MAX_SECTION_LENGTH;
+                String section = line.substring( 0, breakIndex );
+                while ( section.getBytes().length > MAX_SECTION_LENGTH
+                        && breakIndex > 0 )
+                {
+                    breakIndex--;
+                    section = line.substring( 0, breakIndex );
+                }
+                if ( breakIndex == 0 )
+                {
+                    throw new IOException( "Unable to write manifest line " + line );
+                }
+                writer.print( section + EOL );
+                line = " " + line.substring( breakIndex );
+            }
+            writer.print( line + EOL );
+        }
+    }
+
+    /**
+     * A manifest section - you can nest attribute elements into sections.
+     * A section consists of a set of attribute values,
+     * separated from other sections by a blank line.
+     */
+    public static class Section
+    {
+        /**
+         * Warnings for this section
+         */
+        private Vector warnings = new Vector();
+
+        /**
+         * The section's name if any. The main section in a
+         * manifest is unnamed.
+         */
+        private String name = null;
+
+        /**
+         * The section's attributes.
+         */
+        private Hashtable attributes = new Hashtable();
+
+        /**
+         * Index used to retain the attribute ordering
+         */
+        private Vector attributeIndex = new Vector();
+
+        /**
+         * The name of the section; optional -default is the main section.
+         *
+         * @param name the section's name
+         */
+        public void setName( String name )
+        {
+            this.name = name;
+        }
+
+        /**
+         * Get the Section's name.
+         *
+         * @return the section's name.
+         */
+        public String getName()
+        {
+            return name;
+        }
+
+        /**
+         * Read a section through a reader.
+         *
+         * @param reader the reader from which the section is read
+         * @return the name of the next section if it has been read as
+         *         part of this section - This only happens if the
+         *         Manifest is malformed.
+         * @throws ManifestException if the section is not valid according
+         *                           to the JAR spec
+         * @throws IOException       if the section cannot be read from the reader.
+         */
+        public String read( BufferedReader reader )
+            throws ManifestException, IOException
+        {
+            Attribute attribute = null;
+            while ( true )
+            {
+                String line = reader.readLine();
+                if ( line == null || line.length() == 0 )
+                {
+                    return null;
+                }
+                if ( line.charAt( 0 ) == ' ' )
+                {
+                    // continuation line
+                    if ( attribute == null )
+                    {
+                        if ( name != null )
+                        {
+                            // a continuation on the first line is a
+                            // continuation of the name - concatenate this
+                            // line and the name
+                            name += line.substring( 1 );
+                        }
+                        else
+                        {
+                            throw new ManifestException( "Can't start an "
+                                                         + "attribute with a continuation line " + line );
+                        }
+                    }
+                    else
+                    {
+                        attribute.addContinuation( line );
+                    }
+                }
+                else
+                {
+                    attribute = new Attribute( line );
+                    String nameReadAhead = addAttributeAndCheck( attribute );
+                    // refresh attribute in case of multivalued attributes.
+                    attribute = getAttribute( attribute.getKey() );
+                    if ( nameReadAhead != null )
+                    {
+                        return nameReadAhead;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Merge in another section
+         *
+         * @param section the section to be merged with this one.
+         * @throws ManifestException if the sections cannot be merged.
+         */
+        public void merge( Section section )
+            throws ManifestException
+        {
+            if ( name == null && section.getName() != null
+                 || name != null
+                    && !( name.equalsIgnoreCase( section.getName() ) ) )
+            {
+                throw new ManifestException( "Unable to merge sections "
+                                             + "with different names" );
+            }
+
+            Enumeration e = section.getAttributeKeys();
+            Attribute classpathAttribute = null;
+            while ( e.hasMoreElements() )
+            {
+                String attributeName = (String) e.nextElement();
+                Attribute attribute = section.getAttribute( attributeName );
+                if ( attributeName.equalsIgnoreCase( ATTRIBUTE_CLASSPATH ) )
+                {
+                    if ( classpathAttribute == null )
+                    {
+                        classpathAttribute = new Attribute();
+                        classpathAttribute.setName( ATTRIBUTE_CLASSPATH );
+                    }
+                    Enumeration cpe = attribute.getValues();
+                    while ( cpe.hasMoreElements() )
+                    {
+                        String value = (String) cpe.nextElement();
+                        classpathAttribute.addValue( value );
+                    }
+                }
+                else
+                {
+                    // the merge file always wins
+                    storeAttribute( attribute );
+                }
+            }
+
+            if ( classpathAttribute != null )
+            {
+                // the merge file *always* wins, even for Class-Path
+                storeAttribute( classpathAttribute );
+            }
+
+            // add in the warnings
+            Enumeration warnEnum = section.warnings.elements();
+            while ( warnEnum.hasMoreElements() )
+            {
+                warnings.addElement( warnEnum.nextElement() );
+            }
+        }
+
+        /**
+         * Write the section out to a print writer.
+         *
+         * @param writer the Writer to which the section is written
+         * @throws IOException if the section cannot be written
+         */
+        public void write( PrintWriter writer )
+            throws IOException
+        {
+            if ( name != null )
+            {
+                Attribute nameAttr = new Attribute( ATTRIBUTE_NAME, name );
+                nameAttr.write( writer );
+            }
+            Enumeration e = getAttributeKeys();
+            while ( e.hasMoreElements() )
+            {
+                String key = (String) e.nextElement();
+                Attribute attribute = getAttribute( key );
+                attribute.write( writer );
+            }
+            writer.print( EOL );
+        }
+
+        /**
+         * Get a attribute of the section
+         *
+         * @param attributeName the name of the attribute
+         * @return a Manifest.Attribute instance if the attribute is
+         *         single-valued, otherwise a Vector of Manifest.Attribute
+         *         instances.
+         */
+        public Attribute getAttribute( String attributeName )
+        {
+            return (Attribute) attributes.get( attributeName.toLowerCase() );
+        }
+
+        /**
+         * Get the attribute keys.
+         *
+         * @return an Enumeration of Strings, each string being the lower case
+         *         key of an attribute of the section.
+         */
+        public Enumeration getAttributeKeys()
+        {
+            return attributeIndex.elements();
+        }
+
+        /**
+         * Get the value of the attribute with the name given.
+         *
+         * @param attributeName the name of the attribute to be returned.
+         * @return the attribute's value or null if the attribute does not exist
+         *         in the section
+         */
+        public String getAttributeValue( String attributeName )
+        {
+            Attribute attribute = getAttribute( attributeName.toLowerCase() );
+            if ( attribute == null )
+            {
+                return null;
+            }
+            return attribute.getValue();
+        }
+
+        /**
+         * Remove tge given attribute from the section
+         *
+         * @param attributeName the name of the attribute to be removed.
+         */
+        public void removeAttribute( String attributeName )
+        {
+            String key = attributeName.toLowerCase();
+            attributes.remove( key );
+            attributeIndex.removeElement( key );
+        }
+
+        /**
+         * Add an attribute to the section.
+         *
+         * @param attribute the attribute to be added to the section
+         * @throws ManifestException if the attribute is not valid.
+         */
+        public void addConfiguredAttribute( Attribute attribute )
+            throws ManifestException
+        {
+            String check = addAttributeAndCheck( attribute );
+            if ( check != null )
+            {
+                throw new ManifestException( "Specify the section name using "
+                                             + "the \"name\" attribute of the <section> element rather "
+                                             + "than using a \"Name\" manifest attribute" );
+            }
+        }
+
+        /**
+         * Add an attribute to the section
+         *
+         * @param attribute the attribute to be added.
+         * @return the value of the attribute if it is a name
+         *         attribute - null other wise
+         * @throws ManifestException if the attribute already
+         *                           exists in this section.
+         */
+        public String addAttributeAndCheck( Attribute attribute )
+            throws ManifestException
+        {
+            if ( attribute.getName() == null || attribute.getValue() == null )
+            {
+                throw new ManifestException( "Attributes must have name and value" );
+            }
+            if ( attribute.getKey().equalsIgnoreCase( ATTRIBUTE_NAME ) )
+            {
+                warnings.addElement( "\"" + ATTRIBUTE_NAME + "\" attributes "
+                                     + "should not occur in the main section and must be the "
+                                     + "first element in all other sections: \""
+                                     + attribute.getName() + ": " + attribute.getValue() + "\"" );
+                return attribute.getValue();
+            }
+
+            if ( attribute.getKey().startsWith( ATTRIBUTE_FROM.toLowerCase() ) )
+            {
+                warnings.addElement( "Manifest attributes should not start "
+                                     + "with \"" + ATTRIBUTE_FROM + "\" in \""
+                                     + attribute.getName() + ": " + attribute.getValue() + "\"" );
+            }
+            else
+            {
+                // classpath attributes go into a vector
+                String attributeKey = attribute.getKey();
+                if ( attributeKey.equalsIgnoreCase( ATTRIBUTE_CLASSPATH ) )
+                {
+                    Attribute classpathAttribute =
+                        (Attribute) attributes.get( attributeKey );
+
+                    if ( classpathAttribute == null )
+                    {
+                        storeAttribute( attribute );
+                    }
+                    else
+                    {
+                        warnings.addElement( "Multiple Class-Path attributes "
+                                             + "are supported but violate the Jar "
+                                             + "specification and may not be correctly "
+                                             + "processed in all environments" );
+                        Enumeration e = attribute.getValues();
+                        while ( e.hasMoreElements() )
+                        {
+                            String value = (String) e.nextElement();
+                            classpathAttribute.addValue( value );
+                        }
+                    }
+                }
+                else if ( attributes.containsKey( attributeKey ) )
+                {
+                    throw new ManifestException( "The attribute \""
+                                                 + attribute.getName() + "\" may not occur more "
+                                                 + "than once in the same section" );
+                }
+                else
+                {
+                    storeAttribute( attribute );
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Clone this section
+         *
+         * @return the cloned Section
+         * @since Ant 1.5.2
+         */
+        public Object clone()
+        {
+            Section cloned = new Section();
+            cloned.setName( name );
+            Enumeration e = getAttributeKeys();
+            while ( e.hasMoreElements() )
+            {
+                String key = (String) e.nextElement();
+                Attribute attribute = getAttribute( key );
+                cloned.storeAttribute( new Attribute( attribute.getName(),
+                                                      attribute.getValue() ) );
+            }
+            return cloned;
+        }
+
+        /**
+         * Store an attribute and update the index.
+         *
+         * @param attribute the attribute to be stored
+         */
+        private void storeAttribute( Attribute attribute )
+        {
+            if ( attribute == null )
+            {
+                return;
+            }
+            String attributeKey = attribute.getKey();
+            attributes.put( attributeKey, attribute );
+            if ( !attributeIndex.contains( attributeKey ) )
+            {
+                attributeIndex.addElement( attributeKey );
+            }
+        }
+
+        /**
+         * Get the warnings for this section.
+         *
+         * @return an Enumeration of warning strings.
+         */
+        public Enumeration getWarnings()
+        {
+            return warnings.elements();
+        }
+
+        /**
+         * @see java.lang.Object#hashCode
+         */
+        public int hashCode()
+        {
+            int hashCode = 0;
+
+            if ( name != null )
+            {
+                hashCode += name.hashCode();
+            }
+
+            hashCode += attributes.hashCode();
+            return hashCode;
+        }
+
+        /**
+         * @see java.lang.Object#equals
+         */
+        public boolean equals( Object rhs )
+        {
+            if ( rhs == null || rhs.getClass() != getClass() )
+            {
+                return false;
+            }
+
+            if ( rhs == this )
+            {
+                return true;
+            }
+
+            Section rhsSection = (Section) rhs;
+
+            if ( rhsSection.attributes == null )
+            {
+                return false;
+            }
+            return attributes.equals( rhsSection.attributes );
+        }
+    }
+
+
+    /**
+     * The version of this manifest
+     */
+    private String manifestVersion = DEFAULT_MANIFEST_VERSION;
+
+    /**
+     * The main section of this manifest
+     */
+    private Section mainSection = new Section();
+
+    /**
+     * The named sections of this manifest
+     */
+    private Hashtable sections = new Hashtable();
+
+    /**
+     * Index of sections - used to retain order of sections in manifest
+     */
+    private Vector sectionIndex = new Vector();
+
+    /**
+     * Construct a manifest from Ant's default manifest file.
+     *
+     * @return the default manifest.
+     * @throws ArchiverException if there is a problem loading the
+     *                           default manifest
+     */
+    public static Manifest getDefaultManifest()
+        throws ArchiverException
+    {
+        try
+        {
+            String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
+            InputStream in = Manifest.class.getResourceAsStream( defManifest );
+            if ( in == null )
+            {
+                throw new ArchiverException( "Could not find default manifest: "
+                                             + defManifest );
+            }
+            try
+            {
+                Manifest defaultManifest
+                    = new Manifest( new InputStreamReader( in, "UTF-8" ) );
+                Attribute createdBy = new Attribute( "Created-By",
+                                                     System.getProperty( "java.vm.version" ) + " ("
+                                                     + System.getProperty( "java.vm.vendor" ) + ")" );
+                defaultManifest.getMainSection().storeAttribute( createdBy );
+                return defaultManifest;
+            }
+            catch ( UnsupportedEncodingException e )
+            {
+                return new Manifest( new InputStreamReader( in ) );
+            }
+        }
+        catch ( ManifestException e )
+        {
+            throw new ArchiverException( "Default manifest is invalid !!", e );
+        }
+        catch ( IOException e )
+        {
+            throw new ArchiverException( "Unable to read default manifest", e );
+        }
+    }
+
+    /**
+     * Construct an empty manifest
+     */
+    public Manifest()
+    {
+    }
+
+    /**
+     * Read a manifest file from the given reader
+     *
+     * @param r is the reader from which the Manifest is read
+     * @throws ManifestException if the manifest is not valid according
+     *                           to the JAR spec
+     * @throws IOException       if the manifest cannot be read from the reader.
+     */
+    public Manifest( Reader r )
+        throws ManifestException, IOException
+    {
+        BufferedReader reader = new BufferedReader( r );
+        // This should be the manifest version
+        String nextSectionName = mainSection.read( reader );
+        String readManifestVersion
+            = mainSection.getAttributeValue( ATTRIBUTE_MANIFEST_VERSION );
+        if ( readManifestVersion != null )
+        {
+            manifestVersion = readManifestVersion;
+            mainSection.removeAttribute( ATTRIBUTE_MANIFEST_VERSION );
+        }
+
+        String line;
+        while ( ( line = reader.readLine() ) != null )
+        {
+            if ( line.length() == 0 )
+            {
+                continue;
+            }
+
+            Section section = new Section();
+            if ( nextSectionName == null )
+            {
+                Attribute sectionName = new Attribute( line );
+                if ( !sectionName.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) )
+                {
+                    throw new ManifestException( "Manifest sections should "
+                                                 + "start with a \"" + ATTRIBUTE_NAME
+                                                 + "\" attribute and not \""
+                                                 + sectionName.getName() + "\"" );
+                }
+                nextSectionName = sectionName.getValue();
+            }
+            else
+            {
+                // we have already started reading this section
+                // this line is the first attribute. set it and then
+                // let the normal read handle the rest
+                Attribute firstAttribute = new Attribute( line );
+                section.addAttributeAndCheck( firstAttribute );
+            }
+
+            section.setName( nextSectionName );
+            nextSectionName = section.read( reader );
+            addConfiguredSection( section );
+        }
+    }
+
+    /**
+     * Add a section to the manifest
+     *
+     * @param section the manifest section to be added
+     * @throws ManifestException if the secti0on is not valid.
+     */
+    public void addConfiguredSection( Section section )
+        throws ManifestException
+    {
+        String sectionName = section.getName();
+        if ( sectionName == null )
+        {
+            throw new ManifestException( "Sections must have a name" );
+        }
+        sections.put( sectionName, section );
+        if ( !sectionIndex.contains( sectionName ) )
+        {
+            sectionIndex.addElement( sectionName );
+        }
+    }
+
+    /**
+     * Add an attribute to the manifest - it is added to the main section.
+     *
+     * @param attribute the attribute to be added.
+     * @throws ManifestException if the attribute is not valid.
+     */
+    public void addConfiguredAttribute( Attribute attribute )
+        throws ManifestException
+    {
+        if ( attribute.getKey() == null || attribute.getValue() == null )
+        {
+            throw new ManifestException( "Attributes must have name and value" );
+        }
+        if ( attribute.getKey().equalsIgnoreCase( ATTRIBUTE_MANIFEST_VERSION ) )
+        {
+            manifestVersion = attribute.getValue();
+        }
+        else
+        {
+            mainSection.addConfiguredAttribute( attribute );
+        }
+    }
+
+    /**
+     * Merge the contents of the given manifest into this manifest
+     *
+     * @param other the Manifest to be merged with this one.
+     * @throws ManifestException if there is a problem merging the
+     *                           manifest according to the Manifest spec.
+     */
+    public void merge( Manifest other )
+        throws ManifestException
+    {
+        merge( other, false );
+    }
+
+    /**
+     * Merge the contents of the given manifest into this manifest
+     *
+     * @param other         the Manifest to be merged with this one.
+     * @param overwriteMain whether to overwrite the main section
+     *                      of the current manifest
+     * @throws ManifestException if there is a problem merging the
+     *                           manifest according to the Manifest spec.
+     */
+    public void merge( Manifest other, boolean overwriteMain )
+        throws ManifestException
+    {
+        if ( other != null )
+        {
+            if ( overwriteMain )
+            {
+                mainSection = (Section) other.mainSection.clone();
+            }
+            else
+            {
+                mainSection.merge( other.mainSection );
+            }
+
+            if ( other.manifestVersion != null )
+            {
+                manifestVersion = other.manifestVersion;
+            }
+
+            Enumeration e = other.getSectionNames();
+            while ( e.hasMoreElements() )
+            {
+                String sectionName = (String) e.nextElement();
+                Section ourSection = (Section) sections.get( sectionName );
+                Section otherSection
+                    = (Section) other.sections.get( sectionName );
+                if ( ourSection == null )
+                {
+                    if ( otherSection != null )
+                    {
+                        addConfiguredSection( (Section) otherSection.clone() );
+                    }
+                }
+                else
+                {
+                    ourSection.merge( otherSection );
+                }
+            }
+        }
+    }
+
+    /**
+     * Write the manifest out to a print writer.
+     *
+     * @param writer the Writer to which the manifest is written
+     * @throws IOException if the manifest cannot be written
+     */
+    public void write( PrintWriter writer )
+        throws IOException
+    {
+        writer.print( ATTRIBUTE_MANIFEST_VERSION + ": " + manifestVersion + EOL );
+        String signatureVersion
+            = mainSection.getAttributeValue( ATTRIBUTE_SIGNATURE_VERSION );
+        if ( signatureVersion != null )
+        {
+            writer.print( ATTRIBUTE_SIGNATURE_VERSION + ": "
+                          + signatureVersion + EOL );
+            mainSection.removeAttribute( ATTRIBUTE_SIGNATURE_VERSION );
+        }
+        mainSection.write( writer );
+
+        // add it back
+        if ( signatureVersion != null )
+        {
+            try
+            {
+                Attribute svAttr = new Attribute( ATTRIBUTE_SIGNATURE_VERSION,
+                                                  signatureVersion );
+                mainSection.addConfiguredAttribute( svAttr );
+            }
+            catch ( ManifestException e )
+            {
+                // shouldn't happen - ignore
+            }
+        }
+
+        Enumeration e = sectionIndex.elements();
+        while ( e.hasMoreElements() )
+        {
+            String sectionName = (String) e.nextElement();
+            Section section = getSection( sectionName );
+            section.write( writer );
+        }
+    }
+
+    /**
+     * Convert the manifest to its string representation
+     *
+     * @return a multiline string with the Manifest as it
+     *         appears in a Manifest file.
+     */
+    public String toString()
+    {
+        StringWriter sw = new StringWriter();
+        try
+        {
+            write( new PrintWriter( sw ) );
+        }
+        catch ( IOException e )
+        {
+            return null;
+        }
+        return sw.toString();
+    }
+
+    /**
+     * Get the warnings for this manifest.
+     *
+     * @return an enumeration of warning strings
+     */
+    public Enumeration getWarnings()
+    {
+        Vector warnings = new Vector();
+
+        Enumeration warnEnum = mainSection.getWarnings();
+        while ( warnEnum.hasMoreElements() )
+        {
+            warnings.addElement( warnEnum.nextElement() );
+        }
+
+        // create a vector and add in the warnings for all the sections
+        Enumeration e = sections.elements();
+        while ( e.hasMoreElements() )
+        {
+            Section section = (Section) e.nextElement();
+            Enumeration e2 = section.getWarnings();
+            while ( e2.hasMoreElements() )
+            {
+                warnings.addElement( e2.nextElement() );
+            }
+        }
+
+        return warnings.elements();
+    }
+
+    /**
+     * @see java.lang.Object#hashCode
+     */
+    public int hashCode()
+    {
+        int hashCode = 0;
+
+        if ( manifestVersion != null )
+        {
+            hashCode += manifestVersion.hashCode();
+        }
+        hashCode += mainSection.hashCode();
+        hashCode += sections.hashCode();
+
+        return hashCode;
+    }
+
+    /**
+     * @see java.lang.Object#equals
+     */
+    public boolean equals( Object rhs )
+    {
+        if ( rhs == null || rhs.getClass() != getClass() )
+        {
+            return false;
+        }
+
+        if ( rhs == this )
+        {
+            return true;
+        }
+
+        Manifest rhsManifest = (Manifest) rhs;
+        if ( manifestVersion == null )
+        {
+            if ( rhsManifest.manifestVersion != null )
+            {
+                return false;
+            }
+        }
+        else if ( !manifestVersion.equals( rhsManifest.manifestVersion ) )
+        {
+            return false;
+        }
+
+        if ( !mainSection.equals( rhsManifest.mainSection ) )
+        {
+            return false;
+        }
+
+        if ( rhsManifest.sections == null )
+        {
+            return false;
+        }
+        return sections.equals( rhsManifest.sections );
+    }
+
+    /**
+     * Get the version of the manifest
+     *
+     * @return the manifest's version string
+     */
+    public String getManifestVersion()
+    {
+        return manifestVersion;
+    }
+
+    /**
+     * Get the main section of the manifest
+     *
+     * @return the main section of the manifest
+     */
+    public Section getMainSection()
+    {
+        return mainSection;
+    }
+
+    /**
+     * Get a particular section from the manifest
+     *
+     * @param name the name of the section desired.
+     * @return the specified section or null if that section
+     *         does not exist in the manifest
+     */
+    public Section getSection( String name )
+    {
+        return (Section) sections.get( name );
+    }
+
+    /**
+     * Get the section names in this manifest.
+     *
+     * @return an Enumeration of section names
+     */
+    public Enumeration getSectionNames()
+    {
+        return sectionIndex.elements();
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/Manifest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,35 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.jar;
+
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * Exception thrown indicating problems in a JAR Manifest
+ */
+public class ManifestException
+    extends Exception
+{
+    /**
+     * Constructs an exception with the given descriptive message.
+     *
+     * @param msg Description of or information about the exception.
+     */
+    public ManifestException( String msg )
+    {
+        super( msg );
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/jar/ManifestException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,52 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.manager;
+
+/*
+ * Copyright  2001,2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+import java.io.File;
+
+import org.apache.geronimo.system.plugin.plexus.archiver.Archiver;
+import org.apache.geronimo.system.plugin.plexus.archiver.UnArchiver;
+import org.apache.geronimo.system.plugin.plexus.io.resources.PlexusIoResourceCollection;
+
+/**
+ * @author dantran
+ * @version $Revision:
+ */
+public interface ArchiverManager
+{
+    String ROLE = ArchiverManager.class.getName();
+
+    Archiver getArchiver( String archiverName )
+        throws NoSuchArchiverException;
+
+    Archiver getArchiver( File file )
+      throws NoSuchArchiverException;
+    
+    UnArchiver getUnArchiver( String unArchiverName )
+        throws NoSuchArchiverException;
+
+    UnArchiver getUnArchiver( File file )
+        throws NoSuchArchiverException;    
+
+    PlexusIoResourceCollection getResourceCollection( File file )
+        throws NoSuchArchiverException;
+
+    PlexusIoResourceCollection getResourceCollection( String unArchiverName )
+        throws NoSuchArchiverException;
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/ArchiverManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,42 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.manager;
+
+/*
+ * Copyright  2001,2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+/**
+ * @author dantran
+ * @version $Revision:
+ */
+
+public class NoSuchArchiverException
+    extends Exception
+{
+    private String archiverName;
+
+    public NoSuchArchiverException( String archiverName )
+    {
+        super( "No such archiver: '" + archiverName + "'." );
+
+        this.archiverName = archiverName;
+    }
+
+    public String getArchiver()
+    {
+        return archiverName;
+    }
+
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/manager/NoSuchArchiverException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,28 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.geronimo.system.plugin.plexus.archiver.bzip2.BZip2UnArchiver;
+
+
+/**
+ * Extension of {@link TarFile} for bzip2 compressed files.
+ */
+public class BZip2TarFile extends TarFile
+{
+    /**
+     * Creates a new instance with the given file.
+     */
+    public BZip2TarFile( File file )
+    {
+        super( file );
+    }
+
+    protected InputStream getInputStream( File file )
+        throws IOException
+    {
+        return BZip2UnArchiver.getBZip2InputStream( super.getInputStream( file ) );
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/BZip2TarFile.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,33 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+
+/**
+ * Extension of {@link TarFile} for bzip2 compressed files.
+ */
+public class GZipTarFile extends TarFile
+{
+    /**
+     * Creates a new instance with the given file.
+     */
+    public GZipTarFile( File file )
+    {
+        super( file );
+    }
+
+    protected InputStream getInputStream( File file )
+        throws IOException
+    {
+        return new GZIPInputStream( super.getInputStream( file ) ){
+            public void close()
+                throws IOException
+            {
+                super.close();
+            }
+        };
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/GZipTarFile.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,13 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+import java.io.File;
+
+public class PlexusIoTarBZip2FileResourceCollection
+    extends PlexusIoTarFileResourceCollection
+{
+    
+    protected TarFile newTarFile( File file )
+    {
+        return new BZip2TarFile( file );
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarBZip2FileResourceCollection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,49 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Iterator;
+
+import org.apache.geronimo.system.plugin.plexus.io.resources.AbstractPlexusIoArchiveResourceCollection;
+
+
+public class PlexusIoTarFileResourceCollection extends AbstractPlexusIoArchiveResourceCollection
+{
+    /**
+     * The zip file resource collections role hint.
+     */
+    public static final String ROLE_HINT = "tar";
+
+    protected TarFile newTarFile( File file ) {
+        return new TarFile( file );
+    }
+
+    protected Iterator getEntries() throws IOException
+    {
+        final File f = getFile();
+        if ( f == null )
+        {
+            throw new IOException( "The tar archive file has not been set." );
+        }
+        final TarFile tarFile = newTarFile( f );
+        final Enumeration en = tarFile.getEntries();
+        return new Iterator(){
+            public boolean hasNext()
+            {
+                return en.hasMoreElements();
+            }
+            public Object next()
+            {
+                final TarEntry entry = (TarEntry) en.nextElement();
+                final TarResource res = new TarResource( tarFile, entry );
+                
+                return res;
+            }
+            public void remove()
+            {
+                throw new UnsupportedOperationException( "Removing isn't implemented." );
+            }
+        };
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarFileResourceCollection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,12 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+import java.io.File;
+
+public class PlexusIoTarGZipFileResourceCollection
+    extends PlexusIoTarFileResourceCollection
+{
+    protected TarFile newTarFile( File file )
+    {
+        return new GZipTarFile( file );
+    }
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/PlexusIoTarGZipFileResourceCollection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,621 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.geronimo.system.plugin.plexus.archiver.AbstractArchiver;
+import org.apache.geronimo.system.plugin.plexus.archiver.ArchiveEntry;
+import org.apache.geronimo.system.plugin.plexus.archiver.ArchiverException;
+import org.apache.geronimo.system.plugin.plexus.archiver.ResourceIterator;
+import org.apache.geronimo.system.plugin.plexus.archiver.UnixStat;
+import org.apache.geronimo.system.plugin.plexus.archiver.bzip2.CBZip2OutputStream;
+import org.apache.geronimo.system.plugin.plexus.archiver.util.EnumeratedAttribute;
+import org.apache.geronimo.system.plugin.plexus.archiver.util.ResourceUtils;
+import org.apache.geronimo.system.plugin.plexus.io.attributes.PlexusIoResourceAttributes;
+import org.apache.geronimo.system.plugin.plexus.io.resources.PlexusIoResource;
+import org.apache.geronimo.system.plugin.plexus.util.StringUtils;
+
+/**
+ * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
+ * @version $Revision$ $Date$
+ */
+public class TarArchiver
+    extends AbstractArchiver
+{
+    /**
+     * Indicates whether the user has been warned about long files already.
+     */
+    private boolean longWarningGiven = false;
+
+    private TarLongFileMode longFileMode = new TarLongFileMode();
+
+    private TarCompressionMethod compression = new TarCompressionMethod();
+
+    private TarOptions options = new TarOptions();
+
+    private TarOutputStream tOut;
+
+    /**
+     *
+     */
+    public TarOptions getOptions()
+    {
+        return options;
+    }
+
+    /**
+     * Set all tar options
+     *
+     * @param options options
+     */
+    public void setOptions( TarOptions options )
+    {
+        this.options = options;
+
+        // FIXME: do these options have precedence over
+        // setDefaultFileMode / setDefaultDirMode
+        // or the other way around? Assuming these
+        // take precedende since they're more specific.
+        // Better refactor this when usage is known.
+
+        setDefaultFileMode( options.getMode() );
+
+        setDefaultDirectoryMode( options.getMode() );
+    }
+
+//    /**
+//     * Override AbstractArchiver.setDefaultFileMode to
+//     * update TarOptions.
+//     */
+//    public void setDefaultFileMode( int mode )
+//    {
+//        super.setDefaultFileMode( mode );
+//
+//        options.setMode( mode );
+//    }
+//
+//    /**
+//     * Override AbstractArchiver.setDefaultDirectoryMode to
+//     * update TarOptions.
+//     */
+//    public void setDefaultDirectoryMode( int mode )
+//    {
+//        super.setDefaultDirectoryMode( mode );
+//
+//        options.setDirMode( mode );
+//    }
+//
+//
+    /**
+     * Set how to handle long files, those with a path&gt;100 chars.
+     * Optional, default=warn.
+     * <p/>
+     * Allowable values are
+     * <ul>
+     * <li>  truncate - paths are truncated to the maximum length
+     * <li>  fail - paths greater than the maximum cause a build exception
+     * <li>  warn - paths greater than the maximum cause a warning and GNU is used
+     * <li>  gnu - GNU extensions are used for any paths greater than the maximum.
+     * <li>  omit - paths greater than the maximum are omitted from the archive
+     * </ul>
+     *
+     * @param mode the mode to handle long file names.
+     */
+    public void setLongfile( TarLongFileMode mode )
+    {
+        this.longFileMode = mode;
+    }
+
+    /**
+     * Set compression method.
+     * Allowable values are
+     * <ul>
+     * <li>  none - no compression
+     * <li>  gzip - Gzip compression
+     * <li>  bzip2 - Bzip2 compression
+     * </ul>
+     *
+     * @param mode the compression method.
+     */
+    public void setCompression( TarCompressionMethod mode )
+    {
+        this.compression = mode;
+    }
+
+    protected void execute()
+        throws ArchiverException, IOException
+    {
+    	if ( ! checkForced() )
+    	{
+    		return;
+    	}
+
+    	ResourceIterator iter = getResources();
+        if ( !iter.hasNext() )
+        {
+            throw new ArchiverException( "You must set at least one file." );
+        }
+
+        File tarFile = getDestFile();
+
+        if ( tarFile == null )
+        {
+            throw new ArchiverException( "You must set the destination tar file." );
+        }
+        if ( tarFile.exists() && !tarFile.isFile() )
+        {
+            throw new ArchiverException( tarFile + " isn't a file." );
+        }
+        if ( tarFile.exists() && !tarFile.canWrite() )
+        {
+            throw new ArchiverException( tarFile + " is read-only." );
+        }
+
+        getLogger().info( "Building tar : " + tarFile.getAbsolutePath() );
+
+        tOut = new TarOutputStream(
+            compression.compress( new BufferedOutputStream( new FileOutputStream( tarFile ) ) ) );
+        tOut.setDebug( true );
+        if ( longFileMode.isTruncateMode() )
+        {
+            tOut.setLongFileMode( TarOutputStream.LONGFILE_TRUNCATE );
+        }
+        else if ( longFileMode.isFailMode() || longFileMode.isOmitMode() )
+        {
+            tOut.setLongFileMode( TarOutputStream.LONGFILE_ERROR );
+        }
+        else
+        {
+            // warn or GNU
+            tOut.setLongFileMode( TarOutputStream.LONGFILE_GNU );
+        }
+
+        longWarningGiven = false;
+        while ( iter.hasNext() )
+        {
+            ArchiveEntry entry = iter.next();
+            // Check if we don't add tar file in inself
+            if ( ResourceUtils.isSame( entry.getResource(), tarFile ) )
+            {
+                throw new ArchiverException( "A tar file cannot include itself." );
+            }
+            String fileName = entry.getName();
+            String name = StringUtils.replace( fileName, File.separatorChar, '/' );
+
+            tarFile( entry, tOut, name );
+        }
+    }
+
+    /**
+     * tar a file
+     *
+     * @param entry the file to tar
+     * @param tOut  the output stream
+     * @param vPath the path name of the file to tar
+     * @throws IOException on error
+     */
+    protected void tarFile( ArchiveEntry entry, TarOutputStream tOut, String vPath )
+        throws ArchiverException, IOException
+    {
+        InputStream fIn = null;
+
+        // don't add "" to the archive
+        if ( vPath.length() <= 0 )
+        {
+            return;
+        }
+
+        if ( entry.getResource().isDirectory() && !vPath.endsWith( "/" ) )
+        {
+            vPath += "/";
+        }
+
+        if ( vPath.startsWith( "/" ) && !options.getPreserveLeadingSlashes() )
+        {
+            int l = vPath.length();
+            if ( l <= 1 )
+            {
+                // we would end up adding "" to the archive
+                return;
+            }
+            vPath = vPath.substring( 1, l );
+        }
+
+        try
+        {
+            if ( vPath.length() >= TarConstants.NAMELEN )
+            {
+                if ( longFileMode.isOmitMode() )
+                {
+                    getLogger().info( "Omitting: " + vPath );
+                    return;
+                }
+                else if ( longFileMode.isWarnMode() )
+                {
+                    getLogger().warn( "Entry: " + vPath + " longer than "
+                                      + TarConstants.NAMELEN + " characters." );
+                    if ( !longWarningGiven )
+                    {
+                        getLogger().warn( "Resulting tar file can only be processed "
+                                          + "successfully by GNU compatible tar commands" );
+                        longWarningGiven = true;
+                    }
+                }
+                else if ( longFileMode.isFailMode() )
+                {
+                    throw new ArchiverException( "Entry: " + vPath + " longer than " + TarConstants.NAMELEN
+                                                 + "characters." );
+                }
+            }
+
+            TarEntry te = new TarEntry( vPath );
+            long teLastModified = entry.getResource().getLastModified();
+            te.setModTime( teLastModified == PlexusIoResource.UNKNOWN_MODIFICATION_DATE ? System.currentTimeMillis() : teLastModified );
+
+            if ( !entry.getResource().isDirectory() )
+            {
+                final long size = entry.getResource().getSize();
+                te.setSize( size == PlexusIoResource.UNKNOWN_RESOURCE_SIZE ? 0 : size );
+                
+                te.setMode( entry.getMode() );
+            }
+            else
+            {
+                te.setMode( entry.getMode() );
+            }
+            
+            PlexusIoResourceAttributes attributes = entry.getResourceAttributes();
+            
+            te.setUserName( ( attributes != null && attributes.getUserName() != null ) ? attributes.getUserName() : options.getUserName() );
+            te.setGroupName( ( attributes != null && attributes.getGroupName() != null ) ? attributes.getGroupName() : options.getGroup() );
+            te.setUserId( ( attributes != null && attributes.getUserId() != -1 ) ? attributes.getUserId() : options.getUid() );
+            te.setGroupId( ( attributes != null && attributes.getGroupId() != -1 ) ? attributes.getGroupId() : options.getGid() );
+
+            tOut.putNextEntry( te );
+
+            if ( !entry.getResource().isDirectory() )
+            {
+                fIn = entry.getInputStream();
+
+                byte[] buffer = new byte[8 * 1024];
+                int count = 0;
+                do
+                {
+                    tOut.write( buffer, 0, count );
+                    count = fIn.read( buffer, 0, buffer.length );
+                }
+                while ( count != -1 );
+            }
+
+            tOut.closeEntry();
+        }
+        finally
+        {
+            if ( fIn != null )
+            {
+                fIn.close();
+            }
+        }
+    }
+
+    /**
+     * Valid Modes for Compression attribute to Tar Task
+     */
+    public class TarOptions
+    {
+        /**
+         * @deprecated
+         */
+        private int fileMode = UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM;
+
+        /**
+         * @deprecated
+         */
+        private int dirMode = UnixStat.DIR_FLAG | UnixStat.DEFAULT_DIR_PERM;
+
+        private String userName = "";
+
+        private String groupName = "";
+
+        private int uid;
+
+        private int gid;
+
+        private boolean preserveLeadingSlashes = false;
+
+        /**
+         * A 3 digit octal string, specify the user, group and
+         * other modes in the standard Unix fashion;
+         * optional, default=0644
+         *
+         * @param octalString a 3 digit octal string.
+         * @deprecated use AbstractArchiver.setDefaultFileMode(int)
+         */
+        public void setMode( String octalString )
+        {
+            setMode( Integer.parseInt( octalString, 8 ) );
+        }
+
+        /**
+         * @param mode unix file mode
+         * @deprecated use AbstractArchiver.setDefaultFileMode(int)
+         */
+        public void setMode( int mode )
+        {
+            this.fileMode = UnixStat.FILE_FLAG | ( mode & UnixStat.PERM_MASK );
+        }
+
+        /**
+         * @return the current mode.
+         * @deprecated use AbstractArchiver.getDefaultFileMode()
+         */
+        public int getMode()
+        {
+            return fileMode;
+        }
+
+        /**
+         * A 3 digit octal string, specify the user, group and
+         * other modes in the standard Unix fashion;
+         * optional, default=0755
+         *
+         * @param octalString a 3 digit octal string.
+         * @since Ant 1.6
+         * @deprecated use AbstractArchiver.setDefaultDirectoryMode(int)
+         */
+        public void setDirMode( String octalString )
+        {
+            setDirMode( Integer.parseInt( octalString, 8 ) );
+        }
+
+        /**
+         * @param mode unix directory mode
+         * @deprecated use AbstractArchiver.setDefaultDirectoryMode(int)
+         */
+        public void setDirMode( int mode )
+        {
+            this.dirMode = UnixStat.DIR_FLAG | ( mode & UnixStat.PERM_MASK );
+        }
+
+        /**
+         * @return the current directory mode
+         * @since Ant 1.6
+         * @deprecated use AbstractArchiver.getDefaultDirectoryMode()
+         */
+        public int getDirMode()
+        {
+            return dirMode;
+        }
+
+        /**
+         * The username for the tar entry
+         * This is not the same as the UID.
+         *
+         * @param userName the user name for the tar entry.
+         */
+        public void setUserName( String userName )
+        {
+            this.userName = userName;
+        }
+
+        /**
+         * @return the user name for the tar entry
+         */
+        public String getUserName()
+        {
+            return userName;
+        }
+
+        /**
+         * The uid for the tar entry
+         * This is not the same as the User name.
+         *
+         * @param uid the id of the user for the tar entry.
+         */
+        public void setUid( int uid )
+        {
+            this.uid = uid;
+        }
+
+        /**
+         * @return the uid for the tar entry
+         */
+        public int getUid()
+        {
+            return uid;
+        }
+
+        /**
+         * The groupname for the tar entry; optional, default=""
+         * This is not the same as the GID.
+         *
+         * @param groupName the group name string.
+         */
+        public void setGroup( String groupName )
+        {
+            this.groupName = groupName;
+        }
+
+        /**
+         * @return the group name string.
+         */
+        public String getGroup()
+        {
+            return groupName;
+        }
+
+        /**
+         * The GID for the tar entry; optional, default="0"
+         * This is not the same as the group name.
+         *
+         * @param gid the group id.
+         */
+        public void setGid( int gid )
+        {
+            this.gid = gid;
+        }
+
+        /**
+         * @return the group identifier.
+         */
+        public int getGid()
+        {
+            return gid;
+        }
+
+        /**
+         * @return the leading slashes flag.
+         */
+        public boolean getPreserveLeadingSlashes()
+        {
+            return preserveLeadingSlashes;
+        }
+
+        /**
+         * Flag to indicates whether leading `/'s should
+         * be preserved in the file names.
+         * Optional, default is <code>false</code>.
+         *
+         * @param preserveLeadingSlashes the leading slashes flag.
+         */
+        public void setPreserveLeadingSlashes( boolean preserveLeadingSlashes )
+        {
+            this.preserveLeadingSlashes = preserveLeadingSlashes;
+        }
+    }
+
+    /**
+     * Valid Modes for Compression attribute to Tar Task
+     */
+    public static final class TarCompressionMethod
+        extends EnumeratedAttribute
+    {
+
+        // permissible values for compression attribute
+
+        /**
+         * No compression
+         */
+        private static final String NONE = "none";
+
+        /**
+         * GZIP compression
+         */
+        private static final String GZIP = "gzip";
+
+        /**
+         * BZIP2 compression
+         */
+        private static final String BZIP2 = "bzip2";
+
+
+        /**
+         * Default constructor
+         */
+        public TarCompressionMethod()
+        {
+            super();
+            try
+            {
+                setValue( NONE );
+            }
+            catch ( ArchiverException ae )
+            {
+                //Do nothing
+            }
+        }
+
+        /**
+         * Get valid enumeration values.
+         *
+         * @return valid enumeration values
+         */
+        public String[] getValues()
+        {
+            return new String[]{NONE, GZIP, BZIP2};
+        }
+
+        /**
+         * This method wraps the output stream with the
+         * corresponding compression method
+         *
+         * @param ostream output stream
+         * @return output stream with on-the-fly compression
+         * @throws IOException thrown if file is not writable
+         */
+        private OutputStream compress( final OutputStream ostream )
+            throws IOException
+        {
+            final String value = getValue();
+            if ( GZIP.equals( value ) )
+            {
+                return new GZIPOutputStream( ostream );
+            }
+            else
+            {
+                if ( BZIP2.equals( value ) )
+                {
+                    ostream.write( 'B' );
+                    ostream.write( 'Z' );
+                    return new CBZip2OutputStream( ostream );
+                }
+            }
+            return ostream;
+        }
+    }
+
+	public boolean isSupportingForced() {
+		return true;
+	}
+
+    protected void cleanUp()
+    {
+        super.cleanUp();
+        tOut = null;
+    }
+
+    protected void close()
+        throws IOException
+    {
+        if ( tOut != null )
+        {
+            try
+            {
+                // close up
+                tOut.close();
+            }
+            catch ( IOException e )
+            {
+                // ignore
+            }
+        }
+    }
+
+    protected String getArchiveType()
+    {
+        return "TAR";
+    }
+
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarArchiver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java?rev=821961&view=auto
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java (added)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java Mon Oct  5 18:54:50 2009
@@ -0,0 +1,52 @@
+package org.apache.geronimo.system.plugin.plexus.archiver.tar;
+
+/**
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+import org.apache.geronimo.system.plugin.plexus.archiver.ArchiverException;
+import org.apache.geronimo.system.plugin.plexus.archiver.bzip2.BZip2UnArchiver;
+import org.apache.geronimo.system.plugin.plexus.archiver.tar.TarUnArchiver.UntarCompressionMethod;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Extract files in tar with bzip2 compression
+ * @author <a href="mailto:dantran@gmail.com">Dan Tran</a>
+ * @version $Revision$
+ */
+public class TarBZip2UnArchiver
+    extends TarUnArchiver
+{
+    public TarBZip2UnArchiver()
+    {
+    	this.setupCompressionMethod();
+    }
+
+    public TarBZip2UnArchiver( File sourceFile )
+    {
+        super( sourceFile );
+        this.setupCompressionMethod();
+    }
+
+    private void setupCompressionMethod()
+    {
+    	UntarCompressionMethod untarCompressionMethod = new UntarCompressionMethod( UntarCompressionMethod.BZIP2 );
+    	this.setCompression( untarCompressionMethod );
+    }
+    
+}

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/plexus/archiver/tar/TarBZip2UnArchiver.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message