--- build.xml.orig 2006-07-18 16:50:55.000000000 +0200 +++ build.xml 2007-12-20 08:05:26.000000000 +0100 @@ -56,7 +56,6 @@ <property name="dist.dir" value="./dist"/> <property name="clover.dir" value="./clover"/> <property name="testreports.dir" value="./testreports" /> - <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/> <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/> <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/> @@ -93,7 +92,6 @@ <pathelement location="${xml-apis.jar}"/> <pathelement location="${parser.jar}"/> <pathelement location="${junit.jar}"/> - <pathelement location="${jaxen.dir}"/> <pathelement location="${servlet.jar}"/> </path> @@ -101,7 +99,6 @@ <pathelement location="${xml-apis.jar}"/> <pathelement location="${parser.jar}"/> <pathelement location="${xom-core}"/> - <pathelement location="${jaxen.dir}"/> <pathelement location="${xslt.jar}"/> <pathelement location="${serializer.jar}"/> </path> @@ -171,8 +168,6 @@ <mkdir dir="${dist.dir}"/> <mkdir dir="${testoutput.dir}"/> <mkdir dir="${build.dir}"/> - <mkdir dir="${build.dir}/jaxen"/> - <mkdir dir="${build.dir}/jaxen-classes"/> <mkdir dir="${build15.dir}"/> <mkdir dir="${build.src}"/> <mkdir dir="${build.dest}"/> @@ -193,7 +188,7 @@ </target> - <target name="compile-core" depends="prepare, compile-jaxen" + <target name="compile-core" depends="prepare" description="Compile the source code"> <javac srcdir="${build.src}" destdir="${build.dest}" @@ -301,10 +296,6 @@ includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class" excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*"> - <fileset dir="${jaxen.dir}" - excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/jaxen/pattern/PriorityTest.class"> - </fileset> - <manifest> <attribute name="Built-By" value="${user.name}"/> <attribute name="Specification-Title" value="XOM"/> @@ -321,12 +312,6 @@ <attribute name="Implementation-Version" value="${version}"/> <attribute name="Implementation-Vendor" value="Elliotte Rusty Harold"/> </section> - <section name="org/jaxen/"> - <attribute name="Specification-Title" value="Jaxen XPath engine"/> - <attribute name="Implementation-Title" value="org.jaxen"/> - <attribute name="Implementation-Version" value="1.1b10"/> - <attribute name="Implementation-Vendor" value="CodeHaus"/> - </section> <section name="nu/xom/xslt/"> <attribute name="Sealed" value="true"/> <attribute name="Specification-Title" value="XOM XSLT interface"/> @@ -698,39 +683,6 @@ </jar> </target> - <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen"> - <javac srcdir="${build.dir}/jaxen/src/java/main" - destdir="${build.dir}/jaxen-classes" - debug="${debug}" - optimize="${optimize}" - deprecation="${deprecation}" - target="1.2" - source="1.3" - encoding="UTF-8" - includeAntRuntime="no" - excludes="org/jaxen/dom/** - org/jaxen/jdom/** - org/jaxen/dom4j/** - org/jaxen/pattern/** - org/jaxen/javabean/** - org/jaxen/xom/** - org/jaxen/function/xslt/** - org/jaxen/function/ext/** - org/jaxen/saxpath/expr/DefaultPredicated.java - org/jaxen/saxpath/helpers/DefaultXPathHandler.java - org/jaxen/util/StackedIterator.java - org/jaxen/util/XPath2XMLVisitor.java - org/jaxen/util/LinkedIterator.java - org/jaxen/util/SelfAxisIterator.java - "> - <classpath refid="compile.class.path"/> - </javac> - </target> - - <target name="get-jaxen" description="Download Jaxen source code" depends="prepare"> - <unzip src="jaxen-1.1-src.zip" dest="${build.dir}" /> - </target> - <target name="debug" depends="init" description="Print various Ant properties"> <echoproperties/> <java classname="org.apache.xalan.Version" fork="yes">