vmassol 2003/10/23 11:34:59
Modified: . Tag: CACTUS_15_BRANCH build.xml
build.properties.sample LICENSE.logging gump.xml
.cvsignore build-common.xml
Log:
Merged from HEAD as these changes will be released in Cactus 1.5 beta2.
Revision Changes Path
No revision
No revision
1.63.2.1 +51 -11 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -r1.63 -r1.63.2.1
--- build.xml 13 Jul 2003 22:29:50 -0000 1.63
+++ build.xml 23 Oct 2003 18:34:58 -0000 1.63.2.1
@@ -46,21 +46,25 @@
<ant antfile="framework/build.xml" inheritAll="false"
target="dist">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="framework/build.xml" inheritAll="false"
target="dist">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="integration/ant/build.xml" inheritAll="false"
target="dist">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="integration/ant/build.xml" inheritAll="false"
target="dist">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml"
@@ -69,24 +73,35 @@
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml"
inheritAll="false" target="dist">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml"
inheritAll="false" target="dist">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="samples/servlet/build.xml" inheritAll="false"
target="dist">
- <property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value="${servlet.22.jar}"/>
+ <property name="j2ee.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="samples/servlet/build.xml" inheritAll="false"
target="dist">
- <property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value="${servlet.23.jar}"/>
+ <property name="j2ee.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="samples/jetty/build.xml" inheritAll="false"
target="dist">
+ <property name="servlet.jar" value="${servlet.23.jar}"/>
+ <property name="j2ee.jar" value=""/>
+ <property name="clover.enable" value="true"/>
+ </ant>
+ <ant antfile="samples/ejb/build.xml" inheritAll="false"
+ target="dist">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
<property name="clover.enable" value="true"/>
</ant>
<ant antfile="documentation/build.xml" inheritAll="false"
@@ -108,12 +123,14 @@
<antcall target="release.j2ee12" inheritall="no">
<param name="j2ee.dependant" value="true"/>
- <param name="j2ee.jar" location="${j2ee.12.jar}"/>
+ <param name="servlet.jar" location="${servlet.22.jar}"/>
+ <param name="j2ee.jar" location=""/>
<param name="release.dir" location="release"/>
</antcall>
<antcall target="release.j2ee13" inheritall="no">
<param name="j2ee.dependant" value="true"/>
- <param name="j2ee.jar" location="${j2ee.13.jar}"/>
+ <param name="servlet.jar" location="${servlet.23.jar}"/>
+ <param name="j2ee.jar" location=""/>
<param name="release.dir" location="release"/>
</antcall>
<antcall target="release.src"/>
@@ -130,6 +147,9 @@
<target name="release.shared"
depends="init.properties, release.prepare">
+ <!-- Note: We don't bundle the J2EE jar as its license does not
+ allow it to be redistributable -->
+
<zip destfile="${release.dir}/tmp.zip">
<zipfileset dir="documentation/dist/doc"
prefix="${main.release.name}/doc">
@@ -153,9 +173,9 @@
prefix="${main.release.name}/lib"/>
<zipfileset file="${nekohtml.jar}"
prefix="${main.release.name}/lib"/>
- <zipfileset file="${j2ee.jar}"
+ <zipfileset file="${servlet.jar}"
prefix="${main.release.name}/lib"/>
- <zipfileset dir="samples/servlet/target-${j2ee.api}/sample"
+ <zipfileset dir="${cactus.samples.servlet.bin}"
prefix="${main.release.name}/samples/servlet">
<exclude name="lib/**"/>
</zipfileset>
@@ -184,12 +204,18 @@
<zip destfile="${release.dir}/${main.release.name}.zip">
<zipfileset src="${release.dir}/tmp.zip"/>
- <zipfileset dir="samples/jetty/dist-${j2ee.api}/bin"
- prefix="${main.release.name}/samples/jetty"/>
+ <zipfileset dir="${cactus.samples.jetty.bin}"
+ prefix="${main.release.name}/samples/jetty">
+ <exclude name="lib/**"/>
+ </zipfileset>
<zipfileset file="${jstl.jar}"
prefix="${main.release.name}/samples/servlet/lib"/>
<zipfileset file="${standard.jar}"
prefix="${main.release.name}/samples/servlet/lib"/>
+ <zipfileset dir="${cactus.samples.ejb.bin}"
+ prefix="${main.release.name}/samples/ejb">
+ <exclude name="lib/**"/>
+ </zipfileset>
</zip>
<delete file="${release.dir}/tmp.zip"/>
@@ -233,18 +259,22 @@
<ant antfile="framework/build.xml" inheritAll="false"
target="clean">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="framework/build.xml" inheritAll="false"
target="clean">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="integration/ant/build.xml" inheritAll="false"
target="clean">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="integration/ant/build.xml" inheritAll="false"
target="clean">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml"
inheritAll="false" target="clean">
@@ -252,22 +282,32 @@
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml"
inheritAll="false" target="clean">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml"
inheritAll="false" target="clean">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="samples/servlet/build.xml" inheritAll="false"
target="clean">
- <property name="j2ee.jar" value="${j2ee.12.jar}"/>
+ <property name="servlet.jar" value="${servlet.22.jar}"/>
+ <property name="j2ee.jar" value=""/>
</ant>
<ant antfile="samples/servlet/build.xml" inheritAll="false"
target="clean">
- <property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value="${servlet.23.jar}"/>
+ <property name="j2ee.jar" value=""/>
</ant>
<ant antfile="samples/jetty/build.xml" inheritAll="false"
target="clean">
+ <property name="servlet.jar" value="${servlet.23.jar}"/>
+ <property name="j2ee.jar" value=""/>
+ </ant>
+ <ant antfile="samples/ejb/build.xml" inheritAll="false"
+ target="clean">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
+ <property name="servlet.jar" value=""/>
</ant>
<ant antfile="documentation/build.xml" inheritAll="false"
target="clean"/>
1.78.2.3 +19 -11 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.78.2.2
retrieving revision 1.78.2.3
diff -u -r1.78.2.2 -r1.78.2.3
--- build.properties.sample 10 Aug 2003 14:00:54 -0000 1.78.2.2
+++ build.properties.sample 23 Oct 2003 18:34:58 -0000 1.78.2.3
@@ -37,10 +37,10 @@
log4j.jar = ${lib.repo}/log4j/jars/log4j-1.2.8.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 AspectJ runtime jar
-aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.0.6.jar
+aspectjrt.jar = ${lib.repo}/aspectj/jars/aspectjrt-1.1.1.jar
# The location of the Junit jar
junit.jar = ${lib.repo}/junit/jars/junit-3.8.1.jar
@@ -64,6 +64,14 @@
xmlapis.jar = ${lib.repo}/xerces/jars/xmlParserAPIs-2.2.1.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
+
+# -----------------------------------------------------------------------------
# Mandatory properties for the Eclipse plugin ant the Jetty Sample
# -----------------------------------------------------------------------------
# The Jetty container is packaged in the Eclipse plugin and is used as the
@@ -111,21 +119,21 @@
# Optional properties for the main Cactus build
# -----------------------------------------------------------------------------
-# Locations J2EE APIs for the "*.all" targets
+# Location of J2EE API jars for the "*.all" targets
j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
j2ee.13.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
+# Location of Servlet API jars for the "*.all" targets
+servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+
# -----------------------------------------------------------------------------
# Optional properties share by several subprojects
# -----------------------------------------------------------------------------
# The location of the AspectJ tools jar
# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectj-tools-1.0.6.jar
-
-# The location of the AspectJ Ant tasks jar
-# If not specified here, the jar must be present in ANTHOME/lib
-aspectj-ant.jar = ${lib.repo}/aspectj/jars/aspectj-ant-1.0.6.jar
+aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectjtools-1.1.1.jar
# Dependencies for Checkstyle code auditing
# If not specified here, the JARs must be present in ANTHOME/lib
@@ -141,7 +149,7 @@
# effect).
#clover.enable = true
-# Clover jar
+# Clover jar. This is required if clover is enabled.
clover.jar = ${ant.home}/lib/clover.jar
# -----------------------------------------------------------------------------
@@ -156,7 +164,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
1.1.4.1 +60 -60 jakarta-cactus/LICENSE.logging
Index: LICENSE.logging
===================================================================
RCS file: /home/cvs/jakarta-cactus/LICENSE.logging,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- LICENSE.logging 26 Aug 2002 10:34:52 -0000 1.1
+++ LICENSE.logging 23 Oct 2003 18:34:58 -0000 1.1.4.1
@@ -1,60 +1,60 @@
-/*
- * $Header$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
1.118.2.1 +6 -4 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.118
retrieving revision 1.118.2.1
diff -u -r1.118 -r1.118.2.1
--- gump.xml 14 Jul 2003 10:43:27 -0000 1.118
+++ gump.xml 23 Oct 2003 18:34:58 -0000 1.118.2.1
@@ -456,10 +456,12 @@
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard"
- id="jstl"/>
- <depend property="standard.jar" project="jakarta-taglibs-standard"
- id="standard"/>
+
+ <!-- Note: We cannot use the jstl and standard jars from CVS HEAD as
+ they require Servlet API 2.4 and JSP API 2.0 -->
+ <depend property="jstl.jar" project="jstl-jsp-12" id="jstl"/>
+ <depend property="standard.jar" project="jstl-jsp-12" id="standard"/>
+
<depend property="nekohtml.jar" project="nekohtml" id="nekohtml"/>
<depend property="cactus.jar" project="jakarta-cactus-framework-13"/>
<depend property="cactus.ant.jar"
1.14.2.1 +1 -0 jakarta-cactus/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-cactus/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- .cvsignore 1 Jun 2003 19:12:31 -0000 1.14
+++ .cvsignore 23 Oct 2003 18:34:58 -0000 1.14.2.1
@@ -18,3 +18,4 @@
default.ajsym
default.lst
.checkclipse
+junit*.properties
1.30.2.4 +15 -3 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -r1.30.2.3 -r1.30.2.4
--- build-common.xml 9 Aug 2003 14:24:33 -0000 1.30.2.3
+++ build-common.xml 23 Oct 2003 18:34:58 -0000 1.30.2.4
@@ -2,7 +2,6 @@
=============================================================================
Build file used by the different Cactus subprojects. It contains common
Ant properties and common useful targets.
-
$Id$
=============================================================================
@@ -21,7 +20,7 @@
<property name="project.version.major" value="1"/>
<property name="project.version.minor" value="5"/>
- <property name="project.version.suffix" value="-rc1"/>
+ <property name="project.version.suffix" value="-beta2"/>
<property name="project.version"
value="${project.version.major}.${project.version.minor}${project.version.suffix}"/>
@@ -74,10 +73,14 @@
<target name="init.j2ee"
if="j2ee.dependant">
+ <!-- TODO: Improve this. We really need to split j2ee and servlet
+ verifications now that we have an EJB sample project. -->
+
<condition property="j2ee.api" value="13">
<available classname="javax.servlet.Filter">
<classpath>
<pathelement location="${j2ee.jar}"/>
+ <pathelement location="${servlet.jar}"/>
</classpath>
</available>
</condition>
@@ -85,6 +88,7 @@
<available classname="javax.servlet.Servlet">
<classpath>
<pathelement location="${j2ee.jar}"/>
+ <pathelement location="${servlet.jar}"/>
</classpath>
</available>
</condition>
@@ -215,6 +219,14 @@
<!-- The Sample Servlet dist -->
<property name="cactus.samples.servlet.bin"
location="samples/servlet/dist-${j2ee.api}/bin"/>
+
+ <!-- The Sample Jetty dist -->
+ <property name="cactus.samples.jetty.bin"
+ location="samples/jetty/dist-${j2ee.api}/bin"/>
+
+ <!-- The Sample EJB dist -->
+ <property name="cactus.samples.ejb.bin"
+ location="samples/ejb/dist-${j2ee.api}/bin"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
