mrglavas 2004/01/22 15:23:14
Modified: java build.xml
Log:
Adding the resolver to the build.
Revision Changes Path
1.161 +58 -39 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- build.xml 5 Jan 2004 14:54:46 -0000 1.160
+++ build.xml 22 Jan 2004 23:23:14 -0000 1.161
@@ -43,6 +43,7 @@
<property name='jar.parser' value='xercesImpl.jar'/>
<property name='jar.samples' value='xercesSamples.jar'/>
<property name='jar.dv' value='xercesDV.jar'/>
+ <property name='jar.resolver' value='resolver.jar'/>
<property name='default.parser.config.name' value='XML11Configuration'/>
<property name='default.parser.config.qualified'
value='org.apache.xerces.parsers.XML11Configuration'/>
@@ -219,7 +220,7 @@
<xjavac srcdir="${build.src}"
destdir="${build.dest}"
- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}"
@@ -470,6 +471,7 @@
<copy file="LICENSE" tofile="${distsrc.dir}/LICENSE"/>
<copy file="LICENSE-DOM.html" tofile="${distsrc.dir}/LICENSE-DOM.html"/>
<copy file="LICENSE-SAX.html" tofile="${distsrc.dir}/LICENSE-SAX.html"/>
+ <copy file="LICENSE.resolver.txt" tofile="${distsrc.dir}/LICENSE.resolver.txt"/>
<copy file="README" tofile="${distsrc.dir}/README"/>
<copy file="Readme.html" tofile="${distsrc.dir}/Readme.html"/>
<copy file="STATUS" tofile="${distsrc.dir}/STATUS"/>
@@ -563,6 +565,7 @@
<copy file="LICENSE" tofile="${distbin.dir}/LICENSE"/>
<copy file="LICENSE-DOM.html" tofile="${distbin.dir}/LICENSE-DOM.html"/>
<copy file="LICENSE-SAX.html" tofile="${distbin.dir}/LICENSE-SAX.html"/>
+ <copy file="LICENSE.resolver.txt" tofile="${distbin.dir}/LICENSE.resolver.txt"/>
<copy file="Readme.html" tofile="${distbin.dir}/Readme.html"/>
<copy file="${build.dir}/${jar.samples}"
tofile="${distbin.dir}/${jar.samples}"/>
@@ -585,6 +588,8 @@
<!-- support xml-commons APIs -->
<copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/>
<copy file="${tools.dir}/${jar.apis}"
tofile="${distbin.dir}/${deprecatedjar.apis}"/>
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${distbin.dir}/${jar.resolver}"/>
<zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip"
basedir="${build.dir}"
@@ -606,6 +611,9 @@
<!-- =================================================================== -->
<target name="deprecated-bin" depends="pack-bin-common, deprecatedjars">
<copy file="${build.dir}/${deprecatedjar.parser}"
tofile="${distbin.dir}/${deprecatedjar.parser}"/>
+
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${distbin.dir}/${jar.resolver}"/>
<zip zipfile="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.zip"
basedir="${build.dir}"
@@ -627,38 +635,38 @@
<!-- =================================================================== -->
<target name="test" depends="tests">
<echo message="Performing sanity test for ${parser.Name} ${parser.Version} ..."
/>
- <echo message="Using
classpath='${tools.dir}/${jar.apis}:${build.dir}/classes'" />
+ <echo message="Using
classpath='${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes'"
/>
<echo message="Running sax.Counter ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="sax.Counter"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running sax.Writer ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="sax.Writer"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running dom.Counter ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.Counter"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running dom.Writer ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.Writer"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running thread.Test dom" />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="thread.Test"
failOnError="yes">
<arg value="-dom"/>
@@ -671,7 +679,7 @@
</java>
<echo message="Running thread.Test sax" />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="thread.Test"
failOnError="yes">
<arg value="-threads"/>
@@ -687,45 +695,45 @@
<!--
<echo message="Running DOMFilter ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.DOMFilter"
args="-p dom.wrappers.DOMParser ${data.dir}/personal.xml"/>
-->
<!-- The following are samples but not command-line applications.
<echo message="Running IteratorView ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.traversal.IteratorView"
failOnError="yes"
args="${data.dir}/personal.xml"/>
<echo message="Running TreeWalkerView ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.traversal.TreeWalkerView"
failOnError="yes"
args="${data.dir}/personal.xml"/>
<echo message="Running TreeViewer ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.TreeViewer"
failOnError="yes"
args="${data.dir}/personal.xml"/>
-->
<echo message="Running dom.DTest ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.DTest"
failOnError="yes">
</java>
<echo message="Running dom.mem.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.mem.Test"
failOnError="yes">
</java>
<echo message="Running dom.range.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.range.Test"
failOnError="yes">
<arg value="all"/>
@@ -733,13 +741,13 @@
<echo message="Running dom.ids.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.ids.Test"
failOnError="yes">
</java>
<echo message="Running dom.serialization.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.serialization.Test"
failOnError="yes">
<arg value="${data.dir}/personal-schema.xml"/>
@@ -747,19 +755,19 @@
</java>
<echo message="Running schema.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="schema.Test"
failOnError="yes">
</java>
<echo message="Running jaxp.PropertyTest ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="jaxp.PropertyTest"
failOnError="yes">
</java>
<echo message="Running jaxp.JAXPSpecTest ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="jaxp.JAXPSpecTest"
failOnError="yes">
<arg value="testSchemaLanguageSAX"/>
@@ -769,7 +777,7 @@
</java>
<echo message="Running xinclude.Test ..." />
<java fork="yes"
- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes"
+
classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="xinclude.Test"
failOnError="yes">
</java>
@@ -779,6 +787,8 @@
<!-- Builds both deprecated xerces and sample jar files -->
<!-- =================================================================== -->
<target name="deprecatedjars" depends="deprecatedjar, sampjar">
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${build.dir}/${jar.resolver}"/>
</target>
<!-- =================================================================== -->
@@ -788,6 +798,8 @@
<!-- support xml-commons APIs -->
<copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/>
<copy file="${tools.dir}/${jar.apis}"
tofile="${build.dir}/${deprecatedjar.apis}"/>
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${build.dir}/${jar.resolver}"/>
</target>
<!-- =================================================================== -->
@@ -844,7 +856,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
includeAntRuntime="false"
- includeJavaRuntime="true"/>
+ includeJavaRuntime="true"
+ classpath="${tools.dir}/${jar.resolver}"/>
</target>
@@ -954,6 +967,10 @@
<!-- support xml-commons APIs -->
<copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/>
<copy file="${tools.dir}/${jar.apis}"
tofile="${build.dir}/${deprecatedjar.apis}"/>
+
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${build.dir}/${jar.resolver}"/>
+
</target>
<!-- =================================================================== -->
@@ -1209,7 +1226,7 @@
optimize="${optimize}"
includeAntRuntime="false"
includeJavaRuntime="true"
- classpath="${tools.dir}/${jar.apis}"/>
+ classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"/>
</target>
<!-- =================================================================== -->
@@ -1277,28 +1294,28 @@
<echo message="Using classpath='${build.dir}/classes'" />
<echo message="Running sax.Counter ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="sax.Counter"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running sax.Writer ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="sax.Writer"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running dom.Counter ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.Counter"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
</java>
<echo message="Running dom.Writer ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.Writer"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
@@ -1306,39 +1323,39 @@
<echo message="Running QueryXS ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="xs.QueryXS"
args="${data.dir}/personal.xsd"/>
<!-- The following are samples but not command-line applications.
<echo message="Running IteratorView ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.traversal.IteratorView"
failOnError="yes"
args="${data.dir}/personal.xml"/>
<echo message="Running TreeWalkerView ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.traversal.TreeWalkerView"
failOnError="yes"
args="${data.dir}/personal.xml"/>
<echo message="Running TreeViewer ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.TreeViewer"
failOnError="yes"
args="${data.dir}/personal.xml"/>
-->
<echo message="Running dom.mem.Test ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.mem.Test"
failOnError="yes">
</java>
<echo message="Running thread.Test ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="thread.Test"
failOnError="yes">
<arg value="-dom"/>
@@ -1352,32 +1369,32 @@
<echo message="Running dom.ids.Test ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.ids.Test"
failOnError="yes">
</java>
<echo message="Running dom.DTest ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.DTest"
failOnError="yes">
</java>
<echo message="Running dom.serialization.Test ..." />
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.serialization.Test"
failOnError="yes">
<arg value="${data.dir}/personal.xml"/>
<arg value="out.xml"/>
</java>
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.registry.Test"
failOnError="yes">
</java>
<java fork="yes"
- classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes"
+
classpath="${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.resolver}:${build.dir}/classes"
classname="dom.dom3.Test"
failOnError="yes">
</java>
@@ -1422,6 +1439,8 @@
<!-- Builds xercesImpl, xmlParserAPIs, and sample jars with DOM Level 3 -->
<!-- =================================================================== -->
<target name="jars-dom3" depends="jar-dom3, apijar-dom3, sampjar-dom3">
+ <!-- support xml-commons resolver -->
+ <copy file="${tools.dir}/${jar.resolver}"
tofile="${build.dir}/${jar.resolver}"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
