felipeal 2005/07/20 20:40:00
Modified: . build-common.xml build.properties.default build.xml
integration/ant/src/scripts/share build-share.xml
samples/ejb build.xml
samples/ejb/src/scripts/share build.xml
samples/jetty build.xml
samples/jetty/src/script build.xml
samples/servlet build.xml
samples/servlet/src/scripts/share build.xml
Added: . .classpath .project
Log:
synchronization with 1.7.1 branch
Revision Changes Path
1.49 +4 -1 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build-common.xml 12 Jul 2005 03:23:48 -0000 1.48
+++ build-common.xml 21 Jul 2005 03:39:59 -0000 1.49
@@ -63,6 +63,9 @@
<!-- Prefix to add to all distributable files -->
<property name="project.prefix" value="jakarta"/>
+
+ <!-- TODO: temporary property, should be automatically calculated -->
+ <property name="cargo.jar.name" value="cargo-0.5"/>
<!--
========================================================================
1.9 +4 -1 jakarta-cactus/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.default,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties.default 26 Apr 2005 09:57:59 -0000 1.8
+++ build.properties.default 21 Jul 2005 03:39:59 -0000 1.9
@@ -220,6 +220,9 @@
# The location of the Httpunit jar
httpunit.jar =
${lib.repo}/${httpunit.project}/jars/${httpunit.artifact}-${httpunit.version}.jar
+# The location of the Cargo jar
+cargo.jar =
${lib.repo}/${cargo.project}/jars/${cargo.artifact}-${cargo.version}.jar
+
# Neko HTML (required by HttpUnit)
nekohtml.jar =
${lib.repo}/${nekohtml.project}/jars/${nekohtml.artifact}-${nekohtml.version}.jar
1.77 +3 -1 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- build.xml 28 Jan 2005 11:03:05 -0000 1.76
+++ build.xml 21 Jul 2005 03:39:59 -0000 1.77
@@ -208,6 +208,8 @@
prefix="${main.release.name}/lib"/>
<zipfileset file="${cactus.jar}"
prefix="${main.release.name}/lib"/>
+ <zipfileset file="${cargo.jar}"
+ prefix="${main.release.name}/lib"/>
<zipfileset file="${commons.logging.jar}"
prefix="${main.release.name}/lib"/>
<zipfileset file="${commons.httpclient.jar}"
1.2 +43 -0 jakarta-cactus/.classpath
1.2 +17 -0 jakarta-cactus/.project
1.25 +7 -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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build-share.xml 19 Jun 2003 22:01:38 -0000 1.24
+++ build-share.xml 21 Jul 2005 03:39:59 -0000 1.25
@@ -57,6 +57,8 @@
<property name="cactus.jar"
value="${cactus.lib.common.dir}/@cactus.jar.name@"/>
+ <property name="cactus.cargo.jar"
+ value="${cactus.lib.common.dir}/@cargo.jar.name@"/>
<property name="cactus.log4j.jar"
value="${cactus.lib.common.dir}/@log4j.jar.name@"/>
<property name="cactus.aspectjrt.jar"
@@ -106,6 +108,7 @@
<javac destdir="${cactus.target.classes.dir}"
srcdir="${cactus.src.dir}">
<classpath>
<pathelement location="${cactus.jar}"/>
+ <pathelement location="${cactus.cargo.jar}"/>
<pathelement location="${cactus.log4j.jar}"/>
<pathelement location="${cactus.aspectjrt.jar}"/>
<pathelement location="${cactus.commons.logging.jar}"/>
@@ -220,6 +223,8 @@
<copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
file="${cactus.jar}"/>
<copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
+ file="${cactus.cargo.jar}"/>
+ <copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
file="${cactus.log4j.jar}"/>
<copy todir="${cactus.target.dir}/${cactus.context}/WEB-INF/lib"
file="${cactus.aspectjrt.jar}"/>
@@ -308,6 +313,7 @@
<pathelement location="${cactus.target.conf.dir}"/>
<pathelement location="${cactus.target.classes.dir}"/>
<pathelement location="${cactus.jar}"/>
+ <pathelement location="${cactus.cargo.jar}"/>
<pathelement location="${cactus.log4j.jar}"/>
<pathelement location="${cactus.aspectjrt.jar}"/>
<pathelement location="${cactus.commons.logging.jar}"/>
@@ -360,6 +366,7 @@
<pathelement location="${cactus.target.conf.dir}"/>
<pathelement location="${cactus.target.classes.dir}"/>
<pathelement location="${cactus.jar}"/>
+ <pathelement location="${cactus.cargo.jar}"/>
<pathelement location="${cactus.log4j.jar}"/>
<pathelement location="${cactus.aspectjrt.jar}"/>
<pathelement location="${cactus.commons.logging.jar}"/>
1.4 +3 -1 jakarta-cactus/samples/ejb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/ejb/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 14 Feb 2004 11:52:31 -0000 1.3
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.4
@@ -140,6 +140,7 @@
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<filter token="cactus.ant.jar.name"
value="${cactus.ant.jar.name}.jar"/>
<filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
+ <filter token="cargo.jar.name" value="${cargo.jar.name}.jar"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
@@ -163,6 +164,7 @@
<echo> aspectjrt.jar = [${aspectjrt.jar}]</echo>
<echo> cactus.jar = [${cactus.jar}]</echo>
<echo> cactus.ant.jar = [${cactus.ant.jar}]</echo>
+ <echo> cargo.jar = [${cargo.jar}]</echo>
<echo> commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> j2ee.jar = [${j2ee.jar}]</echo>
1.6 +3 -1 jakarta-cactus/samples/ejb/src/scripts/share/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/ejb/src/scripts/share/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 26 Apr 2005 13:49:10 -0000 1.5
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.6
@@ -97,6 +97,8 @@
location="../../lib/@cactus.jar.name@"/>
<property name="cactus.ant.jar"
location="../../lib/@cactus.ant.jar.name@"/>
+ <property name="cargo.jar"
+ location="../../lib/@cargo.jar.name@"/>
<property name="commons.httpclient.jar"
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
@@ -108,7 +110,7 @@
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${cactus.jar}"/>
<pathelement location="${cactus.ant.jar}"/>
- <pathelement location="${cargo.jar}"/>
+ <pathelement location="${cargo.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
1.20 +3 -1 jakarta-cactus/samples/jetty/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 23 Mar 2004 19:39:18 -0000 1.19
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.20
@@ -110,6 +110,7 @@
<filterset id="jar.names">
<filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
+ <filter token="cargo.jar.name" value="${cargo.jar.name}.jar"/>
<filter token="servlet.jar.name" value="${servlet.jar.name}"/>
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<filter token="commons.httpclient.jar.name"
@@ -136,6 +137,7 @@
<echo>Dependencies:</echo>
<echo> aspectjrt.jar = [${aspectjrt.jar}]</echo>
<echo> cactus.jar = [${cactus.jar}]</echo>
+ <echo> cargo.jar = [${cargo.jar}]</echo>
<echo> commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> httpunit.jar = [${httpunit.jar}]</echo>
1.11 +3 -0 jakarta-cactus/samples/jetty/src/script/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/src/script/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 28 Jan 2005 11:03:05 -0000 1.10
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.11
@@ -96,6 +96,8 @@
location="../../lib/@aspectjrt.jar.name@"/>
<property name="cactus.jar"
location="../../lib/@cactus.jar.name@"/>
+ <property name="cargo.jar"
+ location="../../lib/@cargo.jar.name@"/>
<property name="commons.httpclient.jar"
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
@@ -113,6 +115,7 @@
<path refid="project.classpath"/>
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${cactus.jar}"/>
+ <pathelement location="${cargo.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${jasper-compiler.jar}"/>
1.41 +3 -1 jakarta-cactus/samples/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 14 Feb 2004 11:52:31 -0000 1.40
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.41
@@ -145,6 +145,7 @@
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<filter token="cactus.ant.jar.name"
value="${cactus.ant.jar.name}.jar"/>
<filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
+ <filter token="cargo.jar.name" value="${cargo.jar.name}.jar"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
@@ -169,6 +170,7 @@
<echo> aspectjrt.jar = [${aspectjrt.jar}]</echo>
<echo> cactus.jar = [${cactus.jar}]</echo>
<echo> cactus.ant.jar = [${cactus.ant.jar}]</echo>
+ <echo> cargo.jar = [${cargo.jar}]</echo>
<echo> commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> httpunit.jar = [${httpunit.jar}]</echo>
1.32 +3 -1
jakarta-cactus/samples/servlet/src/scripts/share/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/scripts/share/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 26 Apr 2005 09:57:58 -0000 1.31
+++ build.xml 21 Jul 2005 03:40:00 -0000 1.32
@@ -104,6 +104,8 @@
location="../../lib/@cactus.jar.name@"/>
<property name="cactus.ant.jar"
location="../../lib/@cactus.ant.jar.name@"/>
+ <property name="cargo.jar"
+ location="../../lib/@cargo.jar.name@"/>
<property name="commons.httpclient.jar"
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
@@ -125,7 +127,7 @@
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${cactus.jar}"/>
<pathelement location="${cactus.ant.jar}"/>
- <pathelement location="${cargo.jar}"/>
+ <pathelement location="${cargo.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
<pathelement location="${junit.jar}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
