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 cm...@apache.org on 2003/07/14 01:29:52 UTC
cvs commit: jakarta-cactus/documentation/docs/xdocs/integration integration_jetty.xml
cmlenz 2003/07/13 16:29:52
Modified: samples/jetty/src/script build.properties build.xml
. gump.xml build.properties.sample
samples/jetty build.xml build.properties.sample
documentation/docs/xdocs/integration integration_jetty.xml
Log:
- Rename the jasperr and jasperc properties to jasper-runtime and jasper-compiler, respectively
- Fix a bug where the name of the cactus JAR was missing the .jar extension in the generated build.properties file
Revision Changes Path
1.4 +7 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 13 Jul 2003 13:38:17 -0000 1.3
+++ build.properties 13 Jul 2003 23:29:52 -0000 1.4
@@ -34,11 +34,15 @@
# The location of the Servlet API 2.3 jar
servlet.jar = ../../lib/@servlet.jar.name@
# 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 = lib/@jetty.jar.name@
-# The location of the Jasper compiler jar
jasperc.jar = lib/@jasperc.jar.name@
+# The location of the Jasper compiler jar
jasper-compiler.jar = lib/@jasper-compiler.jar.name@
-# The location of the Jasper runtime jar
jasperr.jar = lib/@jasperr.jar.name@
+# The location of the Jasper runtime jar
jasper-runtime.jar = lib/@jasper-runtime.jar.name@
# The location of the jar containing the Java compiler used by Jasper
tools.jar = ${java.home}/../lib/tools.jar
1.4 +4 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 8 Jul 2003 21:26:15 -0000 1.3
+++ build.xml 13 Jul 2003 23:29:52 -0000 1.4
@@ -100,9 +100,9 @@
location="../../lib/@commons.httpclient.jar.name@"/>
<property name="commons.logging.jar"
location="../../lib/@commons.logging.jar.name@"/>
- <property name="jasperc.jar"
+ <property name="jasper-compiler.jar"
location="lib/@jetty.jar.name@"/>
- <property name="jasperr.jar"
+ <property name="jasper-runtime.jar"
location="lib/@jetty.jar.name@"/>
<property name="jetty.jar"
location="../../lib/@jetty.jar.name@"/>
@@ -114,8 +114,8 @@
<pathelement location="${cactus.jar}"/>
<pathelement location="${commons.httpclient.jar}"/>
<pathelement location="${commons.logging.jar}"/>
- <pathelement location="${jasperc.jar}"/>
- <pathelement location="${jasperr.jar}"/>
+ <pathelement location="${jasper-compiler.jar}"/>
+ <pathelement location="${jasper-runtime.jar}"/>
<pathelement location="${jetty.jar}"/>
<pathelement location="${junit.jar}"/>
</path>
1.116 +2 -2 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gump.xml 13 Jul 2003 20:10:03 -0000 1.115
+++ gump.xml 13 Jul 2003 23:29:52 -0000 1.116
@@ -511,9 +511,9 @@
<property name="project.version" value="@@DATE@@"/>
<depend property="jetty.jar" project="jetty"/>
- <depend property="jasperc.jar" project="jakarta-tomcat-4.0"
+ <depend property="jasper-compiler.jar" project="jakarta-tomcat-4.0"
id="jasper-compiler"/>
- <depend property="jasperr.jar" project="jakarta-tomcat-4.0"
+ <depend property="jasper-runtime.jar" project="jakarta-tomcat-4.0"
id="jasper-runtime"/>
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
1.78 +3 -3 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- build.properties.sample 13 Jul 2003 17:20:25 -0000 1.77
+++ build.properties.sample 13 Jul 2003 23:29:52 -0000 1.78
@@ -77,10 +77,10 @@
# -----------------------------------------------------------------------------
# The location of the Jasper compiler jar (provided with Tomcat)
-jasperc.jar = ${lib.repo}/tomcat/jars/jasper-compiler-4.1.24.jar
+jasper-compiler.jar = ${lib.repo}/tomcat/jars/jasper-compiler-4.1.24.jar
# The location of the Jasper runtime jar (provided with Tomcat)
-jasperr.jar = ${lib.repo}/tomcat/jars/jasper-runtime-4.1.24.jar
+jasper-runtime.jar = ${lib.repo}/tomcat/jars/jasper-runtime-4.1.24.jar
# -----------------------------------------------------------------------------
# Mandatory properties for the Eclipse plugin only
1.14 +22 -16 jakarta-cactus/samples/jetty/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/jetty/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 13 Jul 2003 15:29:59 -0000 1.13
+++ build.xml 13 Jul 2003 23:29:52 -0000 1.14
@@ -87,8 +87,8 @@
<echo> junit.jar = [${junit.jar}]</echo>
<echo> nekohtml.jar = [${nekohtml.jar}]</echo>
<echo> jetty.jar = [${jetty.jar}]</echo>
- <echo> jasperc.jar = [${jasperc.jar}]</echo>
- <echo> jasperr.jar = [${jasperr.jar}]</echo>
+ <echo> jasper-compiler.jar = [${jasper-compiler.jar}]</echo>
+ <echo> jasper-runtime.jar = [${jasper-runtime.jar}]</echo>
<echo> xerces.jar (optional) = [${xerces.jar}]</echo>
<echo> xmlapis.jar (optional) = [${xmlapis.jar}]</echo>
<echo/>
@@ -105,8 +105,8 @@
<available file="${httpunit.jar}"/>
<available file="${j2ee.jar}"/>
<available file="${jetty.jar}"/>
- <available file="${jasperc.jar}"/>
- <available file="${jasperr.jar}"/>
+ <available file="${jasper-compiler.jar}"/>
+ <available file="${jasper-runtime.jar}"/>
<available file="${junit.jar}"/>
<available file="${nekohtml.jar}"/>
<!-- Check for a JAXP class instead of the xmlapis.jar file so that
@@ -163,30 +163,36 @@
<mkdir dir="${target.sample.lib.dir}"/>
<copy todir="${target.sample.lib.dir}">
<fileset file="${jetty.jar}"/>
- <fileset file="${jasperr.jar}"/>
- <fileset file="${jasperc.jar}"/>
+ <fileset file="${jasper-runtime.jar}"/>
+ <fileset file="${jasper-compiler.jar}"/>
</copy>
<!-- Copy build file -->
- <filter token="cactus.jar.name" value="${cactus.jar.name}"/>
+ <filter token="cactus.jar.name" value="${cactus.jar.name}.jar"/>
<basename property="servlet.jar.name" file="${j2ee.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}"/>
- <basename property="commons.logging.jar.name" file="${commons.logging.jar}"/>
- <filter token="commons.logging.jar.name" value="${commons.logging.jar.name}"/>
- <basename property="commons.httpclient.jar.name" file="${commons.httpclient.jar}"/>
- <filter token="commons.httpclient.jar.name" value="${commons.httpclient.jar.name}"/>
+ <basename property="commons.logging.jar.name"
+ file="${commons.logging.jar}"/>
+ <filter token="commons.logging.jar.name"
+ value="${commons.logging.jar.name}"/>
+ <basename property="commons.httpclient.jar.name"
+ file="${commons.httpclient.jar}"/>
+ <filter token="commons.httpclient.jar.name"
+ value="${commons.httpclient.jar.name}"/>
<basename property="aspectjrt.jar.name" file="${aspectjrt.jar}"/>
<filter token="aspectjrt.jar.name" value="${aspectjrt.jar.name}"/>
<basename property="httpunit.jar.name" file="${httpunit.jar}"/>
<filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
<basename property="jetty.jar.name" file="${jetty.jar}"/>
<filter token="jetty.jar.name" value="${jetty.jar.name}"/>
- <basename property="jasperc.jar.name" file="${jasperc.jar}"/>
- <filter token="jasperc.jar.name" value="${jasperc.jar.name}"/>
- <basename property="jasperr.jar.name" file="${jasperr.jar}"/>
- <filter token="jasperr.jar.name" value="${jasperr.jar.name}"/>
+ <basename property="jasper-compiler.jar.name"
+ file="${jasper-compiler.jar}"/>
+ <filter token="jasper-compiler.jar.name"
+ value="${jasper-compiler.jar.name}"/>
+ <basename property="jasper-runtime.jar.name" file="${jasper-runtime.jar}"/>
+ <filter token="jasper-runtime.jar.name" value="${jasper-runtime.jar.name}"/>
<copy todir="${target.sample.dir}" filtering="on">
<fileset dir="${src.script.dir}"/>
</copy>
1.12 +4 -10 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties.sample 13 Jul 2003 15:07:17 -0000 1.11
+++ build.properties.sample 13 Jul 2003 23:29:52 -0000 1.12
@@ -46,23 +46,17 @@
httpunit.jar = ${lib.repo}/httpunit/jars/httpunit-1.5.3.jar
# -----------------------------------------------------------------------------
-# Mandatory properties for the Eclipse plugin ant the Jetty Sample
+# Mandatory properties for the Jetty Sample
# -----------------------------------------------------------------------------
-# The Jetty container is packaged in the Eclipse plugin and is used as the
-# default container in which to run the Cactus tests
# The location of the Jetty jar
jetty.jar = ${lib.repo}/jetty/jars/org.mortbay.jetty-4.2.11.jar
-# -----------------------------------------------------------------------------
-# Mandatory properties for the Jetty Sample
-# -----------------------------------------------------------------------------
-
# The location of the Jasper compiler jar (provided with Tomcat)
-jasperc.jar = ${lib.repo}/tomcat/jars/jasper-compiler-4.1.24.jar
+jasper-compiler.jar = ${lib.repo}/tomcat/jars/jasper-compiler-4.1.24.jar
# The location of the Jasper runtime jar (provided with Tomcat)
-jasperr.jar = ${lib.repo}/tomcat/jars/jasper-runtime-4.1.24.jar
+jasper-runtime.jar = ${lib.repo}/tomcat/jars/jasper-runtime-4.1.24.jar
# -----------------------------------------------------------------------------
# Optional properties
1.2 +2 -2 jakarta-cactus/documentation/docs/xdocs/integration/integration_jetty.xml
Index: integration_jetty.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/integration/integration_jetty.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- integration_jetty.xml 25 Apr 2003 15:06:07 -0000 1.1
+++ integration_jetty.xml 13 Jul 2003 23:29:52 -0000 1.2
@@ -79,8 +79,8 @@
[...]
<!-- Include Jetty jar and optionally Jasper jars in the classpath -->
<pathelement location="${jetty.jar}"/>
- <pathelement location="${jasperc.jar}"/>
- <pathelement location="${jasperr.jar}"/>
+ <pathelement location="${jasper-compiler.jar}"/>
+ <pathelement location="${jasper-runtime.jar}"/>
</classpath>
<test name="org.apache.cactus.sample.TestAll"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org