GH-366 : re-enable gh-issue-19 project

Fixes issue 366 with new xml-resolver dependency to split rt.jar classes in jdk8 and CatalogManager classes from new XmlResolver dependency in seperate packages.
highsource · Sep 12, 2023 · bf19fe4 · bf19fe4
1 parent 8256c79
commit bf19fe4
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 54 deletions.
diff --git a/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml b/hyperjaxb/ejb/samples/po-customized-toplink/project-build.xml
@@ -95,7 +95,7 @@
 					<include name="dtd-parser-*.jar"/>
 					<include name="istack-commons-tools-*.jar"/>
 					<include name="relaxngDatatype-*.jar"/>
-					<include name="resolver-*.jar"/>
+          <include name="xml-resolver-*.jar"/>
 					<include name="rngom-*.jar"/>
 					<include name="xsom-*.jar"/>
 
@@ -129,7 +129,7 @@
 	<target name="compile" depends="generate-sources">
 		<mkdir dir="${basedir}/target/classes"/>
 		<javac
-			destdir="${basedir}/target/classes" 
+			destdir="${basedir}/target/classes"
 			srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
 			classpathref="compile.path"
 			source="1.8"
@@ -145,7 +145,7 @@
 	<target name="test-compile" depends="compile">
 		<mkdir dir="${basedir}/target/test-classes"/>
 		<javac
-			destdir="${basedir}/target/test-classes" 
+			destdir="${basedir}/target/test-classes"
 			srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
 			classpathref="test-compile.path"
 			source="1.8"
@@ -185,7 +185,7 @@
 	<target name="package" depends="test">
 		<mkdir dir="${basedir}/target"/>
 		<jar destfile="${basedir}/target/${artifactId}-${version}.jar"
-			basedir="${basedir}/target/classes"/> 
+			basedir="${basedir}/target/classes"/>
 	</target>
 	<target name="install" depends="package"/>
-</project>
+</project>
diff --git a/hyperjaxb/ejb/samples/po-initial/project-build.xml b/hyperjaxb/ejb/samples/po-initial/project-build.xml
@@ -95,14 +95,14 @@
 					<include name="jaxb-impl-*.jar"/>
 					<include name="jsr173_api-*.jar"/>
 					<include name="stax-api-*.jar"/>
-                                                       
+
 					<include name="jaxb-core-*.jar"/>
 					<include name="jaxb-xjc-*.jar"/>
 					<include name="codemodel-*.jar"/>
 					<include name="dtd-parser-*.jar"/>
 					<include name="istack-commons-tools-*.jar"/>
 					<include name="relaxngDatatype-*.jar"/>
-					<include name="resolver-*.jar"/>
+          <include name="xml-resolver-*.jar"/>
 					<include name="rngom-*.jar"/>
 					<include name="xsom-*.jar"/>
 
@@ -137,7 +137,7 @@
 	<target name="compile" depends="generate-sources">
 		<mkdir dir="${basedir}/target/classes"/>
 		<javac
-			destdir="${basedir}/target/classes" 
+			destdir="${basedir}/target/classes"
 			srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
 			classpathref="compile.path"
 			source="1.8"
@@ -153,7 +153,7 @@
 	<target name="test-compile" depends="compile">
 		<mkdir dir="${basedir}/target/test-classes"/>
 		<javac
-			destdir="${basedir}/target/test-classes" 
+			destdir="${basedir}/target/test-classes"
 			srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
 			classpathref="test-compile.path"
 			source="1.8"
@@ -193,7 +193,7 @@
 	<target name="package" depends="test">
 		<mkdir dir="${basedir}/target"/>
 		<jar destfile="${basedir}/target/${artifactId}-${version}.jar"
-			basedir="${basedir}/target/classes"/> 
+			basedir="${basedir}/target/classes"/>
 	</target>
 	<target name="install" depends="package"/>
-</project>
+</project>
diff --git a/hyperjaxb/ejb/samples/pom.xml b/hyperjaxb/ejb/samples/pom.xml
@@ -32,6 +32,13 @@
 			<type>maven-plugin</type>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>hyperjaxb3-ejb-plugin</artifactId>
+			<version>${project.version}</version>
+			<type>maven-plugin</type>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/hyperjaxb/ejb/samples/uniprot/project-build.xml b/hyperjaxb/ejb/samples/uniprot/project-build.xml
@@ -100,7 +100,7 @@
 					<include name="dtd-parser-*.jar"/>
 					<include name="istack-commons-tools-*.jar"/>
 					<include name="relaxngDatatype-*.jar"/>
