vmassol 2003/02/03 00:58:50
Modified: petals/ant/src/scripts/share build-tests-weblogic7x.xml
build-tests-resin2x.xml build-share.xml
build-tests-weblogic6x.xml
Log:
Major refactoring of the build systems and directory layout:
* Factorized common build parts into build-common.xml and normalized the builds
* Added "release" target to all builds
* Moved the sample-servlet and sample-jetty to samples/servlet and samples/jetty
* Moved the web site upload to the documentation build
* Simplified to the extreme the main Cactus build.xml and removed the
build-admin.xml scripts
* Removed some Ant tasks that were in anttasks/ as they are now in the Ant Petal
* Some other cosmetic changes
* Added scripts for Tomcat 3.x (However, I get a strange error while running Tomcat
3.3.1. Not sure why yet (some flushbuffer() jasper error))
* WL 7.x script has been tested and works (for JDK < 1.4)
Several issues/todos remain:
* The Gump build is probably not working at all (I'll correct it as I receive Gump
email notifications of errors)
* The Clover report is currently broken (i.e. not generated)
* The sample-jetty needs to be put in line with the new build system and use the new
Ant Petal
* Pb of order in Sample Servlet test cases (one of the test must run before the
other but this is not currently possible with the Ant Petal)
* WL 6.x script needs to be tested
Revision Changes Path
1.7 +18 -9
jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml
Index: build-tests-weblogic7x.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic7x.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-tests-weblogic7x.xml 31 Jan 2003 11:17:40 -0000 1.6
+++ build-tests-weblogic7x.xml 3 Feb 2003 08:58:50 -0000 1.7
@@ -9,7 +9,7 @@
value="${cactus.home.weblogic7x}/weblogic700/server"/>
<!-- Allow additional libraries to be added -->
- <property name="cactus.weblogic6x.libpath" value=""/>
+ <property name="cactus.weblogic7x.libpath" value=""/>
<!--
========================================================================
@@ -17,7 +17,7 @@
========================================================================
-->
<target name="cactus.run.weblogic7x"
-
depends="cactus.init,cactus.setup.weblogic7x,cactus.war,cactus.deploy.weblogic7x"
+
depends="cactus.check.weblogic7x,cactus.init,cactus.setup.weblogic7x,cactus.war,cactus.deploy.weblogic7x"
if="cactus.home.weblogic7x" description="Run tests on WebLogic 7.x">
<!-- Start the servlet engine, wait for it to be started, run the
@@ -40,6 +40,14 @@
<target name="cactus.start.weblogic7x" description="Start WebLogic 7.x"
depends="cactus.check.weblogic7x" if="cactus.home.weblogic7x">
+ <available property="cactus.jdk1.4+"
+ classname="java.lang.CharSequence"/>
+ <fail if="cactus.jdk1.4+">Our script does not yet support running
+WL 7.x under JDK 1.4+. Please submit a patch!</fail>
+
+ <property name="cactus.weblogic7x.java.library.path"
+
location="${java.library.path};${cactus.weblogic7x.libpath};${cactus.weblogic7x.server}/bin"/>
+
<java jvm="${cactus.jvm}" classname="weblogic.Server" fork="yes"
dir="${cactus.target.weblogic7x}/testdomain">
@@ -47,14 +55,12 @@
<pathelement
location="${cactus.weblogic7x.server}/lib/weblogic_sp.jar"/>
<pathelement
location="${cactus.weblogic7x.server}/lib/weblogic.jar"/>
</classpath>
-
+
<jvmarg value="-hotspot"/>
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
- <!-- TODO: Add support for Unix -->
- <jvmarg
value="-Djava.library.path=${java.library.path};${cactus.weblogic7x.server}/bin;${cactus.weblogic7x.libpath}"/>
-
+ <jvmarg
value="-Djava.library.path=${cactus.weblogic7x.java.library.path}"/>
<jvmarg value="-Dweblogic.Name=testserver"/>
<jvmarg value="-Dbea.home=${cactus.home.weblogic7x}"/>
<jvmarg value="-Dweblogic.management.username=system"/>
@@ -111,7 +117,8 @@
Deploy the cactified webapp
========================================================================
-->
- <target name="cactus.deploy.weblogic7x" if="cactus.home.weblogic7x"
+ <target name="cactus.deploy.weblogic7x" depends="cactus.check.weblogic7x"
+ if="cactus.home.weblogic7x"
description="Deploy the webapp on WebLogic 7.x">
<!-- Copy the webapp -->
@@ -140,7 +147,8 @@
========================================================================
-->
<target name="cactus.setup.weblogic7x"
- depends="cactus.init, cactus.check.weblogic7x" if="cactus.home.weblogic7x"
+ depends="cactus.check.weblogic7x,cactus.init"
+ if="cactus.home.weblogic7x"
description="Set up a WebLogic 7.x directory structure">
<mkdir dir="${cactus.target.weblogic7x}/testdomain/applications"/>
@@ -168,7 +176,8 @@
Clean generated files (including distributables)
========================================================================
-->
- <target name="cactus.clean.weblogic7x" depends="cactus.init, cactus.clean"
description="Clean target directory">
+ <target name="cactus.clean.weblogic7x" depends="cactus.init,cactus.clean"
+ description="Clean target directory">
<delete includeEmptyDirs="true">
<fileset dir="${cactus.target.weblogic7x}"/>
</delete>
1.5 +2 -2
jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml
Index: build-tests-resin2x.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-resin2x.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-resin2x.xml 31 Jan 2003 11:17:40 -0000 1.4
+++ build-tests-resin2x.xml 3 Feb 2003 08:58:50 -0000 1.5
@@ -45,7 +45,7 @@
<jvmarg value="-Dresin.home=${cactus.target.resin2x}"/>
<classpath>
- <pathelement location="${cactus.petal.ant.jar}"/>
+ <pathelement location="${cactus.antpetal.jar}"/>
<fileset dir="${cactus.home.resin2x}/lib">
<include name="*.jar"/>
</fileset>
@@ -69,7 +69,7 @@
<arg value="-stop"/>
<classpath>
- <pathelement location="${cactus.petal.ant.jar}"/>
+ <pathelement location="${cactus.antpetal.jar}"/>
<fileset dir="${cactus.home.resin2x}/lib">
<include name="*.jar"/>
</fileset>
1.9 +5 -4 jakarta-cactus/petals/ant/src/scripts/share/build-share.xml
Index: build-share.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-share.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build-share.xml 31 Jan 2003 12:14:18 -0000 1.8
+++ build-share.xml 3 Feb 2003 08:58:50 -0000 1.9
@@ -11,7 +11,8 @@
<property name="cactus.src.includes" value="**/*Test*.java"/>
<!-- Default Cactus test files to exclude from the test -->
- <property name="cactus.src.excludes" value="**/AllTests.java"/>
+ <property name="cactus.src.excludes"
+ value="**/AllTests.java,**/Test*All.java"/>
<!-- Default Java VM to use for java Ant tasks -->
<property name="cactus.jvm" value="java"/>
@@ -34,8 +35,8 @@
<property name="cactus.target.classes.dir"
value="${cactus.target.dir}/classes"/>
<!-- Cactus related jar locations -->
- <property name="cactus.petal.ant.jar"
- value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
+ <property name="cactus.antpetal.jar"
+ value="${cactus.lib.client.dir}[EMAIL PROTECTED]@"/>
<property name="cactus.framework.jar"
value="${cactus.lib.common.dir}[EMAIL PROTECTED]@"/>
@@ -69,7 +70,7 @@
<taskdef name="runservertests"
classname="org.apache.cactus.petal.ant.RunServerTestsTask">
<classpath>
- <pathelement location="${cactus.petal.ant.jar}"/>
+ <pathelement location="${cactus.antpetal.jar}"/>
</classpath>
</taskdef>
1.5 +4 -3
jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml
Index: build-tests-weblogic6x.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/scripts/share/build-tests-weblogic6x.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-tests-weblogic6x.xml 31 Jan 2003 11:17:40 -0000 1.4
+++ build-tests-weblogic6x.xml 3 Feb 2003 08:58:50 -0000 1.5
@@ -40,6 +40,9 @@
<target name="cactus.start.weblogic6x" description="Start WebLogic 6.x"
depends="cactus.check.weblogic6x" if="cactus.home.weblogic6x">
+ <property name="cactus.weblogic6x.java.library.path"
+
location="${java.library.path};${cactus.weblogic6x.libpath};${cactus.weblogic6x.server}/bin"/>
+
<java jvm="${cactus.jvm}" classname="weblogic.Server" fork="yes"
dir="${cactus.target.weblogic6x}">
@@ -52,9 +55,7 @@
<jvmarg value="-ms64m"/>
<jvmarg value="-mx64m"/>
- <!-- TODO: Add support for Unix -->
- <jvmarg
value="-Djava.library.path=${java.library.path};${cactus.weblogic6x.server}/bin;${cactus.weblogic6x.libpath}"/>
-
+ <jvmarg
value="-Djava.library.path=${cactus.weblogic6x.java.library.path}"/>
<jvmarg value="-Dweblogic.RootDirectory=."/>
<jvmarg value="-Dweblogic.Domain=testdomain"/>
<jvmarg value="-Dweblogic.Name=testserver"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
