cziegeler 2002/07/16 06:11:32
Modified: . build.xml
Removed: tools/src ClassAvailableTask.java
Log:
Changing build system to use again the original available task
Revision Changes Path
1.249 +126 -132 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- build.xml 16 Jul 2002 06:58:38 -0000 1.248
+++ build.xml 16 Jul 2002 13:11:32 -0000 1.249
@@ -360,25 +360,23 @@
<!-- =================================================================== -->
<target name="optional-tests" depends="init">
- <!-- A simple task to test for a class -->
- <taskdef name="class-available" classname="ClassAvailableTask"
- classpath="./tools/anttasks"/>
+ <echo message="Testing for optional components"/>
- <available property="jaxen.present" classname="org.jaxen.dom.XPath">
- <classpath refid="classpath"/>
- </available>
- <available property="ifx.driver.present"
classname="com.informix.jdbc.IfxResultSet">
- <classpath refid="classpath"/>
- </available>
-
-
- <class-available classpathref="classpath"
- property="poi.proper.present"
- classname="org.apache.poi.poifs.common.POIFSConstants"/>
+ <available classpathref="classpath"
+ property="jaxen.present"
+ classname="org.jaxen.dom.XPath"/>
+
+ <available classpathref="classpath"
+ property="ifx.driver.present"
+ classname="com.informix.jdbc.IfxResultSet"/>
+
+ <available classpathref="classpath"
+ property="poi.proper.present"
+ classname="org.apache.poi.poifs.common.POIFSConstants"/>
- <class-available classpathref="classpath"
- property="commons.logging.present"
- classname="org.apache.commons.logging.LogFactory"/>
+ <available classpathref="classpath"
+ property="commons.logging.present"
+ classname="org.apache.commons.logging.LogFactory"/>
<condition property="poi.present">
<and> <!-- with post 1.4.1 Ant use <isset property="poi.proper.present"/> -->
@@ -391,120 +389,117 @@
</and>
</condition>
- <class-available classpathref="classpath"
- property="pizza.present"
- classname="net.sf.pizzacompiler.compiler.Main"/>
-
- <class-available classpathref="classpath"
- property="xmldb.present"
- classname="org.xmldb.api.DatabaseManager"/>
-
- <class-available classpathref="classpath"
- property="xindice.present"
- classname="org.apache.xindice.client.xmldb.DatabaseImpl"/>
-
- <class-available classpathref="classpath"
- property="jfor.present"
- classname="org.jfor.jfor.converter.Converter"/>
-
- <class-available classpathref="classpath"
- property="servlet.present"
- classname="javax.servlet.http.HttpServlet"/>
-
- <class-available classpathref="classpath"
- property="servlet23.present"
- classname="javax.servlet.http.HttpServletRequestWrapper"/>
-
- <class-available classpathref="classpath"
- property="bsf.present"
- classname="com.ibm.bsf.BSFException"/>
-
- <class-available classpathref="classpath"
- property="rhino.compiler.present"
- classname="org.mozilla.javascript.tools.jsc.Main"/>
-
- <class-available classpathref="classpath"
- property="rhino.interpreter.present"
- classname="org.mozilla.javascript.Context"/>
-
- <class-available classpathref="classpath"
- property="python.present"
- classname="org.python.core.Py"/>
-
- <class-available classpathref="classpath"
- property="jstyle.present"
- classname="jstyle.JSFormatter"/>
-
- <class-available classpathref="classpath"
- property="xpath.present"
- classname="org.apache.xpath.XPathAPI"/>
-
- <class-available classpathref="classpath"
- property="deli.present"
- classname="com.hp.hpl.deli.Profile"/>
-
- <class-available classpathref="classpath"
- property="velocity.present"
- classname="org.apache.velocity.app.Velocity"/>
-
- <class-available classpathref="classpath"
- property="resolver.present"
- classname="org.apache.xml.resolver.Resolver"/>
-
- <available property="ora.driver.present"
- classname="oracle.jdbc.OracleResultSet">
- <classpath refid="classpath"/>
- </available>
-
- <available property="mail.present"
- classname="javax.mail.Session">
- <classpath refid="classpath"/>
- </available>
-
- <available property="weblogic.present"
- classname="weblogic.servlet.internal.ServletContextImpl">
- <classpath refid="classpath"/>
- </available>
-
- <available property="jdbc3.present" classname="java.sql.Savepoint">
- <classpath refid="classpath"/>
- </available>
-
- <class-available classpathref="classpath"
- property="php.present"
- classname="net.php.servlet"/>
-
- <class-available classpathref="classpath"
- property="naming.present"
- classname="javax.naming.Context"/>
-
- <class-available classpathref="classpath"
- property="svg.present"
- classname="org.apache.batik.transcoder.Transcoder"/>
-
- <class-available classpathref="classpath"
- property="fop.present"
- classname="org.apache.fop.apps.Driver"/>
-
- <class-available classpathref="classpath"
- property="tidy.present"
- classname="org.w3c.tidy.Tidy"/>
-
- <class-available classpathref="classpath"
- property="maybeupload.present"
- classname="uk.co.weft.maybeupload.MaybeUploadRequestWrapper"/>
-
- <class-available classpathref="classpath"
- property="lucene.present"
- classname="org.apache.lucene.search.Searcher"/>
-
- <class-available classpathref="classpath"
- property="hsqldb.present"
- classname="org.hsqldb.Server"/>
-
- <class-available classpathref="classpath"
- property="jisp.present"
- classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
+ <available classpathref="classpath"
+ property="pizza.present"
+ classname="net.sf.pizzacompiler.compiler.Main"/>
+
+ <available classpathref="classpath"
+ property="xmldb.present"
+ classname="org.xmldb.api.DatabaseManager"/>
+
+ <available classpathref="classpath"
+ property="xindice.present"
+ classname="org.apache.xindice.client.xmldb.DatabaseImpl"/>
+
+ <available classpathref="classpath"
+ property="jfor.present"
+ classname="org.jfor.jfor.converter.Converter"/>
+
+ <available classpathref="classpath"
+ property="servlet.present"
+ classname="javax.servlet.http.HttpServlet"/>
+
+ <available classpathref="classpath"
+ property="servlet23.present"
+ classname="javax.servlet.http.HttpServletRequestWrapper"/>
+
+ <available classpathref="classpath"
+ property="bsf.present"
+ classname="com.ibm.bsf.BSFException"/>
+
+ <available classpathref="classpath"
+ property="rhino.compiler.present"
+ classname="org.mozilla.javascript.tools.jsc.Main"/>
+
+ <available classpathref="classpath"
+ property="rhino.interpreter.present"
+ classname="org.mozilla.javascript.Context"/>
+
+ <available classpathref="classpath"
+ property="python.present"
+ classname="org.python.core.Py"/>
+
+ <available classpathref="classpath"
+ property="jstyle.present"
+ classname="jstyle.JSFormatter"/>
+
+ <available classpathref="classpath"
+ property="xpath.present"
+ classname="org.apache.xpath.XPathAPI"/>
+
+ <available classpathref="classpath"
+ property="deli.present"
+ classname="com.hp.hpl.deli.Profile"/>
+
+ <available classpathref="classpath"
+ property="velocity.present"
+ classname="org.apache.velocity.app.Velocity"/>
+
+ <available classpathref="classpath"
+ property="resolver.present"
+ classname="org.apache.xml.resolver.Resolver"/>
+
+ <available classpathref="classpath"
+ property="ora.driver.present"
+ classname="oracle.jdbc.OracleResultSet"/>
+
+ <available classpathref="classpath"
+ property="mail.present"
+ classname="javax.mail.Session"/>
+
+ <available classpathref="classpath"
+ property="weblogic.present"
+ classname="weblogic.servlet.internal.ServletContextImpl"/>
+
+ <available classpathref="classpath"
+ property="jdbc3.present"
+ classname="java.sql.Savepoint"/>
+
+ <available classpathref="classpath"
+ property="php.present"
+ classname="net.php.servlet"/>
+
+ <available classpathref="classpath"
+ property="naming.present"
+ classname="javax.naming.Context"/>
+
+ <available classpathref="classpath"
+ property="svg.present"
+ classname="org.apache.batik.transcoder.Transcoder"/>
+
+ <available classpathref="classpath"
+ property="fop.present"
+ classname="org.apache.fop.apps.Driver"/>
+
+ <available classpathref="classpath"
+ property="tidy.present"
+ classname="org.w3c.tidy.Tidy"/>
+
+ <available classpathref="classpath"
+ property="maybeupload.present"
+ classname="uk.co.weft.maybeupload.MaybeUploadRequestWrapper"/>
+
+ <available classpathref="classpath"
+ property="lucene.present"
+ classname="org.apache.lucene.search.Searcher"/>
+
+ <available classpathref="classpath"
+ property="hsqldb.present"
+ classname="org.hsqldb.Server"/>
+
+ <available classpathref="classpath"
+ property="jisp.present"
+ classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
</target>
<target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
@@ -1843,7 +1838,6 @@
<!-- =================================================================== -->
<target name="clean" depends="init" description="Cleans the build directories">
<delete dir="${build.dir}"/>
- <delete dir="${tools.dir}/anttasks"/>
</target>
<target name="distclean" depends="clean" description="Cleans everything to the
original state">
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
