forked from pool/jing-trang
This commit is contained in:
Fridrich Strba
Git OBS Bridge
commit
a9e980c33f
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
317
0001-Various-build-fixes.patch
Normal file
317
0001-Various-build-fixes.patch
Normal file
@ -0,0 +1,317 @@
|
||||
From 212c793fe0f4b9e352e2ae9949beb187e77abe68 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Mon, 9 Jun 2014 09:54:16 +0300
|
||||
Subject: [PATCH 1/2] Various build fixes
|
||||
|
||||
---
|
||||
build.xml | 19 ++++++++-----------
|
||||
build.xsl | 28 ++++++++++++++++++----------
|
||||
mod/catalog/mod.xml | 2 +-
|
||||
mod/datatype/mod.xml | 1 +
|
||||
mod/jing/mod.xml | 2 --
|
||||
mod/pattern/mod.xml | 1 +
|
||||
mod/regex/mod.xml | 2 +-
|
||||
mod/rng-jaxp/mod.xml | 1 +
|
||||
mod/rng-validate/mod.xml | 2 +-
|
||||
mod/schematron/mod.xml | 8 ++------
|
||||
mod/trang/mod.xml | 3 +--
|
||||
mod/xerces/mod.xml | 2 +-
|
||||
mod/xsd-datatype/mod.xml | 1 +
|
||||
13 files changed, 37 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index a2bc499..ee0f061 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -145,22 +145,19 @@
|
||||
|
||||
<target name="javadoc" depends="init">
|
||||
<mkdir dir="${build.dir}/api"/>
|
||||
- <mkdir dir="${build.dir}/api/datatype"/>
|
||||
<mkdir dir="${build.dir}/api/jing"/>
|
||||
<mkdir dir="${build.dir}/api/regex"/>
|
||||
- <javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype"
|
||||
- doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API"
|
||||
- packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"/>
|
||||
<javadoc sourcepath="mod/util/src/main:mod/regex/src/main" destdir="${build.dir}/api/regex"
|
||||
packagenames="com.thaiopensource.datatype.xsd.regex,
|
||||
com.thaiopensource.datatype.xsd.regex.java,
|
||||
- com.thaiopensource.datatype.xsd.regex.xerces2"/>
|
||||
+ com.thaiopensource.datatype.xsd.regex.xerces2">
|
||||
+ <link href="/usr/share/javadoc/java"/>
|
||||
+ </javadoc>
|
||||
<javadoc sourcepathref="javadoc.sourcepath" destdir="${build.dir}/api/jing"
|
||||
doctitle="Jing API" windowtitle="Jing API"
|
||||
packagenames="${javadoc.packagenames}">
|
||||
- <link offline="true" href="../datatype" packagelistLoc="${build.dir}/api/datatype"/>
|
||||
- <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
|
||||
- packagelistLoc="extapidoc/jdk/1.5"/>
|
||||
+ <link href="/usr/share/javadoc/java"/>
|
||||
+ <link href="/usr/share/javadoc/relaxngDatatype"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
@@ -170,7 +167,7 @@
|
||||
destdir="${build.dir}/doccheck"
|
||||
packagenames="${javadoc.packagenames}"
|
||||
doclet="com.sun.tools.doclets.doccheck.DocCheck"
|
||||
- docletpath="lib/doccheck.jar"/>
|
||||
+ docletpath="${lib.dir}/doccheck.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="datatype-sample" depends="jar">
|
||||
@@ -290,7 +287,7 @@
|
||||
<java classname="com.thaiopensource.relaxng.translate.Driver"
|
||||
fork="true"
|
||||
failonerror="yes"
|
||||
- classpath="${build.dir}/trang.jar">
|
||||
+ classpath="${build.dir}/trang.jar:/usr/share/java/relaxngDatatype.jar">
|
||||
<arg value="dtdinst/dtdinst.rnc"/>
|
||||
<arg value="${build.dir}/dtdinst/dtdinst.rng"/>
|
||||
</java>
|
||||
@@ -360,7 +357,7 @@
|
||||
depends="version,googlecode.properties"
|
||||
description="Upload files to Google Code. Run dist before this.">
|
||||
<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask"
|
||||
- classpath="lib/ant-googlecode.jar" name="gcupload"/>
|
||||
+ classpath="${lib.dir}/ant-googlecode.jar" name="gcupload"/>
|
||||
<gcupload username="${googlecode.username}"
|
||||
password="${googlecode.password}"
|
||||
projectname="jing-trang"
|
||||
diff --git a/build.xsl b/build.xsl
|
||||
index d76508f..e084fca 100644
|
||||
--- a/build.xsl
|
||||
+++ b/build.xsl
|
||||
@@ -10,12 +10,12 @@
|
||||
<project>
|
||||
<xmlproperty file="version.xml"/>
|
||||
<property name="build.dir" value="${{basedir}}/build"/>
|
||||
- <property name="javacc.dir" value="lib"/>
|
||||
+ <property name="javacc.dir" value="${{lib.dir}}"/>
|
||||
<property name="ant.build.javac.source" value="1.5"/>
|
||||
<property name="ant.build.javac.target" value="1.5"/>
|
||||
<taskdef name="testng" classname="org.testng.TestNGAntTask">
|
||||
<classpath>
|
||||
- <pathelement location="lib/testng.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/testng.jar"/>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<target name="dummy"/>
|
||||
@@ -111,7 +111,7 @@
|
||||
<pathelement location="{$build}/mod/{@module}/classes/main"/>
|
||||
</xsl:for-each>
|
||||
<xsl:for-each select="depends[@lib]">
|
||||
- <pathelement location="lib/{@lib}.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
|
||||
</xsl:for-each>
|
||||
</classpath>
|
||||
</javac>
|
||||
@@ -151,10 +151,10 @@
|
||||
<pathelement location="{$build}/mod/{@module}/classes/main"/>
|
||||
</xsl:for-each>
|
||||
<xsl:for-each select="depends[@lib]">
|
||||
- <pathelement location="lib/{@lib}.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
|
||||
</xsl:for-each>
|
||||
<xsl:if test="test[@type='testng']">
|
||||
- <pathelement location="lib/testng.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/testng.jar"/>
|
||||
</xsl:if>
|
||||
</classpath>
|
||||
</javac>
|
||||
@@ -298,13 +298,18 @@
|
||||
<classpath>
|
||||
<pathelement location="{$build}/{$app}.jar"/>
|
||||
<xsl:if test="@lib">
|
||||
- <pathelement location="lib/{@lib}.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
|
||||
<xsl:if test="@lib='xalan'">
|
||||
- <pathelement location="lib/serializer.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/xalan-j2-serializer.jar"/>
|
||||
</xsl:if>
|
||||
</xsl:if>
|
||||
+ <!-- Upstream build assumes Class-Path in jing, trang manifests -->
|
||||
<xsl:if test="$app = 'jing'">
|
||||
- <pathelement location="lib/xercesImpl.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/xerces-j2.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
|
||||
+ </xsl:if>
|
||||
+ <xsl:if test="$app = 'trang'">
|
||||
+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
|
||||
</xsl:if>
|
||||
</classpath>
|
||||
</java>
|
||||
@@ -373,7 +378,7 @@
|
||||
<pathelement location="mod/{@module}/src/main"/>
|
||||
</xsl:for-each>
|
||||
<xsl:for-each select="../depends[@lib]">
|
||||
- <pathelement location="lib/{@lib}.jar"/>
|
||||
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
|
||||
</xsl:for-each>
|
||||
</classpath>
|
||||
</java>
|
||||
@@ -402,8 +407,11 @@
|
||||
<pathelement location="mod/{@module}/src/main"/>
|
||||
</xsl:for-each>
|
||||
<xsl:for-each select="../depends[@lib]">
|
||||
- <pathelement location="lib/{@lib}.jar"/>
|
||||
+ <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>
|
||||
</testng>
|
||||
</target>
|
||||
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 86583f8..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 saxon.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 3d1f73f..b682d6d 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">
|
||||
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 51d85cd..3786625 100644
|
||||
--- a/mod/schematron/mod.xml
|
||||
+++ b/mod/schematron/mod.xml
|
||||
@@ -3,15 +3,11 @@
|
||||
<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"
|
||||
- type="validate" schema="test/schematrontest.nrl"
|
||||
- lib="saxon"/>
|
||||
<test name="new-saxon" in="mod/schematron/test/schematrontest.xml"
|
||||
type="validate" schema="test/schematrontest.nrl"
|
||||
- lib="saxon9"/>
|
||||
+ lib="saxon"/>
|
||||
<test name="xalan" in="mod/schematron/test/schematrontest.xml"
|
||||
type="validate" schema="test/schematrontest.nrl"
|
||||
lib="xalan"/>
|
||||
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"/>
|
||||
--
|
||||
1.9.3
|
||||
|
||||
154
0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
Normal file
154
0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
Normal file
@ -0,0 +1,154 @@
|
||||
From c8a7800f6424beb64f4487e8c450875846e0d16a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Mon, 9 Jun 2014 09:57:38 +0300
|
||||
Subject: [PATCH 2/2] Use Xalan instead of Saxon for the build (#655601)
|
||||
|
||||
---
|
||||
build.xml | 10 +++++-----
|
||||
build.xsl | 4 ++--
|
||||
mod/schematron/mod.xml | 4 ++--
|
||||
mod/xsd-datatype/test/xsdtest.xml | 2 ++
|
||||
test/saxon.xsl | 14 +++++++-------
|
||||
5 files changed, 18 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index ee0f061..574c75f 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
<target name="modbuild" depends="modules,check-modbuild" unless="modbuild-ok">
|
||||
<xslt style="build.xsl" in="modules.xml" out="modbuild.xml" force="true">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
</target>
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
includes="${moddir}/*/${modfile}"
|
||||
filedirparameter="name"
|
||||
destdir=".">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
<regexpmapper from="mod/([-a-zA-Z0-9_]*)/mod.xml"
|
||||
to="mod/\1/\1.iml"
|
||||
handledirsep="true"/>
|
||||
@@ -180,15 +180,15 @@
|
||||
<target name="jing-doc" depends="version">
|
||||
<xslt basedir="doc" destdir="${build.dir}" includes="derivative.xml"
|
||||
style="doc/derivative.xsl">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
<xslt basedir="doc" destdir="${build.dir}" includes="design.xml"
|
||||
style="doc/design.xsl">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
<xslt basedir="doc" destdir="${build.dir}" includes="nrl.xml"
|
||||
style="doc/nrl.xsl">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
<copy todir="${build.dir}">
|
||||
<fileset dir="doc" includes="*.html"/>
|
||||
diff --git a/build.xsl b/build.xsl
|
||||
index e084fca..b29694f 100644
|
||||
--- a/build.xsl
|
||||
+++ b/build.xsl
|
||||
@@ -330,7 +330,7 @@
|
||||
<xslt style="{$srctestdir}/{@transform}"
|
||||
in="{$srctest}"
|
||||
out="{$runtestdir}/{@name}test.xml">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
<!-- XXX Could validate intermediate result against a schema -->
|
||||
</xsl:if>
|
||||
@@ -346,7 +346,7 @@
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:attribute>
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
<param name="dir" expression="{$runtestdir}"/>
|
||||
</xslt>
|
||||
</target>
|
||||
diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml
|
||||
index 3786625..3e1d5b9 100644
|
||||
--- a/mod/schematron/mod.xml
|
||||
+++ b/mod/schematron/mod.xml
|
||||
@@ -23,12 +23,12 @@
|
||||
<xslt style="mod/schematron/lib/xsltc-fixup.xsl"
|
||||
in="mod/schematron/src/main/${mod.schematron.respackage}/schematron.xsl"
|
||||
out="${mod.schematron.resdir}/schematron-xsltc.xsl">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
<xslt style="mod/schematron/lib/xsltc-fixup.xsl"
|
||||
in="mod/schematron/src/main/${mod.schematron.respackage}/iso-schematron.xsl"
|
||||
out="${mod.schematron.resdir}/iso-schematron-xsltc.xsl">
|
||||
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
||||
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
||||
</xslt>
|
||||
</target>
|
||||
</ant>
|
||||
diff --git a/mod/xsd-datatype/test/xsdtest.xml b/mod/xsd-datatype/test/xsdtest.xml
|
||||
index 5bbba48..fc0221b 100644
|
||||
--- a/mod/xsd-datatype/test/xsdtest.xml
|
||||
+++ b/mod/xsd-datatype/test/xsdtest.xml
|
||||
@@ -739,7 +739,9 @@ B EEF </value>
|
||||
<length value="0"></length>
|
||||
<length value="1">x</length>
|
||||
<length value="1"> x </length>
|
||||
+<!-- xalan creates invalid XML out of this: ��
|
||||
<length value="1">𐠀</length>
|
||||
+-->
|
||||
</datatype>
|
||||
<datatype name="language">
|
||||
<valid>en</valid>
|
||||
diff --git a/test/saxon.xsl b/test/saxon.xsl
|
||||
index 9a86877..1471783 100644
|
||||
--- a/test/saxon.xsl
|
||||
+++ b/test/saxon.xsl
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
-<xsl:stylesheet version="1.0"
|
||||
+<xsl:stylesheet version="1.1"
|
||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
- xmlns:saxon="http://icl.com/saxon"
|
||||
- extension-element-prefixes="saxon">
|
||||
+ xmlns:xalan="http://xml.apache.org/xalan"
|
||||
+ extension-element-prefixes="xalan">
|
||||
|
||||
<xsl:output method="text"/>
|
||||
|
||||
@@ -10,21 +10,21 @@
|
||||
<xsl:variable name="prepped">
|
||||
<xsl:apply-templates select="*"/>
|
||||
</xsl:variable>
|
||||
- <xsl:apply-templates select="saxon:node-set($prepped)/documents/*" mode="output"/>
|
||||
+ <xsl:apply-templates select="xalan:nodeset($prepped)/documents/*" mode="output"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="document" mode="output">
|
||||
- <saxon:output href="{@href}" method="{@method}">
|
||||
+ <xsl:document href="{@href}" method="{@method}">
|
||||
<xsl:if test="@dtd">
|
||||
<xsl:value-of select="@dtd" disable-output-escaping="yes"/>
|
||||
</xsl:if>
|
||||
<xsl:copy-of select="node()"/>
|
||||
- </saxon:output>
|
||||
+ </xsl:document>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="dir" mode="output">
|
||||
<xsl:value-of select="substring(File:mkdir(File:new(@name)),0,0)"
|
||||
- xmlns:File="java:java.io.File"/>
|
||||
+ xmlns:File="xalan://java.io.File"/>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
--
|
||||
1.9.3
|
||||
|
||||
3
V20151127.tar.gz
Normal file
3
V20151127.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04cdf589abc5651d40f44fbc3415cb094672cb3c977770b2d9f6ea33e6d8932b
|
||||
size 13746634
|
||||
20
jing-trang-20091111-datatype-sample.patch
Normal file
20
jing-trang-20091111-datatype-sample.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- jing-trang-20091111/datatype-sample/build.xml~ 2001-09-22 07:10:47.000000000 +0300
|
||||
+++ jing-trang-20091111/datatype-sample/build.xml 2010-11-30 22:49:33.352540838 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
<project name="RELAX NG Datatype Sample" default="jar" basedir=".">
|
||||
|
||||
<property name="build.dir" value="build"/>
|
||||
-<property name="jing.jar" value="jing.jar"/>
|
||||
+<property name="datatype.jar" value="/usr/share/java/relaxngDatatype.jar"/>
|
||||
|
||||
<target name="init">
|
||||
<mkdir dir="${build.dir}"/>
|
||||
@@ -9,7 +9,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="jar" depends="compile">
|
||||
152
jing-trang-20151127-notestng.patch
Normal file
152
jing-trang-20151127-notestng.patch
Normal file
@ -0,0 +1,152 @@
|
||||
--- jing-trang-20151127/build.xsl 2017-11-30 15:06:42.700567381 +0100
|
||||
+++ jing-trang-20151127/build.xsl 2017-11-30 15:07:43.208567609 +0100
|
||||
@@ -13,11 +13,6 @@
|
||||
<property name="javacc.dir" value="${{lib.dir}}"/>
|
||||
<property name="ant.build.javac.source" value="1.5"/>
|
||||
<property name="ant.build.javac.target" value="1.5"/>
|
||||
- <taskdef name="testng" classname="org.testng.TestNGAntTask">
|
||||
- <classpath>
|
||||
- <pathelement location="${{lib.dir}}/testng.jar"/>
|
||||
- </classpath>
|
||||
- </taskdef>
|
||||
<target name="dummy"/>
|
||||
<target name="init">
|
||||
<mkdir dir="{$build}"/>
|
||||
@@ -153,9 +148,6 @@
|
||||
<xsl:for-each select="depends[@lib]">
|
||||
<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>
|
||||
</xsl:if>
|
||||
@@ -385,38 +377,6 @@
|
||||
</target>
|
||||
</xsl:template>
|
||||
|
||||
-<xsl:template match="test[@type='testng']">
|
||||
- <xsl:param name="name"/>
|
||||
- <target name="mod.{$name}.test-{@name}" depends="mod.{$name}.compile-test">
|
||||
- <mkdir dir="{$build}/mod/{$name}/test-{@name}"/>
|
||||
- <testng workingDir="{$build}/mod/{$name}/test-{@name}"
|
||||
- outputdir="{$build}/mod/{$name}/test-{@name}/report"
|
||||
- haltonfailure="true"
|
||||
- suiteName="mod.{$name}.test-{@name}"
|
||||
- listeners="org.testng.reporters.DotTestListener">
|
||||
- <classfileset dir="{$build}/mod/{$name}/classes/test" includes="**/*.class"/>
|
||||
- <classpath>
|
||||
- <pathelement location="{$build}/mod/{$name}/classes/test"/>
|
||||
- <pathelement location="{$build}/mod/{$name}/classes/main"/>
|
||||
- <pathelement location="mod/{$name}/src/test"/>
|
||||
- <pathelement location="mod/{$name}/src/main"/>
|
||||
- <xsl:for-each select="../depends[@module]">
|
||||
- <pathelement location="{$build}/mod/{@module}/classes/test"/>
|
||||
- <pathelement location="{$build}/mod/{@module}/classes/main"/>
|
||||
- <pathelement location="mod/{@module}/src/test"/>
|
||||
- <pathelement location="mod/{@module}/src/main"/>
|
||||
- </xsl:for-each>
|
||||
- <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>
|
||||
- </testng>
|
||||
- </target>
|
||||
-</xsl:template>
|
||||
-
|
||||
<xsl:template match="service" mode="jar">
|
||||
<xsl:param name="root"/>
|
||||
<xsl:copy>
|
||||
--- jing-trang-20151127/iml.xsl 2017-11-30 15:06:42.704567381 +0100
|
||||
+++ jing-trang-20151127/iml.xsl 2017-11-30 15:07:52.776567646 +0100
|
||||
@@ -27,9 +27,6 @@
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
- <xsl:if test="test[@type='testng']">
|
||||
- <orderEntry type="library" name="testng" level="project"/>
|
||||
- </xsl:if>
|
||||
<xsl:apply-templates select="depends"/>
|
||||
<orderEntryProperties />
|
||||
</component>
|
||||
--- jing-trang-20151127/jing-trang.ipr 2017-11-30 15:06:42.704567381 +0100
|
||||
+++ jing-trang-20151127/jing-trang.ipr 2017-11-30 15:08:20.208567749 +0100
|
||||
@@ -499,13 +499,6 @@
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
- <library name="testng">
|
||||
- <CLASSES>
|
||||
- <root url="jar://$PROJECT_DIR$/lib/testng.jar!/" />
|
||||
- </CLASSES>
|
||||
- <JAVADOC />
|
||||
- <SOURCES />
|
||||
- </library>
|
||||
<library name="resolver">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/lib/resolver.jar!/" />
|
||||
--- jing-trang-20151127/mod/catalog/mod.xml 2017-11-30 15:06:42.748567381 +0100
|
||||
+++ jing-trang-20151127/mod/catalog/mod.xml 2017-11-30 15:59:15.311548956 +0100
|
||||
@@ -1,6 +1,5 @@
|
||||
<module>
|
||||
- <compile test="yes"/>
|
||||
- <test name="unit" type="testng"/>
|
||||
+ <compile/>
|
||||
<depends module="util"/>
|
||||
<depends module="resolver"/>
|
||||
<depends lib="xml-commons-resolver"/>
|
||||
--- jing-trang-20151127/mod/infer/mod.xml 2017-11-30 15:06:42.716567381 +0100
|
||||
+++ jing-trang-20151127/mod/infer/mod.xml 2017-11-30 16:01:51.157015411 +0100
|
||||
@@ -4,6 +4,5 @@
|
||||
<depends module="datatype"/>
|
||||
<depends module="xsd-datatype"/>
|
||||
<depends module="regex"/>
|
||||
- <compile test="yes"/>
|
||||
- <test name="unit" type="testng"/>
|
||||
+ <compile/>
|
||||
</module>
|
||||
--- jing-trang-20151127/mod/pattern/mod.xml 2017-11-30 15:06:42.736567381 +0100
|
||||
+++ jing-trang-20151127/mod/pattern/mod.xml 2017-11-30 16:00:31.269015109 +0100
|
||||
@@ -4,6 +4,5 @@
|
||||
<depends module="datatype"/>
|
||||
<depends module="rng-parse"/>
|
||||
<depends lib="relaxngDatatype"/>
|
||||
- <compile test="yes"/>
|
||||
- <test name="unit" type="testng"/>
|
||||
+ <compile/>
|
||||
</module>
|
||||
--- jing-trang-20151127/mod/rng-jaxp/mod.xml 2017-11-30 15:06:42.740567381 +0100
|
||||
+++ jing-trang-20151127/mod/rng-jaxp/mod.xml 2017-11-30 16:02:00.329015446 +0100
|
||||
@@ -8,6 +8,5 @@
|
||||
<depends module="pattern"/>
|
||||
<depends module="jaxp"/>
|
||||
<depends lib="relaxngDatatype"/>
|
||||
- <compile test="yes"/>
|
||||
- <test name="unit" type="testng"/>
|
||||
+ <compile/>
|
||||
</module>
|
||||
--- jing-trang-20151127/mod/util/mod.xml 2017-11-30 15:06:42.748567381 +0100
|
||||
+++ jing-trang-20151127/mod/util/mod.xml 2017-11-30 15:57:22.367548530 +0100
|
||||
@@ -1,5 +1,4 @@
|
||||
<module>
|
||||
- <compile test="yes"/>
|
||||
- <test name="unit" type="testng"/>
|
||||
+ <compile/>
|
||||
</module>
|
||||
|
||||
--- jing-trang-20151127/mod/xsd-datatype/mod.xml 2017-11-30 15:06:42.748567381 +0100
|
||||
+++ jing-trang-20151127/mod/xsd-datatype/mod.xml 2017-11-30 16:01:40.053015369 +0100
|
||||
@@ -4,8 +4,7 @@
|
||||
<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"/>
|
||||
+ <compile/>
|
||||
<service type="org.relaxng.datatype.DatatypeLibraryFactory">
|
||||
<provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
|
||||
</service>
|
||||
168
jing-trang.spec
Normal file
168
jing-trang.spec
Normal file
@ -0,0 +1,168 @@
|
||||
#
|
||||
# spec file for package jing-trang
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: jing-trang
|
||||
Version: 20151127
|
||||
Release: 0
|
||||
Summary: Schema validation and conversion based on RELAX NG
|
||||
License: BSD
|
||||
URL: https://github.com/relaxng/jing-trang
|
||||
Source0: https://github.com/relaxng/jing-trang/archive/V%{version}.tar.gz
|
||||
Patch0: 0001-Various-build-fixes.patch
|
||||
Patch1: 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
|
||||
Patch2: %{name}-20091111-datatype-sample.patch
|
||||
Patch3: %{name}-%{version}-notestng.patch
|
||||
BuildRequires: bsh
|
||||
BuildRequires: isorelax
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: javacc
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: qdox unzip
|
||||
BuildRequires: relaxngDatatype >= 2011.1
|
||||
BuildRequires: saxon9
|
||||
BuildRequires: xalan-j2
|
||||
BuildRequires: xerces-j2
|
||||
BuildRequires: xml-commons-resolver
|
||||
BuildArch: noarch
|
||||
BuildRequires: ant >= 1.8.2
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
%package -n jing
|
||||
Summary: RELAX NG validator in Java
|
||||
Group: Productivity/Text/Utilities
|
||||
Requires: java-headless
|
||||
Requires: jpackage-utils
|
||||
Requires: relaxngDatatype
|
||||
Requires: xerces-j2
|
||||
Requires: xml-commons-resolver
|
||||
|
||||
%description -n jing
|
||||
Jing is a RELAX NG validator written in Java. It implements the RELAX
|
||||
NG 1.0 Specification, RELAX NG Compact Syntax, and parts of RELAX NG
|
||||
DTD Compatibility, specifically checking of ID/IDREF/IDREFS. It also
|
||||
has experimental support for schema languages other than RELAX NG;
|
||||
specifically W3C XML Schema, Schematron 1.5, and Namespace Routing
|
||||
Language.
|
||||
|
||||
%package -n jing-javadoc
|
||||
Summary: Javadoc API documentation for Jing
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description -n jing-javadoc
|
||||
Javadoc API documentation for Jing.
|
||||
|
||||
%package -n trang
|
||||
Summary: Multi-format schema converter based on RELAX NG
|
||||
Group: Productivity/Text/Utilities
|
||||
Requires: java-headless
|
||||
Requires: jpackage-utils
|
||||
Requires: relaxngDatatype
|
||||
Requires: xerces-j2
|
||||
Requires: xml-commons-resolver
|
||||
|
||||
%description -n trang
|
||||
Trang converts between different schema languages for XML. It
|
||||
supports the following languages: RELAX NG (both XML and compact
|
||||
syntax), XML 1.0 DTDs, W3C XML Schema. A schema written in any of the
|
||||
supported schema languages can be converted into any of the other
|
||||
supported schema languages, except that W3C XML Schema is supported
|
||||
for output only, not for input.
|
||||
|
||||
%package -n dtdinst
|
||||
Summary: XML DTD to XML instance format converter
|
||||
Group: Productivity/Text/Utilities
|
||||
Requires: java-headless >= 1.5.0
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description -n dtdinst
|
||||
DTDinst is a program for converting XML DTDs into an XML instance
|
||||
format.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar")
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
sed -i -e 's/\r//g' lib/isorelax.copying.txt
|
||||
find . -name "OldSaxon*.java" -delete # No "old" saxon available in Fedora
|
||||
sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \
|
||||
dtdinst/index.html
|
||||
sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \
|
||||
trang/doc/trang.html trang/doc/trang-manual.html
|
||||
|
||||
|
||||
%build
|
||||
CLASSPATH=$(build-classpath \
|
||||
xalan-j2 xalan-j2-serializer saxon9 relaxngDatatype) \
|
||||
%{ant} \
|
||||
-Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last \
|
||||
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
||||
dist
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot} *-%{version}
|
||||
|
||||
install -dm 755 $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}}
|
||||
|
||||
unzip build/dist/jing-%{version}.zip
|
||||
install -Dpm 644 jing-%{version}/bin/jing.jar %{buildroot}%{_javadir}
|
||||
mv jing-%{version}/doc/api %{buildroot}%{_javadocdir}/jing
|
||||
ln -s %{_javadocdir}/jing jing-%{version}/doc/api
|
||||
rm -f jing-%{version}/sample/datatype/datatype-sample.jar
|
||||
%jpackage_script com.thaiopensource.relaxng.util.Driver "" "" jing:relaxngDatatype:xml-commons-resolver:xerces-j2 jing true
|
||||
mkdir -p jing-%{version}/_licenses
|
||||
mv jing-%{version}/doc/*copying.* jing-%{version}/_licenses
|
||||
|
||||
unzip build/dist/trang-%{version}.zip
|
||||
install -pm 644 trang-%{version}/trang.jar %{buildroot}%{_javadir}
|
||||
%jpackage_script com.thaiopensource.relaxng.translate.Driver "" "" trang:relaxngDatatype:xml-commons-resolver:xerces-j2 trang true
|
||||
|
||||
unzip build/dist/dtdinst-%{version}.zip
|
||||
install -pm 644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir}
|
||||
%jpackage_script com.thaiopensource.xml.dtd.app.Driver "" "" dtdinst dtdinst true
|
||||
|
||||
|
||||
%files -n jing
|
||||
%license jing-%{version}/_licenses/*
|
||||
%doc jing-%{version}/{readme.html,doc,sample}
|
||||
%{_bindir}/jing
|
||||
%{_javadir}/jing.jar
|
||||
|
||||
%files -n jing-javadoc
|
||||
%license jing-%{version}/_licenses/*
|
||||
%{_javadocdir}/jing/
|
||||
|
||||
%files -n trang
|
||||
%license trang-%{version}/copying.txt
|
||||
%doc trang-%{version}/*.html
|
||||
%{_bindir}/trang
|
||||
%{_javadir}/trang.jar
|
||||
|
||||
%files -n dtdinst
|
||||
%license dtdinst-%{version}/copying.txt
|
||||
%doc dtdinst-%{version}/*.{html,rng,xsl}
|
||||
%doc dtdinst-%{version}/{dtdinst.rnc.txt,teixml.dtd.txt,example}
|
||||
%{_bindir}/dtdinst
|
||||
%{_javadir}/dtdinst.jar
|
||||
|
||||
%changelog
|
||||
Loading…
x
Reference in New Issue
Block a user