diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml b/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml
index e612e8609..7a845cb4b 100644
--- a/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml
+++ b/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml
@@ -95,7 +95,7 @@
-
+
@@ -129,7 +129,7 @@
+ basedir="${basedir}/target/classes"/>
-
\ No newline at end of file
+
diff --git a/hyperjaxb/ejb/samples/po-initial/project-build.xml b/hyperjaxb/ejb/samples/po-initial/project-build.xml
index 65ffd67a4..36b62fc5f 100644
--- a/hyperjaxb/ejb/samples/po-initial/project-build.xml
+++ b/hyperjaxb/ejb/samples/po-initial/project-build.xml
@@ -95,14 +95,14 @@
-
+
-
+
@@ -137,7 +137,7 @@
+ basedir="${basedir}/target/classes"/>
-
\ No newline at end of file
+
diff --git a/hyperjaxb/ejb/samples/pom.xml b/hyperjaxb/ejb/samples/pom.xml
index dc99f3cd8..4843cfb4e 100644
--- a/hyperjaxb/ejb/samples/pom.xml
+++ b/hyperjaxb/ejb/samples/pom.xml
@@ -32,6 +32,13 @@
maven-plugin
provided
+
+ org.jvnet.jaxb
+ hyperjaxb3-ejb-plugin
+ ${project.version}
+ maven-plugin
+ provided
+
install
diff --git a/hyperjaxb/ejb/samples/uniprot/project-build.xml b/hyperjaxb/ejb/samples/uniprot/project-build.xml
index b64ad3d9c..02ff2cd92 100644
--- a/hyperjaxb/ejb/samples/uniprot/project-build.xml
+++ b/hyperjaxb/ejb/samples/uniprot/project-build.xml
@@ -100,7 +100,7 @@
-
+
@@ -134,7 +134,7 @@
+ basedir="${basedir}/target/classes"/>
-
\ No newline at end of file
+
diff --git a/hyperjaxb/ejb/templates/basic/project-build.xml b/hyperjaxb/ejb/templates/basic/project-build.xml
index 56d27822f..ec5c6be0e 100644
--- a/hyperjaxb/ejb/templates/basic/project-build.xml
+++ b/hyperjaxb/ejb/templates/basic/project-build.xml
@@ -101,7 +101,7 @@
-
+
@@ -135,7 +135,7 @@
+ basedir="${basedir}/target/classes"/>
-
\ No newline at end of file
+
diff --git a/maven-plugin/plugin-core/pom.xml b/maven-plugin/plugin-core/pom.xml
index 9e00798a5..72c558e3c 100644
--- a/maven-plugin/plugin-core/pom.xml
+++ b/maven-plugin/plugin-core/pom.xml
@@ -23,10 +23,15 @@
commons-lang3
+ xml-resolver
+ xml-resolver
+ 1.2
+
+
org.glassfish.jaxb
txw2
diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
index 2365e0e1d..de2dbe3bd 100644
--- a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
+++ b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
@@ -79,8 +79,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
import com.sun.xml.txw2.annotation.XmlNamespace;
/**
@@ -909,6 +909,8 @@ protected CatalogResolver createCatalogResolver() throws MojoExecutionException
catalogManager.setIgnoreMissingProperties(true);
catalogManager.setUseStaticCatalog(false);
if (getRelativeCatalogResolution()) {
+ getLog().info("Using RelativeCatalogResolution as CatalogManager" +
+ " (enable resolution of '../' path for REWRITE_SYSTEM in catalog files)");
catalogManager.setCatalogClassName(RelativeCatalog.class.getName());
}
// TODO Logging
@@ -923,7 +925,7 @@ protected CatalogResolver createCatalogResolver() throws MojoExecutionException
}
}
- private CatalogResolver createCatalogResolverByClassName(final String catalogResolverClassName)
+ private CatalogResolver createCatalogResolverByClassName(final String catalogResolverClassName)
throws MojoExecutionException {
try {
final Class> draftCatalogResolverClass = Thread.currentThread().getContextClassLoader()
diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
index ac7d97e6d..3ec4a8827 100644
--- a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
+++ b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
@@ -9,7 +9,7 @@
import java.text.MessageFormat;
public class ClasspathCatalogResolver extends
- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver implements LoggingCatalogResolver {
+ org.apache.xml.resolver.tools.CatalogResolver implements LoggingCatalogResolver {
public static final String URI_SCHEME_CLASSPATH = "classpath";
private Log log;
diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
index 205e42a26..17847ac5c 100644
--- a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
+++ b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
@@ -10,14 +10,13 @@
import org.jvnet.jaxb.maven.DependencyResourceResolver;
import org.jvnet.jaxb.maven.plugin.logging.NullLog;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
+import org.apache.xml.resolver.CatalogManager;
public class MavenCatalogResolver extends
- com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver {
+ org.apache.xml.resolver.tools.CatalogResolver {
public static final String URI_SCHEME_MAVEN = "maven";
private final DependencyResourceResolver dependencyResourceResolver;
- private final CatalogManager catalogManager;
private final Log log;
public MavenCatalogResolver(CatalogManager catalogManager,
@@ -28,7 +27,6 @@ public MavenCatalogResolver(CatalogManager catalogManager,
public MavenCatalogResolver(CatalogManager catalogManager,
DependencyResourceResolver dependencyResourceResolver, Log log) {
super(catalogManager);
- this.catalogManager = catalogManager;
if (dependencyResourceResolver == null) {
throw new IllegalArgumentException(
"Dependency resource resolver must not be null.");
@@ -37,10 +35,6 @@ public MavenCatalogResolver(CatalogManager catalogManager,
this.log = log != null ? log : NullLog.INSTANCE;
}
- protected CatalogManager getCatalogManager() {
- return catalogManager;
- }
-
protected Log getLog() {
return log;
}
diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/RelativeCatalog.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/RelativeCatalog.java
index b7da8ba97..058550c9d 100644
--- a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/RelativeCatalog.java
+++ b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/RelativeCatalog.java
@@ -1,8 +1,8 @@
package org.jvnet.jaxb.maven.resolver.tools;
-import com.sun.org.apache.xml.internal.resolver.Catalog;
-import com.sun.org.apache.xml.internal.resolver.CatalogEntry;
-import com.sun.org.apache.xml.internal.resolver.CatalogException;
+import org.apache.xml.resolver.Catalog;
+import org.apache.xml.resolver.CatalogEntry;
+import org.apache.xml.resolver.CatalogException;
import java.util.Vector;
@@ -11,6 +11,7 @@ public class RelativeCatalog extends Catalog {
public void addEntry(CatalogEntry entry) {
super.addEntry(entry);
if (entry.getEntryType() == REWRITE_SYSTEM) {
+ catalogManager.debug.message(0, "REWRITE_SYSTEM relativeCatalog checking");
try {
if (entry.getEntryArg(0) != null && entry.getEntryArg(0).startsWith("..")) {
// generate new entry for catalog
@@ -20,8 +21,8 @@ public void addEntry(CatalogEntry entry) {
CatalogEntry duplicatedEntry = new CatalogEntry(entry.getEntryType(), args);
- catalogManager.debug.message(4, "REWRITE_SYSTEM",
- duplicatedEntry.getEntryArg(0), duplicatedEntry.getEntryArg(1));
+ catalogManager.debug.message(0, "REWRITE_SYSTEM adding "
+ + duplicatedEntry.getEntryArg(0) + " to " + duplicatedEntry.getEntryArg(1));
catalogEntries.addElement(duplicatedEntry);
}
diff --git a/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
index 8084bb061..3bcbeee43 100644
--- a/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
+++ b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
@@ -7,8 +7,8 @@
import org.junit.Test;
import org.xml.sax.InputSource;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
public class MavenCatalogResolverTest {
diff --git a/maven-plugin/tests/gh-issue-19/b/pom.xml b/maven-plugin/tests/gh-issue-19/b/pom.xml
index 1965a3482..c18abc487 100644
--- a/maven-plugin/tests/gh-issue-19/b/pom.xml
+++ b/maven-plugin/tests/gh-issue-19/b/pom.xml
@@ -30,6 +30,7 @@
jaxb-maven-plugin
true
+ true
b/b.xsd
diff --git a/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat b/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat
index 254ff8cc8..01912371a 100644
--- a/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat
+++ b/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat
@@ -1,2 +1 @@
REWRITE_SYSTEM "../a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-gh-issue-19-a:jar::!/a"
-REWRITE_SYSTEM "file:/C:/Projects/workspaces/mj2p/maven-jaxb2-plugin-project/tests/gh-issue-19/b/src/main/resources/a" "maven:org.jvnet.jaxb:jaxb-maven-plugin-tests-gh-issue-19-a:jar::!/a"
diff --git a/maven-plugin/tests/gh-issue-19/pom.xml b/maven-plugin/tests/gh-issue-19/pom.xml
index 86475f57f..90b4b6e42 100644
--- a/maven-plugin/tests/gh-issue-19/pom.xml
+++ b/maven-plugin/tests/gh-issue-19/pom.xml
@@ -23,16 +23,5 @@
test
-
-
-
- org.jvnet.jaxb
- jaxb-maven-plugin
-
- true
-
-
-
-
diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml
index 3a81e13f7..577371eaf 100644
--- a/maven-plugin/tests/pom.xml
+++ b/maven-plugin/tests/pom.xml
@@ -49,7 +49,7 @@
MAVEN_JAXB2_PLUGIN-86
MAVEN_JAXB2_PLUGIN-87
gh-issue-16
-
+ gh-issue-19
gh-issue-22
gh-issue-23
gh-issue-58