From 62ad89204c223441bf540fb8b4cb5b7b0beba29b Mon Sep 17 00:00:00 2001
From: Tom Schraitle <tom_schr@web.de>
Date: Mon, 25 Jul 2022 18:30:18 +0200
Subject: [PATCH] Various build fixes

---
 build.xml                 | 15 ++-------------
 build.xsl                 | 17 +++++++----------
 datatype-sample/build.xml |  3 ++-
 mod/catalog/mod.xml       |  2 +-
 mod/datatype/mod.xml      |  1 +
 mod/jing/mod.xml          |  2 --
 mod/pattern/mod.xml       |  1 +
 mod/regex/mod.xml         |  6 +++---
 mod/rng-jaxp/mod.xml      |  1 +
 mod/rng-validate/mod.xml  |  2 +-
 mod/schematron/mod.xml    |  2 +-
 mod/trang/mod.xml         |  3 +--
 mod/xerces/mod.xml        |  2 +-
 mod/xsd-datatype/mod.xml  |  1 +
 14 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/build.xml b/build.xml
index 31c0b64..51c695f 100644
--- a/build.xml
+++ b/build.xml
@@ -161,8 +161,7 @@
   <mkdir dir="${build.dir}/api/regex"/>
   <javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype"
     additionalparam="-html5 -Xdoclint:none"
-    doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API"
-    packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers">
+    doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API">
     <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
 	  packagelistLoc="extapidoc/jdk/1.5"/>
     <classpath>
@@ -453,18 +452,8 @@
             labels="Type-Archive, OpSys-All, Version-${version}"/>
 </target>
 
-<target name="ant-clean"
-	description="Remove almost all files created during the build process">
-  <delete dir="${build.dir}"/>
-  <exec executable="git">
-    <arg value="clean"/>
-    <arg value="-d"/>
-    <arg value="--force"/>
-    <arg value="${doc.dir}"/>
-  </exec>
-</target>
 
-<target name="realclean" depends="ant-clean"
+<target name="realclean"
 	description="Remove all files created during the build process">
   <delete>
     <fileset dir="mod" includes="*/*.iml"/>
diff --git a/build.xsl b/build.xsl
index 1703937..e45acf6 100644
--- a/build.xsl
+++ b/build.xsl
@@ -4,7 +4,7 @@
 
 <xsl:output indent="yes"
 	    encoding="utf-8"/>
-	    
+
 <xsl:variable name="build" select="'${build.dir}'"/>
 <xsl:variable name="doc" select="'${doc.dir}'"/>
 <xsl:template match="/">
@@ -23,12 +23,6 @@
     <target name="dummy"/>
     <target name="init">
       <mkdir dir="{$build}"/>
-      <exec executable="git">
-        <arg value="submodule"/>
-        <arg value="update"/>
-        <arg value="--init"/>
-        <arg value="--recursive"/>
-      </exec>
       <copy todir="{$doc}">
         <fileset dir="relaxng.org/jclark" includes="**"/>
       </copy>
@@ -165,7 +159,6 @@
 	    <pathelement location="${{lib.dir}}/{@lib}.jar"/>
 	  </xsl:for-each>
 	  <xsl:if test="test[@type='testng']">
-	    <pathelement location="${{lib.dir}}/testng.jar"/>
 	  </xsl:if>
 	</classpath>
       </javac>
@@ -311,11 +304,12 @@
 	<xsl:if test="@lib">
 	  <pathelement location="${{lib.dir}}/{@lib}.jar"/>
 	  <xsl:if test="@lib='xalan'">
-	    <pathelement location="${{lib.dir}}/serializer.jar"/>
+	    <pathelement location="${{lib.dir}}/xalan-j2-serializer.jar"/>
 	  </xsl:if>
 	</xsl:if>
 	<xsl:if test="$app = 'jing'">
-	  <pathelement location="${{lib.dir}}/xercesImpl.jar"/>
+	  <pathelement location="${{lib.dir}}/xerces-j2.jar"/>
+	  <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
 	</xsl:if>
       </classpath>
     </java>
