[patch] build.xml patch

xom-1.2.6.patch (text/plain), 2.80 KB, created by Kenneth Prugh (RETIRED) on 2011-03-09 04:32:22 UTC

diff --git a/build.xml b/build.xml
index 4b58085..3b9c63c 100644
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,6 @@ [e-mail]. Please include the word "XOM" in the
 subject line. The XOM home page is http://www.xom.nu/
 -->
 <project name="XOM" default="help" basedir=".">
-
     <description>
       Build XOM
     </description>
@@ -42,7 +41,7 @@ subject line. The XOM home page is http://www.xom.nu/
   	<!-- Can I have an if statement here to check if ${microversion} is an empty string before adding a period? 
   	     Problem is release version doesn't get a version qualifier. -->
     <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.osgi"/>
-    <property name="jaxenversion" value="1.1.3"/>
+    <property name="jaxenversion" value="1.1.1"/>
     <!-- <property name="bundleversion" value="${majorversion}.${minorversion}.${microversion}.${versionqualifier}.osgi"/> -->
     <property name="year"    value="2010"/>
 
@@ -71,7 +70,7 @@ subject line. The XOM home page is http://www.xom.nu/
     <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"/>
+    <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
     <property name="xslt.jar"       value="${lib.dir}/xalan.jar"/>
     <property name="serializer.jar" value="${lib.dir}/serializer.jar"/>
     <property name="tagsoup.jar"    value="${lib2.dir}/tagsoup-1.2.jar"/>
@@ -226,7 +225,7 @@ XOM Build file
            encoding="UTF-8"
     	   fork="true"
            includeAntRuntime="false"
-           excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
        <classpath refid="compile.class.path"/>
     </javac>
     <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
@@ -323,7 +322,7 @@ XOM Build file
 
   <target name="jar" depends="compile" description="Create xom.jar">
   	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
+  	        classpath="${lib.dir}/jarjar.jar"/>
     <jarjar jarfile="${build.dir}/${name}-${version}.jar"
          basedir="${build.dest}"
          index="no"
@@ -862,8 +861,8 @@ location="${dist.dir}/maven1/xom-maven-${version}.jar" />
   </target>
 
 
-  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
-    <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
+  <target name="compile-jaxen" description="Compile Jaxen">
+    <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main"
            destdir="${build.dir}/jaxen-classes"
            debug="${debug}"
            optimize="${optimize}"