libjibx1.1-java (1.1.6a-3) 01_build_xml.patch

Summary

 build/build.xml |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

    
download this patch

Patch contents

Index: build/build.xml
===================================================================
--- a/build/build.xml.orig	2010-02-02 01:32:15.000000000 +0100
+++ b/build/build.xml	2010-02-02 02:02:11.000000000 +0100
@@ -60,19 +60,22 @@
     <pathelement location="${binddest}"/>
     <pathelement location="${rundest}"/>
     <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,jibx*.jar"/>
+    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
   </path>
   <path id="binding-classpath">
     <pathelement location="${binddest}"/>
     <pathelement location="${rundest}"/>
     <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,jibx*.jar"/>
+    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
   </path>
   <path id="javadoc-classpath">
     <fileset dir="${lib}" includes="*.jar"/>
+    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
   </path>
   
   <!-- Optional components -->
-  <available property="dom4j" file="${lib}/dom4j.jar"/>
-  <available property="jdom" file="${lib}/jdom.jar"/>
+  <available property="dom4j" file="/usr/share/java/dom4j.jar"/>
+  <available property="jdom" file="/usr/share/java/jdom1.jar"/>
 
   <!-- Delete binding class files -->
   <target name="clean-bind">
@@ -143,6 +146,7 @@
       <fileset dir="${lib}" includes="*.jar" excludes="jibx*.jar"/>
       <fileset dir="${lib}"
           includes="${bindname}.jar,${runname}.jar,${extrasname}.jar"/>
+      <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
     </path>
   </target>
   
@@ -271,6 +275,7 @@
     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
       <classpath>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
       </classpath>
     </taskdef>
     <bind>
@@ -307,6 +312,7 @@
       <classpath>
         <pathelement path="${testdest}"/>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
       </classpath>
       
       <!-- This is the full set of crossbar tests with most combinations included -->
@@ -490,6 +496,7 @@
     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
       <classpath>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
       </classpath>
     </taskdef>
     <bind load="true">
@@ -917,6 +924,7 @@
     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
       <classpath>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
       </classpath>
     </taskdef>
     <bind>
@@ -962,6 +970,7 @@
     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
       <classpath>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
       </classpath>
     </taskdef>
     <bind>
@@ -1048,6 +1057,7 @@
     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
       <classpath>
         <fileset dir="${lib}" includes="*.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
       </classpath>
     </taskdef>
     <bind>
@@ -1189,6 +1199,7 @@
       deprecation="on">
       <classpath>
         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${extrasname}.jar,org.eclipse.*.jar,jibx-genbinding.jar,jibx-genschema.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
       </classpath>
     </javac>
     <jar jarfile="${lib}/jibx-genbinding.jar" basedir="${toolsdest}">
@@ -1211,6 +1222,7 @@
       deprecation="on">
       <classpath>
         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${extrasname}.jar,org.eclipse.*.jar,jibx-genbinding.jar,jibx-genschema.jar"/>
+        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
       </classpath>
     </javac>
     <jar jarfile="${lib}/jibx-genschema.jar" basedir="${toolsdest}">