[jboss-cvs] JBossAS SVN: r108247 - projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-09-21 10:20:22 -0400 (Tue, 21 Sep 2010)
New Revision: 108247

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
Log:
Port JBVFS-129.

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2010-09-21 13:55:20 UTC (rev 108246)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java	2010-09-21 14:20:22 UTC (rev 108247)
@@ -21,16 +21,7 @@
 */
 package org.jboss.virtual.plugins.context.zip;
 
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -38,17 +29,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.cert.Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -61,13 +42,7 @@
 import org.jboss.virtual.plugins.context.ReplacementHandler;
 import org.jboss.virtual.plugins.context.jar.JarUtils;
 import org.jboss.virtual.plugins.copy.AbstractCopyMechanism;
-import org.jboss.virtual.spi.ExceptionHandler;
-import org.jboss.virtual.spi.Options;
-import org.jboss.virtual.spi.TempInfo;
-import org.jboss.virtual.spi.TempStore;
-import org.jboss.virtual.spi.VFSContext;
-import org.jboss.virtual.spi.VFSContextConstraints;
-import org.jboss.virtual.spi.VirtualFileHandler;
+import org.jboss.virtual.spi.*;
 
 /**
  * <tt>ZipEntryContext</tt> implements a {@link org.jboss.virtual.spi.VFSContext}
@@ -283,7 +258,7 @@
          {
             zipSource = createZipSource(filePath);
          }
-         catch (IOException e)
+         catch (Exception e)
          {
             throw new RuntimeException("Failed to initialize ZipWrapper: " + filePath, e);
          }
@@ -326,11 +301,12 @@
     * @return zip entry wrapper
     * @throws IOException for any error
     */
-   protected ZipWrapper createZipSource(String rootPath) throws IOException
+   protected ZipWrapper createZipSource(String rootPath) throws Exception
    {
       File file = null;
       String relative = null;
-      File fp = new File(VFSUtils.decode(rootPath));
+      URI uri = new URI("file:" + rootPath); // we expect a file
+      File fp = new File(uri);
       if (fp.exists())
       {
          file = fp;