vmassol 01/08/30 06:10:05
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:
removed dependency on commons-httpclient for the time being until after release 1.2
Revision Changes Path
1.21 +0 -11 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build-servletapi.xml 2001/08/25 11:14:10 1.20
+++ build-servletapi.xml 2001/08/30 13:10:04 1.21
@@ -29,11 +29,6 @@
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.
@@ -289,7 +284,6 @@
<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>
@@ -379,7 +373,6 @@
<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>
@@ -550,7 +543,6 @@
<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}"/>
@@ -592,7 +584,6 @@
<arg value="-Dcactus.jar=../lib/${jar.name}.jar"/>
<arg value="-Dcactus.ant.jar=../../../${jar.ant.name}.jar"/>
<arg value="-Djunit.jar=${junit.jar}"/>
- <arg value="-Dhttpclient.jar=${httpclient.jar}"/>
<arg value="-Dlog4j.jar=${log4j.jar}"/>
<!-- Pass all servlet engine properties -->
@@ -626,7 +617,6 @@
<arg value="-Dcactus.jar=../lib/${jar.name}.jar"/>
<arg value="-Dcactus.ant.jar=../../../${jar.ant.name}.jar"/>
<arg value="-Djunit.jar=${junit.jar}"/>
- <arg value="-Dhttpclient.jar=${httpclient.jar}"/>
<arg value="-Dlog4j.jar=${log4j.jar}"/>
<!-- Pass all servlet engine properties -->
@@ -672,7 +662,6 @@
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.10 +0 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties.sample 2001/08/24 16:00:23 1.9
+++ build.properties.sample 2001/08/30 13:10:04 1.10
@@ -8,11 +8,6 @@
# HttpUnit jar (needed for compiling and running the unit tests)
httpunit.jar=f:/applis/httpunit/lib/httpunit.jar
-# Commons HttpClient 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.23 +0 -5 jakarta-commons/cactus/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/cactus/build/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2001/08/24 16:01:19 1.22
+++ build.xml 2001/08/30 13:10:04 1.23
@@ -32,11 +32,6 @@
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.13 +0 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties.sample 2001/08/24 16:02:54 1.12
+++ build.properties.sample 2001/08/30 13:10:04 1.13
@@ -12,9 +12,6 @@
# 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.7 +0 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/08/24 16:03:21 1.6
+++ build.xml 2001/08/30 13:10:04 1.7
@@ -37,8 +37,6 @@
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.12 +0 -3
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties.sample 2001/08/24 16:03:34 1.11
+++ build.properties.sample 2001/08/30 13:10:04 1.12
@@ -12,9 +12,6 @@
# 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.5 +0 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/08/24 16:03:34 1.4
+++ build.xml 2001/08/30 13:10:04 1.5
@@ -34,8 +34,6 @@
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.6 +0 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-share.xml 2001/08/24 16:04:41 1.5
+++ build-share.xml 2001/08/30 13:10:05 1.6
@@ -126,7 +126,6 @@
<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}"/>
@@ -375,8 +374,6 @@
<junit printsummary="yes" haltonfailure="yes" haltonerror="yes" fork="yes">
- <jvmarg value="-Djava.protocol.handler.pkgs=HTTPClient"/>
-
<classpath>
<pathelement location="${servlet.jar}"/>
@@ -385,7 +382,6 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${junit.jar}"/>
- <pathelement location="${httpclient.jar}"/>
<pathelement location="${out.classes.dir}"/>
<pathelement path="${java.class.path}"/>
</classpath>
@@ -433,7 +429,6 @@
<!-- 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 -->
