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/10/23 20:25:06 UTC
cvs commit: jakarta-cactus/samples/jetty build.properties.sample build.xml
vmassol 2003/10/23 11:25:06
Modified: samples/jetty Tag: CACTUS_15_BRANCH build.properties.sample
build.xml
Log:
Merged from HEAD as these changes will be released in Cactus 1.5 beta2.
Revision Changes Path
No revision
No revision
1.12.2.2 +7 -18 jakarta-cactus/samples/jetty/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/build.properties.sample,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- build.properties.sample 9 Aug 2003 14:59:16 -0000 1.12.2.1
+++ build.properties.sample 23 Oct 2003 18:25:06 -0000 1.12.2.2
@@ -21,12 +21,6 @@
# below. You do not have to put all the external jars in a single location.
lib.repo = c:/apps/maven/repository
-# The location of the J2EE API jar. Depending on the version (1.2 or 1.3) of
-# it, the corresponding Cactus Framework will be built. For example if you use
-# J2EE 1.3 jar, then the Cactus jar will contain the Filter Redirector which is
-# only available for Servlet 2.3 (part of J2EE 1.3).
-j2ee.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
-
# The location of the AspectJ runtime jar
aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
@@ -37,7 +31,7 @@
log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.6.jar
# The location of the Commons Httpclient jar
-commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-rc1.jar
+commons.httpclient.jar = ${lib.repo}/commons-httpclient/jars/commons-httpclient-2.0-rc2.jar
# The location of the Junit jar
junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
@@ -46,9 +40,13 @@
httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.3.jar
# -----------------------------------------------------------------------------
-# Mandatory properties for the Jetty Sample
+# Mandatory properties for the Sample Jetty project.
# -----------------------------------------------------------------------------
+# Location of the Servlet API jar.
+servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+
# The location of the Jetty jar
jetty.jar = ${lib.repo}/jetty/jars/org.mortbay.jetty-4.2.11.jar
@@ -65,12 +63,3 @@
# The port to use for starting the servers during unit testing. If not
# specified, it defaults to port 8080.
#test.port = 8081
-
-# Should we instrument our code with Clover (test coverage tool) ?
-# For this to work, the clover.jar needs to be in ANTHOME/lib.
-# Comment out to disable Clover (setting the property to false will have no
-# effect).
-#clover.enable = true
-
-# Clover jar
-clover.jar = ${ant.home}/lib/clover.jar
1.16.2.1 +4 -5 jakarta-cactus/samples/jetty/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/build.xml,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- build.xml 14 Jul 2003 10:10:36 -0000 1.16
+++ build.xml 23 Oct 2003 18:25:06 -0000 1.16.2.1
@@ -84,7 +84,7 @@
<echo> commons.httpclient.jar = [${commons.httpclient.jar}]</echo>
<echo> commons.logging.jar = [${commons.logging.jar}]</echo>
<echo> httpunit.jar = [${httpunit.jar}]</echo>
- <echo> j2ee.jar = [${j2ee.jar}]</echo>
+ <echo> servlet.jar = [${servlet.jar}]</echo>
<echo> junit.jar = [${junit.jar}]</echo>
<echo> nekohtml.jar = [${nekohtml.jar}]</echo>
<echo> jetty.jar = [${jetty.jar}]</echo>
@@ -104,7 +104,7 @@
<available file="${commons.httpclient.jar}"/>
<available file="${commons.logging.jar}"/>
<available file="${httpunit.jar}"/>
- <available file="${j2ee.jar}"/>
+ <available file="${servlet.jar}"/>
<available file="${jetty.jar}"/>
<available file="${jasper-compiler.jar}"/>
<available file="${jasper-runtime.jar}"/>
@@ -178,7 +178,7 @@
<!-- Copy build file -->
<filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
- <basename property="servlet.jar.name" file="${j2ee.jar}"/>
+ <basename property="servlet.jar.name" file="${servlet.jar}"/>
<filter token="servlet.jar.name" value="${servlet.jar.name}"/>
<basename property="junit.jar.name" file="${junit.jar}"/>
<filter token="junit.jar.name" value="${junit.jar.name}"/>
@@ -227,7 +227,6 @@
location="${target.sample.src.cactus.dir}"/>
<property name="src.webapp.dir"
location="${target.sample.src.webapp.dir}"/>
- <property name="servlet.jar" value="${j2ee.jar}"/>
</ant>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org