Repository: cxf-xjc-utils Updated Branches: refs/heads/master 5ac1d7060 -> df53775f3
Make sure we don't use a static catalog as catalogs from one module will spill into others Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/df53775f Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/df53775f Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/df53775f Branch: refs/heads/master Commit: df53775f327284b3a74a749bab634d43d4df7ea9 Parents: 5ac1d70 Author: Daniel Kulp <[email protected]> Authored: Thu May 22 14:26:41 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Thu May 22 14:26:41 2014 -0400 ---------------------------------------------------------------------- .../apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/df53775f/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java ---------------------------------------------------------------------- diff --git a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java index e1c331a..70e5041 100644 --- a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java +++ b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java @@ -379,10 +379,16 @@ public abstract class AbstractXSDToJavaMojo extends AbstractMojo { } final ClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()])); - CatalogManager.getStaticManager().setIgnoreMissingProperties(true); - final CatalogResolver catResolver = new CatalogResolver(true) { + CatalogManager cm = new CatalogManager(); + cm.setUseStaticCatalog(false); + cm.setIgnoreMissingProperties(true); + final CatalogResolver catResolver = new CatalogResolver(cm) { public InputSource resolveEntity(String publicId, String systemId) { String resolved = getResolvedEntity(publicId, systemId); + //System.out.println("Resolved: "); + //System.out.println(" : " + publicId); + //System.out.println(" : " + systemId); + //System.out.println(" -> " + resolved); if (resolved == null) { return null; }