-					<include name="resolver-*.jar"/>
+					<include name="xml-resolver-*.jar"/>
 					<include name="rngom-*.jar"/>
 					<include name="xsom-*.jar"/>
 
@@ -134,7 +134,7 @@
 	<target name="compile" depends="generate-sources">
 		<mkdir dir="${basedir}/target/classes"/>
 		<javac
-			destdir="${basedir}/target/classes" 
+			destdir="${basedir}/target/classes"
 			srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
 			classpathref="compile.path"
 			source="1.8"
@@ -150,7 +150,7 @@
 	<target name="test-compile" depends="compile">
 		<mkdir dir="${basedir}/target/test-classes"/>
 		<javac
-			destdir="${basedir}/target/test-classes" 
+			destdir="${basedir}/target/test-classes"
 			srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
 			classpathref="test-compile.path"
 			source="1.8"
@@ -190,7 +190,7 @@
 	<target name="package" depends="test">
 		<mkdir dir="${basedir}/target"/>
 		<jar destfile="${basedir}/target/${artifactId}-${version}.jar"
-			basedir="${basedir}/target/classes"/> 
+			basedir="${basedir}/target/classes"/>
 	</target>
 	<target name="install" depends="package"/>
-</project>
+</project>
diff --git a/hyperjaxb/ejb/templates/basic/project-build.xml b/hyperjaxb/ejb/templates/basic/project-build.xml
@@ -101,7 +101,7 @@
 					<include name="dtd-parser-*.jar"/>
 					<include name="istack-commons-tools-*.jar"/>
 					<include name="relaxngDatatype-*.jar"/>
-					<include name="resolver-*.jar"/>
+          <include name="xml-resolver-*.jar"/>
 					<include name="rngom-*.jar"/>
 					<include name="xsom-*.jar"/>
 
@@ -135,7 +135,7 @@
 	<target name="compile" depends="generate-sources">
 		<mkdir dir="${basedir}/target/classes"/>
 		<javac
-			destdir="${basedir}/target/classes" 
+			destdir="${basedir}/target/classes"
 			srcdir="${basedir}/src/main/java:${basedir}/target/generated-sources/xjc"
 			classpathref="compile.path"
 			source="1.8"
@@ -151,7 +151,7 @@
 	<target name="test-compile" depends="compile">
 		<mkdir dir="${basedir}/target/test-classes"/>
 		<javac
-			destdir="${basedir}/target/test-classes" 
+			destdir="${basedir}/target/test-classes"
 			srcdir="${basedir}/src/test/java:${basedir}/target/generated-sources/xjc"
 			classpathref="test-compile.path"
 			source="1.8"
@@ -191,7 +191,7 @@
 	<target name="package" depends="test">
 		<mkdir dir="${basedir}/target"/>
 		<jar destfile="${basedir}/target/${artifactId}-${version}.jar"
-			basedir="${basedir}/target/classes"/> 
+			basedir="${basedir}/target/classes"/>
 	</target>
 	<target name="install" depends="package"/>
-</project>
+</project>
diff --git a/maven-plugin/plugin-core/pom.xml b/maven-plugin/plugin-core/pom.xml
@@ -23,10 +23,15 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
+      <groupId>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <!--<dependency>
       <groupId>com.sun.org.apache.xml.internal</groupId>
       <artifactId>resolver</artifactId>
       <version>20050927</version>
-    </dependency>
+    </dependency>-->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>txw2</artifactId>

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
@@ -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/...ugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java b/...ugin-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/...n/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java b/...n/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/...plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/RelativeCatalog.java b/...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/...ore/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java b/...ore/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
@@ -30,6 +30,7 @@
         <artifactId>jaxb-maven-plugin</artifactId>
         <configuration>
           <useDependenciesAsEpisodes>true</useDependenciesAsEpisodes>
+          <relativeCatalogResolution>true</relativeCatalogResolution>
           <schemaIncludes>
             <include>b/b.xsd</include>
           </schemaIncludes>

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
@@ -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
@@ -23,16 +23,5 @@
   </dependencies>
   <build>
     <defaultGoal>test</defaultGoal>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.jvnet.jaxb</groupId>
-          <artifactId>jaxb-maven-plugin</artifactId>
-          <configuration>
-            <relativeCatalogResolution>true</relativeCatalogResolution>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 </project>
diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml
@@ -49,7 +49,7 @@
     <module>MAVEN_JAXB2_PLUGIN-86</module>
     <module>MAVEN_JAXB2_PLUGIN-87</module>
     <module>gh-issue-16</module>
-    <!-- module>gh-issue-19</module -->
+    <module>gh-issue-19</module>
     <module>gh-issue-22</module>
     <module>gh-issue-23</module>
     <module>gh-issue-58</module>