Fix #212 by looking for both /catalog.xml and /META-INF/catalog.xml i…

…n jar files
ndw · May 28, 2015 · 59bc06d · 59bc06d
1 parent 218dc8b
commit 59bc06d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/com/xmlcalabash/core/XProcConfiguration.java b/src/main/java/com/xmlcalabash/core/XProcConfiguration.java
@@ -220,6 +220,10 @@ private void init() {
                 if (catalog != null) {
                     catalogs.add("jar:file://" + s + "!/catalog.xml");
                 }
+                catalog = jar.getEntry("META-INF/catalog.xml");
+                if (catalog != null) {
+                    catalogs.add("jar:file://" + s + "!/META-INF/catalog.xml");
+                }
             } catch (IOException e) {
                 // nevermind
             }