felipeal 2005/07/19 20:10:59
Modified: integration/ant/src/scripts/share Tag: CACTUS_17_BRANCH
build-share.xml
samples/ejb Tag: CACTUS_17_BRANCH build.xml
samples/ejb/src/scripts/share Tag: CACTUS_17_BRANCH
build.xml
samples/jetty Tag: CACTUS_17_BRANCH build.xml
samples/jetty/src/script Tag: CACTUS_17_BRANCH build.xml
samples/servlet Tag: CACTUS_17_BRANCH build.xml
samples/servlet/src/scripts/share Tag: CACTUS_17_BRANCH
build.xml
Log:
added more cargo properties
Revision Changes Path
No revision
No revision
1.24.8.1 +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.24.8.1
diff -u -r1.24 -r1.24.8.1
--- build-share.xml 19 Jun 2003 22:01:38 -0000 1.24
+++ build-share.xml 20 Jul 2005 03:10:58 -0000 1.24.8.1
@@ -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}"/>
No revision
No revision
1.3.6.2 +2 -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.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- build.xml 14 Jul 2005 20:48:33 -0000 1.3.6.1
+++ build.xml 20 Jul 2005 03:10:58 -0000 1.3.6.2
@@ -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}"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
No revision
No revision
1.5.2.2 +1 -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.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- build.xml 14 Jul 2005 20:48:34 -0000 1.5.2.1
+++ build.xml 20 Jul 2005 03:10:58 -0000 1.5.2.2
@@ -110,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}"/>
No revision
No revision
1.19.6.2 +2 -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.6.1
retrieving revision 1.19.6.2
diff -u -r1.19.6.1 -r1.19.6.2
--- build.xml 14 Jul 2005 20:48:35 -0000 1.19.6.1
+++ build.xml 20 Jul 2005 03:10:58 -0000 1.19.6.2
@@ -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}"/>
<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.10.2.2 +1 -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.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- build.xml 14 Jul 2005 20:48:36 -0000 1.10.2.1
+++ build.xml 20 Jul 2005 03:10:59 -0000 1.10.2.2
@@ -115,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}"/>
No revision
No revision
1.40.6.2 +2 -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.6.1
retrieving revision 1.40.6.2
diff -u -r1.40.6.1 -r1.40.6.2
--- build.xml 14 Jul 2005 20:48:37 -0000 1.40.6.1
+++ build.xml 20 Jul 2005 03:10:59 -0000 1.40.6.2
@@ -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}"/>
<filter token="commons.httpclient.jar.name"
value="${commons.httpclient.jar.name}"/>
<filter token="commons.logging.jar.name"
No revision
No revision
1.31.2.2 +1 -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.2.1
retrieving revision 1.31.2.2
diff -u -r1.31.2.1 -r1.31.2.2
--- build.xml 14 Jul 2005 20:48:38 -0000 1.31.2.1
+++ build.xml 20 Jul 2005 03:10:59 -0000 1.31.2.2
@@ -127,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]
