cziegeler 2002/08/19 02:54:56
Modified: . build.xml
lib jars.xml
Added: lib/optional commons-httpclient.jar
Removed: lib/core commons-httpclient.jar
Log:
Making httpclient optional
Revision Changes Path
1.256 +19 -1 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- build.xml 14 Aug 2002 12:26:13 -0000 1.255
+++ build.xml 19 Aug 2002 09:54:55 -0000 1.256
@@ -504,6 +504,10 @@
<available classpathref="classpath"
property="jxpath.present"
classname="org.apache.commons.jxpath.JXPathContext"/>
+
+ <available classpathref="classpath"
+ property="httpclient.present"
+ classname="org.apache.commons.httpclient.HttpClient"/>
</target>
<target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
@@ -770,11 +774,22 @@
</antcall>
</target>
+ <!-- Outputs a warning if org.apache.commons.httpclient.* classes are missing
during compilation -->
+ <target name="httpclient-warn" unless="httpclient.present"
depends="optional-tests">
+ <antcall target="op-warning">
+ <param name="thing" value="HTTPClient"/>
+ <param name="recovery"
+ value="Get the HTTP client package and place the jar in the lib/optional
dir"/>
+ <param name="message"
+ value="The HTTP client package is required for ...."/>
+ </antcall>
+ </target>
+
<!-- =================================================================== -->
<!-- Print out warnings for optional components -->
<!-- =================================================================== -->
<target name="optional-warnings"
- depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, php-warn,
naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, poi-warn,
commons-logging-warn, jxpath-warn">
+ depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, php-warn,
naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, poi-warn,
commons-logging-warn, jxpath-warn, httpclient-warn">
</target>
@@ -891,6 +906,9 @@
<exclude name="**/acting/**XMLForm**" unless="jxpath.present"/>
<exclude name="**/transformation/**XMLForm**"
unless="jxpath.present"/>
<exclude name="**/components/validation/**" unless="jxpath.present"/>
+
+ <exclude name="**/WebServiceProxyGenerator.java"
unless="httpclient.present"/>
+ <exclude name="**/xsp/SOAPHelper.java"
unless="httpclient.present"/>
<exclude name="**/MaybeUpload*.java"
unless="maybeupload.present"/>
<exclude name="**/http/RequestWrapper*.java"/>
1.32 +12 -13 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jars.xml 18 Aug 2002 08:18:23 -0000 1.31
+++ jars.xml 19 Aug 2002 09:54:56 -0000 1.32
@@ -40,18 +40,6 @@
<homepage>http://jakarta.apache.org/commons/collections.html</homepage>
</file>
<file>
- <title>Jakart Commons httpClient</title>
- <description>Although the java.net package provides basic support for accessing
- resources via HTTP, it doesn't provide the full flexibility or
- functionality needed by many applications. The Jakarta Commons HTTP Client
- component seeks to fill this void by providing an efficient, up-to-date,
- and feature-rich package implementing the client side of the most recent
- HTTP standards and recommendations.</description>
- <used-by>SOAP logicsheet, WebServiceProxyGenerator</used-by>
- <lib>core/commons-httpclient.jar</lib>
- <homepage>http://jakarta.apache.org/commons/httpclient/</homepage>
- </file>
- <file>
<title>Jakarta Regexp</title>
<description>Regexp is a Java Regular Expression package that was graciously
donated to the Apache Software Foundation by Jonathan Locke.</description>
@@ -142,7 +130,18 @@
<lib>optional/deli-0.6.5.jar</lib>
<homepage>http://devnet.hp.com/projects/deli/</homepage>
</file>
-
+ <file>
+ <title>Jakart Commons httpClient</title>
+ <description>Although the java.net package provides basic support for accessing
+ resources via HTTP, it doesn't provide the full flexibility or
+ functionality needed by many applications. The Jakarta Commons HTTP Client
+ component seeks to fill this void by providing an efficient, up-to-date,
+ and feature-rich package implementing the client side of the most recent
+ HTTP standards and recommendations.</description>
+ <used-by>SOAP logicsheet, WebServiceProxyGenerator</used-by>
+ <lib>optional/commons-httpclient.jar</lib>
+ <homepage>http://jakarta.apache.org/commons/httpclient/</homepage>
+ </file>
<file>
<title>iText XML to PDF/HTML/RTF converter (Renderer)</title>
<description>iText reads XML documents and turns them into PDFs</description>
1.1 xml-cocoon2/lib/optional/commons-httpclient.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
