#35: Replace defaultManifest.mf with inline code

This closes #35

Author: michael-o

src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java

@@ -16,12 +16,10 @@
  *  limitations under the License.
  */
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Map;
 import java.util.jar.Attributes;
+
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Not part of any public API
@@ -32,33 +30,13 @@ class JdkManifestFactory
     public static java.util.jar.Manifest getDefaultManifest()
         throws ArchiverException
     {
-        InputStream in = null;
-        final String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
-        try
-        {
-            in = JdkManifestFactory.class.getResourceAsStream( defManifest );
-            if ( in == null )
-            {
-                throw new ArchiverException( "Could not find default manifest: " + defManifest );
-            }
-            java.util.jar.Manifest defaultManifest = new java.util.jar.Manifest( in );
-
-            in.close();
-            in = null;
+        final java.util.jar.Manifest defaultManifest = new java.util.jar.Manifest();
+        defaultManifest.getMainAttributes().putValue( "Manifest-Version", "1.0" );
+        defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
+                                                      "java.vm.version" ) + " (" + System.getProperty(
+                                                          "java.vm.vendor" ) + ")" );
 
-            defaultManifest.getMainAttributes().putValue( "Created-By",
-                                                          System.getProperty( "java.vm.version" ) + " ("
-                                                              + System.getProperty( "java.vm.vendor" ) + ")" );
-            return defaultManifest;
-        }
-        catch ( IOException e )
-        {
-            throw new ArchiverException( "Unable to read default manifest", e );
-        }
-        finally
-        {
-            IOUtil.close( in );
-        }
+        return defaultManifest;
     }
 
     public static void merge( java.util.jar.Manifest target, java.util.jar.Manifest other, boolean overwriteMain )

src/main/java/org/codehaus/plexus/archiver/jar/Manifest.java

@@ -21,7 +21,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
@@ -34,8 +33,8 @@
 import java.util.StringTokenizer;
 import java.util.Vector;
 import java.util.jar.Attributes;
+
 import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Holds the data of a jar manifest.
@@ -388,7 +387,7 @@ public Iterator<String> iterator()
         {
             return getKeys(attributes).iterator();
         }
-        
+
         public void setName( String name )
         {
             throw new UnsupportedOperationException( "Cant do this" );
@@ -738,43 +737,13 @@ public Iterator<String> iterator()
     public static Manifest getDefaultManifest()
         throws ArchiverException
     {
-        InputStream in = null;
-        Reader reader = null;
-        final String defManifest = "/org/codehaus/plexus/archiver/jar/defaultManifest.mf";
-        try
-        {
-            in = Manifest.class.getResourceAsStream( defManifest );
-            if ( in == null )
-            {
-                throw new ArchiverException( "Could not find default manifest: " + defManifest );
-            }
-            reader = new InputStreamReader( in, "UTF-8" );
-            final Manifest defaultManifest = new Manifest( reader );
-            defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
-                                                          "java.vm.version" ) + " (" + System.getProperty(
-                                                              "java.vm.vendor" ) + ")" );
-
-            reader.close();
-            reader = null;
-
-            in.close();
-            in = null;
+        final Manifest defaultManifest = new Manifest();
+        defaultManifest.getMainAttributes().putValue( "Manifest-Version", "1.0" );
+        defaultManifest.getMainAttributes().putValue( "Created-By", System.getProperty(
+                                                      "java.vm.version" ) + " (" + System.getProperty(
+                                                          "java.vm.vendor" ) + ")" );
 
-            return defaultManifest;
-        }
-        catch ( ManifestException e )
-        {
-            throw new ArchiverException( "Default manifest is invalid !!", e );
-        }
-        catch ( IOException e )
-        {
-            throw new ArchiverException( "Unable to read default manifest", e );
-        }
-        finally
-        {
-            IOUtil.close( in );
-            IOUtil.close( reader );
-        }
+        return defaultManifest;
     }
 
     /**