vmassol 2003/10/23 11:31:41
Modified: samples/servlet/src/scripts/share Tag: CACTUS_15_BRANCH
build.xml
samples/servlet Tag: CACTUS_15_BRANCH .cvsignore build.xml
build.properties.sample
samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit
Tag: CACTUS_15_BRANCH TestServerSideExceptions.java
TestShareAll.java TestTearDownException.java
TestJUnitTestCaseWrapper.java
samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/unit
Tag: CACTUS_15_BRANCH TestFilterHttpHeaders.java
samples/servlet/src/scripts/j2ee12 Tag: CACTUS_15_BRANCH
build.properties
samples/servlet/src/scripts/j2ee13 Tag: CACTUS_15_BRANCH
build.properties
Added: samples/servlet Tag: CACTUS_15_BRANCH
logging_client.properties.sample
logging_server.properties.sample
Log:
Merged from HEAD as these changes will be released in Cactus 1.5 beta2.
Revision Changes Path
No revision
No revision
1.22.2.1 +45 -5 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.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- build.xml 30 Jun 2003 16:01:35 -0000 1.22
+++ build.xml 23 Oct 2003 18:31:40 -0000 1.22.2.1
@@ -30,7 +30,7 @@
<!-- Global project properties -->
<property name="project.name.text" value="Cactus Servlet Sample"/>
- <property name="project.name.file" value="sample-servlet"/>
+ <property name="project.name.file" value="cactus-sample-servlet"/>
<property name="project.version" value="@version@"/>
<!-- Prefix to add to all distributable files -->
@@ -111,6 +111,12 @@
location="[EMAIL PROTECTED]@"/>
<property name="nekohtml.jar"
location="[EMAIL PROTECTED]@"/>
+
+ <!-- This is optional and only needed if you wish to debug and use
+ Log4J for logging -->
+ <property name="log4j.jar"
+ location="[EMAIL PROTECTED]@"/>
+
<path id="cactus.classpath">
<path refid="project.classpath"/>
<pathelement location="${aspectjrt.jar}"/>
@@ -236,14 +242,40 @@
"cactus.home.[container name]" has been defined.
========================================================================
-->
- <target name="test.prepare" depends="war, compile.cactus">
+ <target name="test.prepare.logging">
+
+ <!-- Convert the path to logging_*.properties to use forward slashes
+ so that it works when loaded as a String in Java (backslashes
+ won't work. -->
+ <pathconvert property="target.dir.normalized" dirsep="/">
+ <path>
+ <pathelement location="${target.dir}"/>
+ </path>
+ </pathconvert>
+ <copy todir="${target.dir}" filtering="on" failonerror="false">
+ <fileset dir="${base.dir}">
+ <include name="logging_*.properties"/>
+ </fileset>
+ <filterset>
+ <filter token="target.dir" value="${target.dir.normalized}"/>
+ </filterset>
+ </copy>
+ <!-- Make sure logging_*.properties files exist, even if empty -->
+ <touch file="${target.dir}/logging_client.properties"/>
+ <touch file="${target.dir}/logging_server.properties"/>
+
+ </target>
+
+ <target name="test.prepare"
+ depends="war, compile.cactus, test.prepare.logging">
<!-- Cactify the web-app archive -->
<cactifywar srcfile="${target.dir}/${project.name.file}.war"
- destfile="${target.dir}/test.war"
+ destfile="${target.dir}/${project.name.file}-cactified.war"
mergewebxml="${src.webapp.dir}/WEB-INF/cactus-web.xml">
<classes dir="${target.classes.cactus.dir}"/>
<lib file="${httpunit.jar}"/>
+ <lib file="${log4j.jar}"/>
<!-- Provide a secured servlet redirector in addition to the
default servlet redirector -->
<servletredirector/>
@@ -280,8 +312,15 @@
description="Run the tests on the defined containers">
<!-- Run the tests -->
- <cactus warfile="${target.dir}/test.war" fork="yes"
- failureproperty="tests.failed">
+ <cactus warfile="${target.dir}/${project.name.file}-cactified.war"
+ fork="yes" failureproperty="tests.failed" haltonerror="true">
+
+ <!-- Configure the cactus task for logging -->
+ <cactusproperty server="false"
+ propertiesFile="${target.dir.normalized}/logging_client.properties"/>
+ <cactusproperty server="true"
+ propertiesFile="${target.dir.normalized}/logging_server.properties"/>
+
<classpath>
<path refid="project.classpath"/>
<@[EMAIL PROTECTED] location="${clover.jar}"[EMAIL PROTECTED]@>
@@ -289,6 +328,7 @@
<pathelement location="${nekohtml.jar}"/>
<pathelement location="${target.classes.java.dir}"/>
<pathelement location="${target.classes.cactus.dir}"/>
+ <pathelement location="${log4j.jar}"/>
</classpath>
<containerset>
<@[EMAIL PROTECTED] if="cactus.home.jboss3x"
No revision
No revision
1.1.4.1 +2 -0 jakarta-cactus/samples/servlet/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- .cvsignore 3 Feb 2003 08:37:35 -0000 1.1
+++ .cvsignore 23 Oct 2003 18:31:40 -0000 1.1.4.1
@@ -6,3 +6,5 @@
release-12
release-13
ant.bat
+logging_client.properties
+logging_server.properties
1.36.2.1 +28 -6 jakarta-cactus/samples/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.xml,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- build.xml 13 Jul 2003 15:29:59 -0000 1.36
+++ build.xml 23 Oct 2003 18:31:40 -0000 1.36.2.1
@@ -127,7 +127,7 @@
<!-- Copy scripts -->
<basename property="jstl.jar.name" file="${jstl.jar}"/>
<basename property="standard.jar.name" file="${standard.jar}"/>
- <basename property="servlet.jar.name" file="${j2ee.jar}"/>
+ <basename property="servlet.jar.name" file="${servlet.jar}"/>
<basename property="aspectjrt.jar.name" file="${aspectjrt.jar}"/>
<basename property="commons.httpclient.jar.name"
file="${commons.httpclient.jar}"/>
@@ -136,6 +136,7 @@
<basename property="httpunit.jar.name" file="${httpunit.jar}"/>
<basename property="junit.jar.name" file="${junit.jar}"/>
<basename property="nekohtml.jar.name" file="${nekohtml.jar}"/>
+ <basename property="log4j.jar.name" file="${log4j.jar}"/>
<filterset id="jar.names">
<filter token="jstl.jar.name" value="${jstl.jar.name}"/>
@@ -151,6 +152,7 @@
<filter token="httpunit.jar.name" value="${httpunit.jar.name}"/>
<filter token="junit.jar.name" value="${junit.jar.name}"/>
<filter token="nekohtml.jar.name" value="${nekohtml.jar.name}"/>
+ <filter token="log4j.jar.name" value="${log4j.jar.name}"/>
</filterset>
</target>
@@ -170,7 +172,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> log4j.jar = [${log4j.jar}]</echo>
<echo> nekohtml.jar = [${nekohtml.jar}]</echo>
@@ -181,6 +183,7 @@
<echo/>
<echo>Options:</echo>
<echo> clover.enable = ${clover.enable}</echo>
+ <echo> clover.jar = [${clover.jar}]</echo>
<echo> cactus.port = ${cactus.port}</echo>
<condition property="properties.ok">
@@ -191,7 +194,8 @@
<available file="${commons.httpclient.jar}"/>
<available file="${commons.logging.jar}"/>
<available file="${httpunit.jar}"/>
- <available file="${j2ee.jar}"/>
+ <available file="${servlet.jar}"/>
+ <available file="${log4j.jar}"/>
<or>
<not>
<isset property="j2ee13.available"/>
@@ -214,10 +218,21 @@
needing to define the xerces.jar property -->
<available classname="org.apache.xml.serialize.XMLSerializer"
classpath="${xerces.jar}"/>
+ <!-- Check that clover.jar points to a valid file if clover is
+ enabled -->
+ <or>
+ <and>
+ <isset property="clover.enable"/>
+ <available file="${clover.jar}"/>
+ </and>
+ <not>
+ <isset property="clover.enable"/>
+ </not>
+ </or>
</and>
</condition>
- <fail unless="properties.ok">One or more required dependancies could not
+ <fail unless="properties.ok">One or more required dependencies could not
be resolved. Please check you build.properties file, and run Ant with the
-verbose option for more details</fail>
@@ -268,6 +283,13 @@
<!-- Copy README file -->
<copy todir="${target.sample.dir}" file="${base.dir}/README"/>
+ <!-- Copy sample logging properties file -->
+ <copy todir="${target.sample.dir}">
+ <fileset dir="${base.dir}">
+ <include name="logging_*.properties.sample"/>
+ </fileset>
+ </copy>
+
</target>
<target name="sample.clover" depends="sample.main" if="clover.enable">
@@ -326,7 +348,7 @@
location="${target.test.dir}/test-reports"/>
<property name="cactus.jar" location="${test.cactus.jar}"/>
<property name="cactus.ant.jar" location="${test.cactus.ant.jar}"/>
- <property name="servlet.jar" value="${j2ee.jar}"/>
+ <property name="servlet.jar" value="${servlet.jar}"/>
<property name="clover.jar" value="${clover.jar}"/>
</ant>
1.9.2.3 +14 -9 jakarta-cactus/samples/servlet/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.properties.sample,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- build.properties.sample 10 Aug 2003 14:00:54 -0000 1.9.2.2
+++ build.properties.sample 23 Oct 2003 18:31:40 -0000 1.9.2.3
@@ -21,18 +21,23 @@
# 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 JSTL jar
jstl.jar = ${lib.repo}/jstl/jars/jstl-1.0.2.jar
# The location of the JSTL jar
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
+# The location of the log4j jar
+log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.8.jar
+
+# -----------------------------------------------------------------------------
+# Mandatory properties for the Sample Servlet 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
+
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
@@ -45,7 +50,7 @@
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
-# tests on the Resin 2.x, comment the "cactus.home.resin2x" property.
+# tests on Resin 2.x, comment the "cactus.home.resin2x" property.
#cactus.home.resin2x = c:/Apps/resin-2.1.10
#cactus.home.tomcat3x = c:/Apps/jakarta-tomcat-3.3.1a
@@ -62,5 +67,5 @@
# effect).
#clover.enable = true
-# Clover jar
+# Clover jar. This is required if clover is enabled.
clover.jar = ${ant.home}/lib/clover.jar
No revision
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.properties.sample,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- build.properties.sample 10 Aug 2003 14:00:54 -0000 1.9.2.2
+++ build.properties.sample 23 Oct 2003 18:31:40 -0000 1.9.2.3
@@ -21,18 +21,23 @@
# 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 JSTL jar
jstl.jar = ${lib.repo}/jstl/jars/jstl-1.0.2.jar
# The location of the JSTL jar
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
+# The location of the log4j jar
+log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.8.jar
+
+# -----------------------------------------------------------------------------
+# Mandatory properties for the Sample Servlet 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
+
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
@@ -45,7 +50,7 @@
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
-# tests on the Resin 2.x, comment the "cactus.home.resin2x" property.
+# tests on Resin 2.x, comment the "cactus.home.resin2x" property.
#cactus.home.resin2x = c:/Apps/resin-2.1.10
#cactus.home.tomcat3x = c:/Apps/jakarta-tomcat-3.3.1a
@@ -62,5 +67,5 @@
# effect).
#clover.enable = true
-# Clover jar
+# Clover jar. This is required if clover is enabled.
clover.jar = ${ant.home}/lib/clover.jar
No revision
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.properties.sample,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- build.properties.sample 10 Aug 2003 14:00:54 -0000 1.9.2.2
+++ build.properties.sample 23 Oct 2003 18:31:40 -0000 1.9.2.3
@@ -21,18 +21,23 @@
# 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 JSTL jar
jstl.jar = ${lib.repo}/jstl/jars/jstl-1.0.2.jar
# The location of the JSTL jar
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
+# The location of the log4j jar
+log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.8.jar
+
+# -----------------------------------------------------------------------------
+# Mandatory properties for the Sample Servlet 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
+
# -----------------------------------------------------------------------------
# Optional properties
# -----------------------------------------------------------------------------
@@ -45,7 +50,7 @@
# Note: If you don't want to run the test on a given servlet engine, just
# comment it's home property. For example, if you don't want to run the
-# tests on the Resin 2.x, comment the "cactus.home.resin2x" property.
+# tests on Resin 2.x, comment the "cactus.home.resin2x" property.
#cactus.home.resin2x = c:/Apps/resin-2.1.10
#cactus.home.tomcat3x = c:/Apps/jakarta-tomcat-3.3.1a
@@ -62,5 +67,5 @@
# effect).
#clover.enable = true
-# Clover jar
+# Clover jar. This is required if clover is enabled.
clover.jar = ${ant.home}/lib/clover.jar
1.1.2.1 +0 -0 jakarta-cactus/samples/servlet/logging_client.properties.sample
Index: logging_client.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/logging_client.properties.sample,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 jakarta-cactus/samples/servlet/logging_server.properties.sample
Index: logging_server.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/logging_server.properties.sample,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.7.2.2 +0 -0
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestServerSideExceptions.java
Index: TestServerSideExceptions.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestServerSideExceptions.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
1.6.2.2 +0 -0
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestShareAll.java
Index: TestShareAll.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestShareAll.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
1.4.2.2 +0 -0
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestTearDownException.java
Index: TestTearDownException.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestTearDownException.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
1.4.2.2 +0 -0
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestJUnitTestCaseWrapper.java
Index: TestJUnitTestCaseWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/unit/TestJUnitTestCaseWrapper.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
No revision
No revision
1.3.4.2 +0 -0
jakarta-cactus/samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/unit/TestFilterHttpHeaders.java
Index: TestFilterHttpHeaders.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/unit/TestFilterHttpHeaders.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
No revision
No revision
1.9.2.3 +1 -1
jakarta-cactus/samples/servlet/src/scripts/j2ee12/build.properties
Index: build.properties
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/scripts/j2ee12/build.properties,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
No revision
No revision
1.8.2.3 +1 -1
jakarta-cactus/samples/servlet/src/scripts/j2ee13/build.properties
Index: build.properties
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/scripts/j2ee13/build.properties,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
