You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/03/25 20:31:57 UTC
cvs commit: jakarta-cactus/integration/ant build.xml build.properties.sample
vmassol 2003/03/25 11:31:57
Modified: . build.properties.sample
integration/ant/src/scripts/share build-share.xml
integration/ant build.xml build.properties.sample
Log:
Added new jars required by HttpUnit in the Ant Integration module.
Revision Changes Path
1.48 +13 -4 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- build.properties.sample 15 Mar 2003 20:51:12 -0000 1.47
+++ build.properties.sample 25 Mar 2003 19:31:57 -0000 1.48
@@ -43,9 +43,6 @@
# The location of the Commons Httpclient jar
commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-alpha3.jar
-# The location of the Httpunit jar
-httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.jar
-
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
@@ -57,6 +54,18 @@
# The location of the JSTL jar
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
+
+# The location of the Httpunit jar
+httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.jar
+
+# Neko HTML (required by HttpUnit)
+nekohtml.jar = ${lib.repo}/nekohtml/jars/nekohtml-0.7.4.jar
+
+# Xerces (required by HttpUnit)
+xerces.jar = ${lib.repo}/xerces/jars/xercesImpl-2.3.0.jar
+
+# XML Parsers API (required by HttpUnit)
+xmlapis.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.2.1.jar
# -----------------------------------------------------------------------------
# Mandatory properties for the Eclipse plugin only
1.11 +12 -0 jakarta-cactus/integration/ant/src/scripts/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-share.xml 23 Mar 2003 21:29:38 -0000 1.10
+++ build-share.xml 25 Mar 2003 19:31:57 -0000 1.11
@@ -70,6 +70,12 @@
<property name="cactus.commons.httpclient.jar"
value="${cactus.lib.client.dir}/@commons.httpclient.jar.name@"/>
+ <property name="cactus.nekohtml.jar"
+ value="${cactus.lib.client.dir}/@nekohtml.jar.name@"/>
+ <property name="cactus.xerces.jar"
+ value="${cactus.lib.client.dir}/@xerces.jar.name@"/>
+ <property name="cactus.xmlapis.jar"
+ value="${cactus.lib.client.dir}/@xmlapis.jar.name@"/>
<!--
========================================================================
@@ -254,6 +260,9 @@
<pathelement location="${cactus.junit.jar}"/>
<pathelement location="${cactus.commons.httpclient.jar}"/>
<pathelement location="${cactus.httpunit.jar}"/>
+ <pathelement location="${cactus.nekohtml.jar}"/>
+ <pathelement location="${cactus.xerces.jar}"/>
+ <pathelement location="${cactus.xmlapis.jar}"/>
<path refid="cactus.classpath"/>
</classpath>
@@ -299,6 +308,9 @@
<pathelement location="${cactus.junit.jar}"/>
<pathelement location="${cactus.commons.httpclient.jar}"/>
<pathelement location="${cactus.httpunit.jar}"/>
+ <pathelement location="${cactus.nekohtml.jar}"/>
+ <pathelement location="${cactus.xerces.jar}"/>
+ <pathelement location="${cactus.xmlapis.jar}"/>
<path refid="cactus.classpath"/>
</classpath>
1.11 +13 -2 jakarta-cactus/integration/ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 19 Mar 2003 16:34:31 -0000 1.10
+++ build.xml 25 Mar 2003 19:31:57 -0000 1.11
@@ -93,8 +93,11 @@
<property name="commons.logging.jar" isfile="true"/>
<property name="commons.httpclient.jar" isfile="true"/>
<property name="junit.jar" isfile="true"/>
- <property name="httpunit.jar" isfile="true"/>
<property name="log4j.jar" isfile="true"/>
+ <property name="httpunit.jar" isfile="true"/>
+ <property name="nekohtml.jar" isfile="true"/>
+ <property name="xerces.jar" isfile="true"/>
+ <property name="xmlapis.jar" isfile="true"/>
</checkProperty>
</target>
@@ -270,11 +273,13 @@
<!-- Gather all server side Cactus jars -->
<!-- The directory needs a file because it is otherwise pruned by the Eclipse update feature -->
<touch file="${target.integration.lib.server.dir}/KEEPIT"/>
- <!-- (None at the moment) -->
<!-- Gather all client side Cactus jars -->
<copy tofile="${target.integration.lib.client.dir}/${cactus.antintegration.jar.name}-${project.version}.jar"
file="${target.dir}/${cactus.antintegration.jar.name}.jar"/>
+ <copy todir="${target.integration.lib.client.dir}" file="${nekohtml.jar}"/>
+ <copy todir="${target.integration.lib.client.dir}" file="${xerces.jar}"/>
+ <copy todir="${target.integration.lib.client.dir}" file="${xmlapis.jar}"/>
<!-- Note: ATM we copy the servlet jar (and not the J2EE one). The
reasons are that ATM we only need the servlet API and that the
@@ -311,6 +316,12 @@
<filter token="commons.httpclient.jar.name" value="${commons.httpclient.jar.name}"/>
<basename property="httpunit.jar.name" file="${httpunit.jar}"/>
<filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
+ <basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
+ <filter token="nekohtml.jar.name" value="${nekohtml.jar.name}"/>
+ <basename property="xerces.jar.name" file="${xerces.jar}"/>
+ <filter token="xerces.jar.name" value="${xerces.jar.name}"/>
+ <basename property="xmlapis.jar.name" file="${xmlapis.jar}"/>
+ <filter token="xmlapis.jar.name" value="${xmlapis.jar.name}"/>
<copy todir="${target.integration.script.dir}" filtering="on">
<fileset dir="${src.script.dir}/share"/>
1.4 +12 -3 jakarta-cactus/integration/ant/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/build.properties.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties.sample 14 Mar 2003 15:14:16 -0000 1.3
+++ build.properties.sample 25 Mar 2003 19:31:57 -0000 1.4
@@ -41,14 +41,23 @@
# The location of the Commons Httpclient jar
commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-alpha3.jar
-# The location of the Httpunit jar
-httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.jar
-
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
# The location of the Junit jar
junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
+
+# The location of the Httpunit jar
+httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.jar
+
+# Neko HTML (required by HttpUnit)
+nekohtml.jar = ${lib.repo}/nekohtml/jars/nekohtml-0.7.4.jar
+
+# Xerces (required by HttpUnit)
+xerces.jar = ${lib.repo}/xerces/jars/xercesImpl-2.3.0.jar
+
+# XML Parsers API (required by HttpUnit)
+xmlapis.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.2.1.jar
# -----------------------------------------------------------------------------
# Optional properties
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org