vmassol 01/08/31 09:57:06
Modified: cactus/build build-servletapi.xml build.properties.sample
build.xml
cactus/conf/sample/build/servlet22 build.properties.sample
build.xml
cactus/conf/sample/build/servlet23 build.properties.sample
build.xml
cactus/conf/sample/build/share build-share.xml
Log:
added dependency on commons httpclient
Revision Changes Path
1.22 +11 -1 jakarta-commons/cactus/build/build-servletapi.xml
Index: build-servletapi.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build-servletapi.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build-servletapi.xml 2001/08/30 13:10:04 1.21
+++ build-servletapi.xml 2001/08/31 16:57:05 1.22
@@ -29,6 +29,11 @@
Required for compiling and running the unit
tests.
+ httpclient.jar [REQUIRED] The path to the Commons HttpClient
+ jar file. Required for performing all Cactus
+ HTTP requests. It is also required for
+ bundling it in the the distribution.
+
log4j.jar [REQUIRED] The path to the Log4j jar file.
Required for bundling it in the distribution.
@@ -284,6 +289,7 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement path="${java.class.path}"/>
</classpath>
@@ -373,6 +379,7 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${log4j.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement path="${java.class.path}"/>
</classpath>
@@ -543,6 +550,7 @@
<classpath>
<pathelement location="${servlet.jar}"/>
<pathelement location="${httpunit.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
<pathelement location="${out.classes.dir}"/>
<pathelement path="${junit.jar}"/>
<pathelement path="${java.class.path}"/>
@@ -550,7 +558,6 @@
<formatter type="plain" usefile="false"/>
- <test name="org.apache.commons.cactus.TestWebResponse"/>
<test name="org.apache.commons.cactus.TestAbstractTestCase"/>
</junit>
@@ -585,6 +592,7 @@
<arg value="-Dcactus.ant.jar=../../../${jar.ant.name}.jar"/>
<arg value="-Djunit.jar=${junit.jar}"/>
<arg value="-Dlog4j.jar=${log4j.jar}"/>
+ <arg value="-Dhttpclient.jar=${httpclient.jar}"/>
<!-- Pass all servlet engine properties -->
<arg line="${test22.args.list}"/>
@@ -618,6 +626,7 @@
<arg value="-Dcactus.ant.jar=../../../${jar.ant.name}.jar"/>
<arg value="-Djunit.jar=${junit.jar}"/>
<arg value="-Dlog4j.jar=${log4j.jar}"/>
+ <arg value="-Dhttpclient.jar=${httpclient.jar}"/>
<!-- Pass all servlet engine properties -->
<arg line="${test23.args.list}"/>
@@ -662,6 +671,7 @@
the ${out.lib.dir} directory -->
<copy todir="${out.lib.dir}" file="${log4j.jar}"/>
<copy todir="${out.lib.dir}" file="${junit.jar}"/>
+ <copy todir="${out.lib.dir}" file="${httpclient.jar}"/>
<zip zipfile="${dist.full.name}.zip">
<zipfileset dir="${out.dist.dir}"
1.11 +5 -0 jakarta-commons/cactus/build/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.properties.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties.sample 2001/08/30 13:10:04 1.10
+++ build.properties.sample 2001/08/31 16:57:05 1.11
@@ -8,6 +8,11 @@
# HttpUnit jar (needed for compiling and running the unit tests)
httpunit.jar=f:/applis/httpunit/lib/httpunit.jar
+# HTTP client class (because Sun's HttpURLConnection is broken and because
+# Sun's implementation is missing a lot of useful methods for handling
+# cookies, ...)
+httpclient.jar=f:/applis/apache-dev/jakarta-commons/httpclient/dist/commons-httpclient.jar
+
# Note: If you want to build only for a given servlet API, just comment the
# properties for the servlet jar that you don't want to build for. For
# example if you don't want to build the Servlet 2.2 API, comment
1.24 +5 -0 jakarta-commons/cactus/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 2001/08/30 13:10:04 1.23
+++ build.xml 2001/08/31 16:57:05 1.24
@@ -32,6 +32,11 @@
Required for compiling and running the unit
tests (used in build-servletapi.xml).
+ httpclient.jar [REQUIRED] The path to the Commons HttpClient
+ jar file. Required for performing all Cactus
+ HTTP requests. It is also required for
+ bundling it in the the distribution.
+
log4j.jar [REQUIRED] The path to the Log4j jar file.
Required for bundling it in the distribution
(used in build-servletapi.xml).
1.14 +3 -0
jakarta-commons/cactus/conf/sample/build/servlet22/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build.properties.sample,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.properties.sample 2001/08/30 13:10:04 1.13
+++ build.properties.sample 2001/08/31 16:57:05 1.14
@@ -12,6 +12,9 @@
# Junit jar (needed by Cactus)
junit.jar = f:/applis/jakarta-ant-1.4alpha/lib/junit.jar
+# Commons HttpClient class (needed by Cactus)
+httpclient.jar=../lib/commons-httpclient.jar
+
# You have 2 options. Define a property named "log4j.jar" and point it to the
# log4j jar file. In that case, Cactus will generate log files (named
# cactus_server.log and cactus_client.log). the second option is not to define
1.8 +2 -0 jakarta-commons/cactus/conf/sample/build/servlet22/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/servlet22/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/08/30 13:10:04 1.7
+++ build.xml 2001/08/31 16:57:05 1.8
@@ -37,6 +37,8 @@
log4j.jar [OPTIONAL] The path to the Log4j jar file.
Only needed if we want logs to be generated.
+ httpclient.jar [REQUIRED] The Commons HttpClient jar file
+
cactus.ant.jar [REQUIRED] The path to the Cactus custom Ant
tasks jar file
1.13 +3 -0
jakarta-commons/cactus/conf/sample/build/servlet23/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file:
/home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build.properties.sample,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties.sample 2001/08/30 13:10:04 1.12
+++ build.properties.sample 2001/08/31 16:57:05 1.13
@@ -12,6 +12,9 @@
# Junit jar (needed by Cactus)
junit.jar = f:/applis/jakarta-ant-1.4alpha/lib/junit.jar
+# Commons HttpClient class (needed by Cactus)
+httpclient.jar=../lib/commons-httpclient.jar
+
# You have 2 options. Define a property named "log4j.jar" and point it to the
# log4j jar file. In that case, Cactus will generate log files (named
# cactus_server.log and cactus_client.log). the second option is not to define
1.6 +2 -0 jakarta-commons/cactus/conf/sample/build/servlet23/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/servlet23/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/08/30 13:10:04 1.5
+++ build.xml 2001/08/31 16:57:05 1.6
@@ -34,6 +34,8 @@
log4j.jar [OPTIONAL] The path to the Log4j jar file.
Only needed if we want logs to be generated.
+ httpclient.jar [REQUIRED] The Commons HttpClient jar file
+
cactus.ant.jar [REQUIRED] The path to the Cactus custom Ant
tasks jar file
1.7 +3 -0 jakarta-commons/cactus/conf/sample/build/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/conf/sample/build/share/build-share.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-share.xml 2001/08/30 13:10:05 1.6
+++ build-share.xml 2001/08/31 16:57:06 1.7
@@ -126,6 +126,7 @@
<echo message="cactus.ant.jar = ${cactus.ant.jar}"/>
<echo message="servlet.jar = ${servlet.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
+ <echo message="httpclient.jar = ${httpclient.jar}"/>
<!-- Filters -->
<filter token="version" value="${project.version}"/>
@@ -382,6 +383,7 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
<pathelement location="${out.classes.dir}"/>
<pathelement path="${java.class.path}"/>
</classpath>
@@ -429,6 +431,7 @@
<!-- Gather libraries in a place where they can be copied in the
war -->
<copy tofile="${out.lib.dir}/junit.jar" file="${junit.jar}"/>
+ <copy tofile="${out.lib.dir}/commons-httpclient.jar"
file="${httpclient.jar}"/>
<copy tofile="${out.lib.dir}[EMAIL PROTECTED]@.jar"
file="${cactus.jar}"/>
<!-- Make sure the directory for the war exist -->
