You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by je...@apache.org on 2002/04/02 12:56:13 UTC
cvs commit: jakarta-avalon-excalibur/all ant.properties.sample build.xml default.properties
jefft 02/04/02 02:56:13
Modified: all Tag: depchecking ant.properties.sample build.xml
default.properties
Log:
Add xml-apis.jar to the classpath (thanks Carsten), and more robust checking
Revision Changes Path
No revision
No revision
1.8.2.2 +23 -3 jakarta-avalon-excalibur/all/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/ant.properties.sample,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- ant.properties.sample 1 Apr 2002 08:57:02 -0000 1.8.2.1
+++ ant.properties.sample 2 Apr 2002 10:56:13 -0000 1.8.2.2
@@ -58,7 +58,27 @@
excalibur-concurrent.home=../concurrent/build/lib
excalibur-concurrent.jar=${excalibur-concurrent.home}/excalibur-concurrent-1.0.jar
-# ----- Xerces -----
-xerces.home=${base.path}/jakarta-avalon/tools/lib/
-xerces.jar=${xerces.home}/xerces-1.4.4.jar
+
+# The following jars are all present in the jakarta-avalon module, so if you
+# have it, set the avalon.home property correctly and it should all work.
+# If you don't have jakarta-avalon, you'll have to configure each property
+# individually
+
+avalon.home=${basedir}/../../jakarta-avalon
+tools.dir = ${avalon.home}/tools
+
+logkit.jar = ${tools.dir}/ext/logkit.jar
+xml-apis.jar = ${tools.dir}/lib/xml-apis.jar
+xerces.jar = ${tools.dir}/lib/xerces-1.4.4.jar
+
+# The following are needed for the documentation system, but not for building
+# the jar
+xalan.jar = ${tools.dir}/lib/xalan-2.2.0-D13.jar
+bsf.jar = ${tools.dir}/lib/bsf.jar
+junit.jar = ${tools.dir}/lib/junit-3.7.jar
+junitperf.jar = ${tools.dir}/lib/junitperf.jar
+tools.jar = ${java.home}/../lib/tools.jar
+jaxen.jar = ${lib.dir}/jaxen-full.jar
+saxpath.jar = ${lib.dir}/saxpath.jar
+
1.122.2.6 +12 -5 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.122.2.5
retrieving revision 1.122.2.6
diff -u -r1.122.2.5 -r1.122.2.6
--- build.xml 2 Apr 2002 10:32:51 -0000 1.122.2.5
+++ build.xml 2 Apr 2002 10:56:13 -0000 1.122.2.6
@@ -39,9 +39,9 @@
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${j2ee.jar}"/>
<pathelement location="${logkit.jar}"/>
- <pathelement location="${xalan.jar}"/>
<pathelement location="${bsf.jar}"/>
<pathelement location="${xerces.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${junitperf.jar}"/>
<pathelement location="${jaxen.jar}"/>
@@ -59,6 +59,7 @@
<path id="tools.class.path">
<pathelement location="${xerces.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${tools.jar}"/>
<fileset dir="${tools.dir}/lib">
@@ -159,10 +160,6 @@
<property name="class" value="junit.framework.Test"/>
<property name="classpath" value="${cp}"/>
</ant>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
- <property name="name" value="xml-apis.jar"/>
- <property name="class" value="javax.xml.parsers.DocumentBuilder"/>
- </ant>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
<property name="name" value="excalibur-collections.jar"/>
<property name="path" value="${excalibur-collections.jar}"/>
@@ -189,6 +186,16 @@
<!--
<property name="proj.home" value="${basedir}/../../jakarta-avalon"/>
-->
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
+ <property name="name" value="logkit.jar"/>
+ <property name="class" value="org.apache.log.Logger"/>
+ <property name="classpath" value="${cp}"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
+ <property name="name" value="xml-apis.jar"/>
+ <property name="class" value="javax.xml.parsers.SAXParser"/>
+ <property name="classpath" value="${cp}"/>
</ant>
</target>
1.1.2.3 +1 -0 jakarta-avalon-excalibur/all/Attic/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/Attic/default.properties,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- default.properties 1 Apr 2002 08:57:02 -0000 1.1.2.2
+++ default.properties 2 Apr 2002 10:56:13 -0000 1.1.2.3
@@ -50,6 +50,7 @@
tools.dir = ../../jakarta-avalon/tools
logkit.jar = ${tools.dir}/ext/logkit.jar
+xml-apis.jar = ${tools.dir}/lib/xml-apis.jar
xerces.jar = ${tools.dir}/lib/xerces-1.4.4.jar
xalan.jar = ${tools.dir}/lib/xalan-2.2.0-D13.jar
bsf.jar = ${tools.dir}/lib/bsf.jar
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>