[webbeans-commits] Webbeans SVN: r1546 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-16 14:03:19 -0500 (Mon, 16 Feb 2009)
New Revision: 1546

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
Log:
use jar streams

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java	2009-02-16 19:02:24 UTC (rev 1545)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java	2009-02-16 19:03:19 UTC (rev 1546)
@@ -21,10 +21,12 @@
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
 
 import org.apache.log4j.Logger;
 import org.jboss.jsr299.tck.impl.util.Files;
@@ -158,26 +160,26 @@
       
    }
    
-   private static class Zipper
+   private static class JarCreator
    {
       
       private final File root;
       
-      public Zipper(File root)
+      public JarCreator(File root)
       {
          this.root = root;
       }
       
-      public InputStream zip() throws IOException
+      public InputStream jar() throws IOException
       {
          ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-         ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
-         zip(root, zipOutputStream);
-         zipOutputStream.close();
+         JarOutputStream jarOutputStream = new JarOutputStream(byteArrayOutputStream, new Manifest());
+         jar(root, jarOutputStream);
+         jarOutputStream.close();
          return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
       }
       
-      private void zip(File directory, ZipOutputStream zipOutputStream) throws IOException
+      private void jar(File directory, JarOutputStream jarOutputStream) throws IOException
       {
          File[] children = directory.listFiles(); 
          //loop through dirList, and zip the files 
@@ -185,14 +187,14 @@
          {
             if (child.isDirectory()) 
             { 
-               zip(child, zipOutputStream);
+               jar(child, jarOutputStream);
             } 
             else
             {
                FileInputStream fis = new FileInputStream(child); 
-               ZipEntry zipEntry = new ZipEntry(child.getPath().substring(root.getPath().length() + 1));  
-               zipOutputStream.putNextEntry(zipEntry);  
-               Files.copy(fis, zipOutputStream);
+               JarEntry jarEntry = new JarEntry(child.getPath().substring(root.getPath().length() + 1));  
+               jarOutputStream.putNextEntry(jarEntry);  
+               Files.copy(fis, jarOutputStream);
                fis.close();
             }
          }
@@ -226,7 +228,7 @@
    { 
       if (jar == null)
       {
-         jar = new Zipper(getExplodedJar()).zip();
+         jar = new JarCreator(getExplodedJar()).jar();
       }
       return jar;
    }