vmassol 2004/03/23 23:55:20
Modified: samples/jetty build.properties.sample
samples/jetty/src/script build.properties build.xml
Log:
- fixed port property
- removed not required properties (as they are defined in build.xml)
Revision Changes Path
1.19 +2 -2 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.properties.sample 27 Feb 2004 12:34:06 -0000 1.18
+++ build.properties.sample 24 Mar 2004 07:55:20 -0000 1.19
@@ -62,4 +62,4 @@
# The port to use for starting the servers during unit testing. If not
# specified, it defaults to port 8080.
-#test.port = 8081
+#cactus.port = 8081
1.6 +6 -44 jakarta-cactus/samples/jetty/src/script/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/src/script/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 24 Oct 2003 16:30:18 -0000 1.5
+++ build.properties 24 Mar 2004 07:55:20 -0000 1.6
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------------
-# build.properties.sample
+# build.properties
#
# Use this file to ajust the build of the Cactus Jetty Sample to your local
# environment. Specifically, you might want to define the port on which Jetty
@@ -8,51 +8,13 @@
# $Id$
# -----------------------------------------------------------------------------
-# NOTE: The relative paths below are relative to the directory where the
-# build.xml file is located.
-
-# -----------------------------------------------------------------------------
-# Mandatory properties
-# -----------------------------------------------------------------------------
-
-# The location of the Cactus framework jar
-cactus.jar = [EMAIL PROTECTED]@
-
-# The location of the Junit jar
junit.jar = [EMAIL PROTECTED]@
-
-# The location of the Commons Logging jar
-commons.logging.jar = [EMAIL PROTECTED]@
-
-# The location of the Commons Httpclient jar
-commons.httpclient.jar = [EMAIL PROTECTED]@
-
-# The location of the AspectJ runtime jar
aspectjrt.jar = [EMAIL PROTECTED]@
-
-# The location of the Httpunit jar
-httpunit.jar = [EMAIL PROTECTED]@
-
-# The location of the Servlet API 2.3 jar
servlet.jar = [EMAIL PROTECTED]@
-
-# The location of the Jetty jar
-# Note: Cactus is packaged with a version of Jetty that requires JDK version
-# 1.4 or later. If you want to run the sample against an earlier version of the
-# JDK, you'll need to replace the Jetty jar with the one that supports earlier
-# JDK versions.
-jetty.jar = [EMAIL PROTECTED]@
-
-# The location of the Jasper compiler jar
jasper-compiler.jar = [EMAIL PROTECTED]@
-
-# The location of the Jasper runtime jar
jasper-runtime.jar = [EMAIL PROTECTED]@
-
-# The location of the jar containing the Java compiler used by Jasper
-tools.jar = ${java.home}/../lib/tools.jar
+# Note: All project properties are given default values at the top of the
+# build.xml file.
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
-# The location of the log4j jar (optional). Only needed if you want Cactus to
# generate logs
log4j.jar = ../../lib/log4j-1.2.8.jar
-
-# The port to use for starting the servers during unit testing. If not
+# The port to use for starting Jetty during unit testing. If not
# sepcified, it defaults to port 8080.
-#test.port = 8081
+#cactus.port = 8081
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 23 Mar 2004 19:39:18 -0000 1.8
+++ build.xml 24 Mar 2004 07:55:20 -0000 1.9
@@ -108,6 +108,7 @@
location="[EMAIL PROTECTED]@"/>
<property name="junit.jar"
location="[EMAIL PROTECTED]@"/>
+
<path id="cactus.classpath">
<path refid="project.classpath"/>
<pathelement location="${aspectjrt.jar}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