@@ -397,6 +391,9 @@
 	<xsl:for-each select="../depends[@lib]">
 	  <pathelement location="${{lib.dir}}/{@lib}.jar"/>
 	</xsl:for-each>
+	<!-- Upstream testng.jar includes bsh and qdox -->
+	<pathelement location="${{lib.dir}}/bsh.jar"/>
+	<pathelement location="${{lib.dir}}/qdox.jar"/>
       </classpath>
     </java>
   </target>
diff --git a/datatype-sample/build.xml b/datatype-sample/build.xml
index 1bc068a..5ec4dd8 100644
--- a/datatype-sample/build.xml
+++ b/datatype-sample/build.xml
@@ -2,6 +2,7 @@
 
 <property name="build.dir" value="build"/>
 <property name="jing.jar" value="jing.jar"/>
+<property name="datatype.jar" value="relaxngDatatype.jar"/>
 
 <target name="init">
   <mkdir dir="${build.dir}"/>
@@ -9,7 +10,7 @@
 
 <target name="compile" depends="init">
   <mkdir dir="${build.dir}/classes"/>
-  <javac srcdir="src" destdir="${build.dir}/classes" classpath="${jing.jar}"/>
+  <javac srcdir="src" destdir="${build.dir}/classes" classpath="${datatype.jar}"/>
 </target>
 
 <target name="ant-jar" depends="compile">
diff --git a/mod/catalog/mod.xml b/mod/catalog/mod.xml
index c8e2feb..5398646 100644
--- a/mod/catalog/mod.xml
+++ b/mod/catalog/mod.xml
@@ -3,5 +3,5 @@
   <test name="unit" type="testng"/>
   <depends module="util"/>
   <depends module="resolver"/>
-  <depends lib="resolver"/>
+  <depends lib="xml-commons-resolver"/>
 </module>
diff --git a/mod/datatype/mod.xml b/mod/datatype/mod.xml
index cd79499..cdb420a 100644
--- a/mod/datatype/mod.xml
+++ b/mod/datatype/mod.xml
@@ -1,4 +1,5 @@
 <module>
   <depends module="util"/>
+  <depends lib="relaxngDatatype"/>
   <compile/>
 </module>
diff --git a/mod/jing/mod.xml b/mod/jing/mod.xml
index 8d304f8..8b2ec82 100644
--- a/mod/jing/mod.xml
+++ b/mod/jing/mod.xml
@@ -21,8 +21,6 @@
   <jar>
     <manifest>
       <attribute name="Main-Class" value="com/thaiopensource/relaxng/util/Driver"/>
-      <attribute name="Class-Path"
-		 value="xercesImpl.jar xml-apis.jar saxon9.jar xalan.jar isorelax.jar resolver.jar"/>
     </manifest>
     <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"/>
     <service type="org.relaxng.datatype.DatatypeLibraryFactory"/>
diff --git a/mod/pattern/mod.xml b/mod/pattern/mod.xml
index 777f484..875f1cb 100644
--- a/mod/pattern/mod.xml
+++ b/mod/pattern/mod.xml
@@ -3,6 +3,7 @@
   <depends module="resolver"/>
   <depends module="datatype"/>
   <depends module="rng-parse"/>
+  <depends lib="relaxngDatatype"/>
   <compile test="yes"/>
   <test name="unit" type="testng"/>
 </module>
diff --git a/mod/regex/mod.xml b/mod/regex/mod.xml
index 1b10caa..f1bc0a4 100644
--- a/mod/regex/mod.xml
+++ b/mod/regex/mod.xml
@@ -1,6 +1,6 @@
 <module>
   <depends module="util"/>
-  <depends lib="xercesImpl"/>
+  <depends lib="xerces-j2"/>
   <compile test="yes"/>
   <test name="xerces" type="java"
 	class="com.thaiopensource.datatype.xsd.regex.test.TestDriver">
@@ -46,14 +46,14 @@
 	    failonerror="yes">
 	<arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/>
 	<arg value="${build.dir}/mod/regex/gensrc/main"/>
