From 59bc06d7b66eb58fbb44fd31e30c0d7cf9ddc80e Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 28 May 2015 08:02:13 -0500 Subject: [PATCH] Fix #212 by looking for both /catalog.xml and /META-INF/catalog.xml in jar files --- src/main/java/com/xmlcalabash/core/XProcConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/xmlcalabash/core/XProcConfiguration.java b/src/main/java/com/xmlcalabash/core/XProcConfiguration.java index 31decad1..acd458e3 100644 --- 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 }