Switched to using pure java Apache Zip implementation

[vamsas.git] / src / uk / ac / vamsas / test / simpleclient / VamsasArchive.java

diff --git a/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java b/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
index 52dec7e..175c2bc 100644 (file)
--- a/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
+++ b/src/uk/ac/vamsas/test/simpleclient/VamsasArchive.java
@@ -112,13 +112,25 @@ public class VamsasArchive {
        JarFile jf = new JarFile(av, true, JarFile.OPEN_READ);
         if (jf.getEntry("vamsasDocument.xml")!=null)
         {
-          log.info("Valid archive "+av);
+          log.info("Valid archive (sun) "+av);
         }
         jf.close();
       } catch (Exception f)
       {
-        log.info("Couldn't access jar archive "+av, f);
+        log.warn("Couldn't access jar archive with sun jartools: "+av, f);
       }
+      try {
+        org.apache.tools.zip.ZipFile jf = new org.apache.tools.zip.ZipFile(av);
+        if (jf.getEntry("vamsasDocument.xml")!=null)
+        {
+          log.info("Valid archive (apache) "+av);
+        }
+        jf.close();
+      } catch (Exception f)
+      {
+        log.warn("Couldn't access jar archive with apache ziptool: "+av,f);
+      }
+
       log.info("Opening archive "+av);
       uk.ac.vamsas.client.simpleclient.VamsasArchive varchive = new uk.ac.vamsas.client.simpleclient.VamsasArchive(av, true);