-	<arg value="${lib.dir}/UnicodeData-3.1.0.txt"/>
+	<arg value="lib/UnicodeData-3.1.0.txt"/>
 	<classpath>
 	  <pathelement location="${build.dir}/mod/regex-gen/classes/main"/>
 	  <pathelement location="${build.dir}/mod/util/classes/main"/>
 	</classpath>
       </java>
     </target>
-    
+
     <target name="mod.regex.check-gen" depends="mod.regex-gen.compile-main">
       <uptodate property="mod.regex.gen-ok"
 		targetfile="${build.dir}/mod/regex/gensrc/main/com/thaiopensource/datatype/xsd/regex/java/Categories.java">
diff --git a/mod/rng-jaxp/mod.xml b/mod/rng-jaxp/mod.xml
index 10a8c6d..48c5d8c 100644
--- a/mod/rng-jaxp/mod.xml
+++ b/mod/rng-jaxp/mod.xml
@@ -7,6 +7,7 @@
   <depends module="rng-parse"/>
   <depends module="pattern"/>
   <depends module="jaxp"/>
+  <depends lib="relaxngDatatype"/>
   <compile test="yes"/>
   <test name="unit" type="testng"/>
 </module>
diff --git a/mod/rng-validate/mod.xml b/mod/rng-validate/mod.xml
index 109543b..b05b996 100644
--- a/mod/rng-validate/mod.xml
+++ b/mod/rng-validate/mod.xml
@@ -7,7 +7,7 @@
   <depends module="pattern"/>
   <depends module="validate"/>
   <depends lib="ant"/>
-  <depends lib="resolver"/>
+  <depends lib="xml-commons-resolver"/>
   <test name="spec" type="validate" schema="eg/testSuite.rng"/>
   <compile/>
   <version package="com/thaiopensource/relaxng/util"/>
diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml
index 1e370c7..773b375 100644
--- a/mod/schematron/mod.xml
+++ b/mod/schematron/mod.xml
@@ -3,7 +3,7 @@
   <depends module="resolver"/>
   <depends module="validate"/>
   <depends module="rng-validate"/>
-  <depends lib="xalan"/>
+  <depends lib="xalan-j2"/>
   <depends lib="saxon"/>
   <depends lib="saxon9"/>
   <test name="old-saxon" in="mod/schematron/test/schematrontest.xml"
diff --git a/mod/trang/mod.xml b/mod/trang/mod.xml
index 69b5cc0..fa2d6d0 100644
--- a/mod/trang/mod.xml
+++ b/mod/trang/mod.xml
@@ -13,13 +13,12 @@
   <depends module="convert-to-xsd"/>
   <depends module="convert-from-dtd"/>
   <depends module="convert-to-dtd"/>
-  <depends lib="resolver"/>
+  <depends lib="xml-commons-resolver"/>
   <compile/>
   <version package="com/thaiopensource/relaxng/translate"/>
   <jar>
     <manifest>
       <attribute name="Main-Class" value="com/thaiopensource/relaxng/translate/Driver"/>
-      <attribute name="Class-Path" value="resolver.jar"/>
     </manifest>
     <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
       <provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
diff --git a/mod/xerces/mod.xml b/mod/xerces/mod.xml
index b7dc603..56bc85f 100644
--- a/mod/xerces/mod.xml
+++ b/mod/xerces/mod.xml
@@ -1,7 +1,7 @@
 <module>
   <depends module="util"/>
   <depends module="validate"/>
-  <depends lib="xercesImpl"/>
+  <depends lib="xerces-j2"/>
   <compile/>
   <service type="com.thaiopensource.validate.SchemaReaderFactory">
     <provider classname="com.thaiopensource.validate.xerces.XsdSchemaReaderFactory"/>
diff --git a/mod/xsd-datatype/mod.xml b/mod/xsd-datatype/mod.xml
index f81eb3c..cc7645b 100644
--- a/mod/xsd-datatype/mod.xml
+++ b/mod/xsd-datatype/mod.xml
@@ -2,6 +2,7 @@
   <depends module="util"/>
   <depends module="datatype"/>
   <depends module="regex"/>
+  <depends lib="relaxngDatatype"/>
   <test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
   <test name="unit" type="testng"/>
   <compile test="yes"/>
-- 
2.35.3