felipeal 2005/08/10 21:38:13
Modified: . Tag: CACTUS_17_BRANCH build-common.xml
samples/ejb Tag: CACTUS_17_BRANCH build.xml
samples/jetty Tag: CACTUS_17_BRANCH build.xml
samples/servlet Tag: CACTUS_17_BRANCH build.xml
Log:
fixed cargo property
Revision Changes Path
No revision
No revision
1.47.2.3 +1 -4 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -u -r1.47.2.2 -r1.47.2.3
--- build-common.xml 21 Jul 2005 03:16:18 -0000 1.47.2.2
+++ build-common.xml 11 Aug 2005 04:38:10 -0000 1.47.2.3
@@ -64,9 +64,6 @@
<!-- 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"/>
-
<!--
========================================================================
Default values for properties not defined in build.properties or in
No revision
No revision
1.3.6.4 +3 -2 jakarta-cactus/samples/ejb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/ejb/build.xml,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -r1.3.6.3 -r1.3.6.4
--- build.xml 20 Jul 2005 20:17:15 -0000 1.3.6.3
+++ build.xml 11 Aug 2005 04:38:10 -0000 1.3.6.4
@@ -134,13 +134,14 @@
<basename property="commons.logging.jar.name"
file="${commons.logging.jar}"/>
<basename property="junit.jar.name" file="${junit.jar}"/>
+ <basename property="cargo.jar.name" file="${cargo.jar}"/>
<filterset id="jar.names">
<filter token="j2ee.jar.name" value="${j2ee.jar.name}"/>
<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="cargo.jar.name" value="${cargo.jar.name}"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
No revision
No revision
1.19.6.4 +3 -2 jakarta-cactus/samples/jetty/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/build.xml,v
retrieving revision 1.19.6.3
retrieving revision 1.19.6.4
diff -u -r1.19.6.3 -r1.19.6.4
--- build.xml 20 Jul 2005 20:17:15 -0000 1.19.6.3
+++ build.xml 11 Aug 2005 04:38:13 -0000 1.19.6.4
@@ -107,10 +107,11 @@
<basename property="jetty.jar.name" file="${jetty.jar}"/>
<basename property="jasper-compiler.jar.name"
file="${jasper-compiler.jar}"/>
<basename property="jasper-runtime.jar.name"
file="${jasper-runtime.jar}"/>
+ <basename property="cargo.jar.name" file="${cargo.jar}"/>
<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="cargo.jar.name" value="${cargo.jar.name}"/>
<filter token="servlet.jar.name" value="${servlet.jar.name}"/>
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<filter token="commons.httpclient.jar.name"
No revision
No revision
1.40.6.4 +3 -2 jakarta-cactus/samples/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.xml,v
retrieving revision 1.40.6.3
retrieving revision 1.40.6.4
diff -u -r1.40.6.3 -r1.40.6.4
--- build.xml 20 Jul 2005 20:17:15 -0000 1.40.6.3
+++ build.xml 11 Aug 2005 04:38:13 -0000 1.40.6.4
@@ -137,6 +137,7 @@
<basename property="junit.jar.name" file="${junit.jar}"/>
<basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
<basename property="log4j.jar.name" file="${log4j.jar}"/>
+ <basename property="cargo.jar.name" file="${cargo.jar}"/>
<filterset id="jar.names">
<filter token="jstl.jar.name" value="${jstl.jar.name}"/>
@@ -145,7 +146,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="cargo.jar.name" value="${cargo.jar.name}"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
