[patch] build.xml patch

xom-1.2.6.patch (text/plain), 5.53 KB, created by Kenneth Prugh (RETIRED) on 2011-02-13 07:05:39 UTC

=== modified file 'build.xml'
--- build.xml	2011-02-12 20:49:17 +0000
+++ build.xml	2011-02-13 06:51:27 +0000
@@ -68,14 +68,15 @@
     <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="jaxen.jar"       value="${lib.dir}/jaxen.jar"/>
 
     <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"/>
     <property name="junit.jar"      value="${lib.dir}/junit.jar"/>
+	<property name="ant-junit.jar"	value="${lib.dir}/ant-junit.jar"/>
     <property name="xom.jar"        value="${build.dir}/${name}-${version}.jar"/>
     <property name="xom-core"       value="${build.dest}"/>
     
@@ -107,7 +108,7 @@
       <pathelement location="${xml-apis.jar}"/>
       <pathelement location="${parser.jar}"/>
       <pathelement location="${junit.jar}"/>
-      <pathelement location="${jaxen.dir}"/>
+      <pathelement location="${jaxen.jar}"/>
       <pathelement location="${servlet.jar}"/>
     </path>
 
@@ -115,7 +116,7 @@
       <pathelement location="${xml-apis.jar}"/>
       <pathelement location="${parser.jar}"/>
       <pathelement location="${xom-core}"/>
-      <pathelement location="${jaxen.dir}"/>
+      <pathelement location="${jaxen.jar}"/>
       <pathelement location="${xslt.jar}"/>
       <pathelement location="${serializer.jar}"/>
     </path>
@@ -123,6 +124,7 @@
     <path id="test.class.path">
       <path refid="run.class.path"/>
       <pathelement location="${junit.jar}"/>
+      <pathelement location="${ant-junit.jar}"/>
       <pathelement location="${saxon6.jar}"/>
       <pathelement location="${saxon7.jar}"/>
       <pathelement location="${gnujaxp.jar}"/>
@@ -214,7 +216,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}"
@@ -226,7 +228,7 @@
            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/* nu/xom/samples/inner/* nu/xom/tests/*">
        <classpath refid="compile.class.path"/>
     </javac>
     <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/>
@@ -322,21 +324,13 @@
 
 
   <target name="jar" depends="compile" description="Create xom.jar">
-  	<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-  	        classpath="${lib.dir}/jarjar-1.0.jar"/>
-    <jarjar jarfile="${build.dir}/${name}-${version}.jar"
+    <jar jarfile="${build.dir}/${name}-${version}.jar"
          basedir="${build.dest}"
          index="no"
 		 compress="yes"
          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>
-    
-      <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
-
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
         <attribute name="Specification-Title"    value="XOM"/>
@@ -368,12 +362,6 @@
           <attribute name="Implementation-Version" value="${version}"/>
           <attribute name="Implementation-Vendor"  value="Elliotte Rusty Harold"/>          
        </section>
-        <section name="nu/xom/jaxen/">
-          <attribute name="Specification-Title"    value="Jaxen XPath engine"/>
-          <attribute name="Implementation-Title"   value="org.jaxen"/>
-          <attribute name="Implementation-Version" value="${jaxenversion}"/>
-          <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"/>
@@ -395,7 +383,7 @@
           <attribute name="Implementation-Title"  value="nu.xom.canonical"/>
         </section>
       </manifest>
-    </jarjar>
+    </jar>
   	
   	<!-- Put a copy in the dist dir too, because I never remember to upload 
   	     the jar from the build directory. -->
@@ -524,7 +512,7 @@
     </javac>
     
     <java classname="nu.xom.tools.XHTMLJavaDoc" fork="yes"> 
-      <jvmarg value="-Xbootclasspath/p:lib/dtd-xercesImpl.jar:lib/xml-apis.jar:lib/xalan.jar"/> 
+      <jvmarg value="-Xbootclasspath/p:lib/xercesImpl.jar:lib/xml-apis.jar:lib/xalan.jar"/> 
       <classpath refid="doc.class.path" />
       <arg value="build/apidocs"/> 
     </java>