From 41e665be7e7520f89255987854a6996526ef6e1f Mon Sep 17 00:00:00 2001
From: Laurent SCHOELENS <61973605+laurentschoelens@users.noreply.github.com>
Date: Tue, 12 Sep 2023 09:09:55 +0200
Subject: [PATCH] GH-366 : re-enable gh-issue-19 project

---
 .../main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java   |  2 ++
 .../jaxb/maven/resolver/tools/RelativeCatalog.java    |  5 +++--
 maven-plugin/tests/gh-issue-19/b/pom.xml              |  1 +
 maven-plugin/tests/gh-issue-19/pom.xml                | 11 -----------
 maven-plugin/tests/pom.xml                            |  2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

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..f94e872a3 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
@@ -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
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..f8c700186 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
@@ -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/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 @@
         <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/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 @@
   </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
index 3a81e13f7..577371eaf 100644
--- 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>