Skip to content

Commit

Permalink
remove xalan (#203)
Browse files Browse the repository at this point in the history
Remove xalan
  • Loading branch information
elharo authored May 14, 2023
1 parent 1c2a8d7 commit 4fac9ca
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 230 deletions.
8 changes: 0 additions & 8 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ subject line. The XOM home page is https://xom.nu/

<property name="xmlapis.jar" value="${lib.dir}/xml-apis-1.4.01.jar"/>
<property name="parser.jar" value="${lib.dir}/xercesImpl-2.12.2.jar"/>
<property name="xslt.jar" value="${lib.dir}/xalan.jar"/>
<property name="serializer.jar" value="${lib.dir}/serializer-2.7.2.jar"/>
<property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.1.jar"/>
<property name="junit.jar" value="${lib.dir}/junit.jar"/>
<property name="xom.jar" value="${build.dir}/${name}-${version}.jar"/>
Expand Down Expand Up @@ -100,8 +98,6 @@ subject line. The XOM home page is https://xom.nu/
<pathelement location="${parser.jar}"/>
<pathelement location="${xom-core}"/>
<pathelement location="${jaxen.dir}"/>
<pathelement location="${xslt.jar}"/>
<pathelement location="${serializer.jar}"/>
</path>

<path id="test.class.path">
Expand Down Expand Up @@ -470,7 +466,6 @@ XOM Build file
</javac>

<java classname="nu.xom.tools.XHTMLJavaDoc" fork="yes">
<jvmarg value="-Xbootclasspath/p:lib/xercesImpl-2.12.2.jar:lib/xalan.jar:lib/xml-apis-1.4.01.jar"/>
<classpath refid="doc.class.path" />
<arg value="build/apidocs"/>
</java>
Expand Down Expand Up @@ -781,9 +776,6 @@ XOM Build file

<target name="debug" depends="init" description="Print various Ant properties">
<echoproperties/>
<java classname="org.apache.xalan.Version" fork="yes">
<classpath refid="test.class.path" />
</java>
</target>

<target name="website" depends="samples, betterdoc" description="Generate the website">
Expand Down
201 changes: 0 additions & 201 deletions lib/XalanLicense.txt

This file was deleted.

Binary file removed lib/serializer-2.7.2.jar
Binary file not shown.
Binary file removed lib/xalan.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions project2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@
<version>2.12.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 7 additions & 5 deletions src/nu/xom/tests/XSLTransformTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -771,12 +771,14 @@ public void testIllegalTransform()
File stylesheet = new File(inputDir, "illegaltransform.xsl");
Builder builder = new Builder();
Document stylesheetDoc = builder.build(stylesheet);
XSLTransform xform = new XSLTransform(stylesheetDoc);
Element root = new Element("root", "http://www.example.org");
Document input = new Document(root);
try {
xform.transform(input);
fail("Allowed illegal transform");
// Some stylesheets processors fail when parsing the sheet while others
// don't fail until it's used to transform a document.
XSLTransform xform = new XSLTransform(stylesheetDoc);
Element root = new Element("root", "http://www.example.org");
Document input = new Document(root);
xform.transform(input);
fail("Allowed illegal transform");
}
catch (XSLException ex) {
assertNotNull(ex.getMessage());
Expand Down
7 changes: 3 additions & 4 deletions website/faq.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</author>
<authorinitials>ERH</authorinitials>
<copyright>
<year>2002-2005, 2009, 2016, 2018, 2020</year>
<year>2002-2005, 2009, 2016, 2018, 2020, 2023</year>
<holder>Elliotte Rusty Harold</holder>
</copyright>
</articleinfo>
Expand Down Expand Up @@ -544,11 +544,10 @@ Several of the tests in <classname>XSLTransformTest</classname> including
<methodname>testOASISXalanConformanceSuite</methodname>,
<methodname>testOASISMicrosoftConformanceSuite</methodname>, and
<methodname>testKeysPerfRepro3</methodname>
fail in Java 1.4 due to bugs in the version of Xalan bundled with Sun's JDK. These tests pass in Java 1.5.
They will also pass in
fail in Java 1.4 due to bugs in the version of Xalan bundled with Sun's JDK.
These tests pass in Java 1.5. or later. They will also pass in
Java 1.4 if you put the version of Xalan found in the lib directory in
your jre/lib/endorsed directory so it will override the one bundled with the JDK.
You can find out which version of Xalan you have by running "ant version" in the main XOM directory. You'll need 2.6.1 or later for all the test to pass.
</para>

<para>
Expand Down
11 changes: 5 additions & 6 deletions website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ <h1>XOM</h1>
parser to read documents and feed the data into a tree structure.
While theoretically any SAX2 compliant parser should work, <a
href="https://xerces.apache.org/xerces2-j/">Xerces 2.6.1</a> and later
is the only one that I am fairly confident does work. Xerces 2.8.0
is included with the full distribution. This product includes
is the only one that I am fairly confident does work. Xerces 2.12.2
is included with the full distribution. This product includes
software developed by the Apache Software Foundation
(https://www.apache.org/). Piccolo 1.0.3, Crimson, GNU JAXP 1.0b1,
the Oracle XML Parser for Java 9.2.0.2.0D and 9.2.0.5.0, and Xerces
Expand All @@ -119,8 +119,7 @@ <h1>XOM</h1>


<p>
Similarly XSLT support depends on a TrAX processor
(Xalan-J 2.7.2 is bundled). XInclude and
Similarly XSLT support depends on a TrAX processor. XInclude and
XML canonicalization, however, are native.
</p>

Expand Down Expand Up @@ -152,9 +151,9 @@ <h1>XOM</h1>
<div align="center">[ <a href="https://cafe.elharo.com/">The Cafes</a> | <a href="https://www.cafeconleche.org">Cafe con Leche</a> |
<a href="https://www.cafeaulait.org">Cafe au Lait</a> ]</div>
<hr />
<p>Copyright 2002-2022 <a href="https://www.elharo.com/">Elliotte Rusty Harold</a><br />
<p>Copyright 2002-2023 <a href="https://www.elharo.com/">Elliotte Rusty Harold</a><br />
<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;elharo%40ibiblio%2Eorg">elharo@ibiblio.org</a><br />
Last Modified January 22, 2023
Last Modified May 14, 2023
</p>
</div>
<div id="Navbar">
Expand Down

0 comments on commit 4fac9ca

Please sign in to comment.