vmassol 2002/12/01 11:30:15
Modified: sample-servlet/conf/sample/build/j2ee13 build.xml
sample-servlet build.xml
sample-servlet/conf/sample/conf/test/j2ee13 web.xml
documentation/docs/xdocs changes.xml todo.xml
Added: sample-servlet/conf/sample/conf/test/j2ee13/jboss3x
users.properties roles.properties jboss-web.xml
sample-servlet/conf/sample/build/j2ee13
build-tests-jboss-3x.xml
Log:
Added automated Ant scripts for JBoss/Jetty 3.x.
Note 1: The TestJspTagLifecycle fails the tests on JBoss/Jetty (dunno why yet).
Note 2: The BASIC authentication is not yet configured properly
Revision Changes Path
1.1
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/jboss3x/users.properties
Index: users.properties
===================================================================
testuser=testpassword
admin=admin
1.1
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/jboss3x/roles.properties
Index: roles.properties
===================================================================
testuser=test
admin=JBossAdmin
1.1
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/jboss3x/jboss-web.xml
Index: jboss-web.xml
===================================================================
<jboss-web>
<security-domain>java:/jaas/other</security-domain>
</jboss-web>
1.4 +3 -1 jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 20 Jul 2002 12:48:14 -0000 1.3
+++ build.xml 1 Dec 2002 19:30:15 -0000 1.4
@@ -10,6 +10,7 @@
<!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
<!ENTITY build-tests-weblogic-61 SYSTEM "file:./build-tests-weblogic-61.xml">
<!ENTITY build-tests-weblogic-70 SYSTEM "file:./build-tests-weblogic-70.xml">
+ <!ENTITY build-tests-jboss-3x SYSTEM "file:./build-tests-jboss-3x.xml">
]>
<!--
@@ -82,7 +83,7 @@
========================================================================
-->
<target name="test.all"
-
depends="test.resin.20,test.resin.13,test.tomcat.40,test.orion.14,test.orion.15,test.orion.16,test.weblogic.61,test.weblogic.70"
+
depends="test.resin.20,test.resin.13,test.tomcat.40,test.orion.14,test.orion.15,test.orion.16,test.weblogic.61,test.weblogic.70,test.jboss.3x"
description="Run tests on all defined containers">
</target>
@@ -94,5 +95,6 @@
&build-tests-tomcat-40;
&build-tests-weblogic-61;
&build-tests-weblogic-70;
+ &build-tests-jboss-3x;
</project>
1.1
jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build-tests-jboss-3x.xml
Index: build-tests-jboss-3x.xml
===================================================================
<!--
========================================================================
Run JBoss 3.x tests
========================================================================
-->
<target name="test.jboss.3x" depends="prepare.test.jboss.3x"
if="jboss.home.3x" description="Run tests on JBoss 3.x">
<!-- Start the container, wait for it to be started, run the
unit tests, stop the container, wait for it to be stopped.
The container is stopped if the tests fail for any reason -->
<runservertests
testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST";
startTarget="start.jboss.3x"
stopTarget="stop.jboss.3x"
testTarget="test"/>
</target>
<!--
========================================================================
Start JBoss 3.x
========================================================================
-->
<target name="start.jboss.3x">
<java classname="org.jboss.Main" fork="yes">
<jvmarg value="-Dprogram.name=${jboss.home.3x}/bin/run.bat"/>
<jvmarg
value="-Djboss.server.home.dir=${target.jboss3x.dir}/server/cactus"/>
<jvmarg
value="-Djboss.server.home.url=file://${basedir}/${target.jboss3x.dir}/server/cactus"/>
<arg line="-c cactus"/>
<classpath>
<pathelement location="${jboss.home.3x}/bin/run.jar"/>
<pathelement path="${java.home}/../lib/tools.jar"/>
<!--fileset dir="${jboss.home.3x}/lib">
<include name="*.jar"/>
</fileset-->
</classpath>
</java>
</target>
<!--
========================================================================
Stop JBoss 3.x
========================================================================
-->
<target name="stop.jboss.3x">
<java classname="org.jboss.Shutdown" fork="yes">
<arg value="localhost"/>
<arg value="8080"/>
<classpath>
<pathelement location="${jboss.home.3x}/bin/shutdown.jar"/>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed container home property
is not set
========================================================================
-->
<target name="check.test.jboss.3x" unless="jboss.home.3x">
<echo message=""/>
<echo message="******************************************************"/>
<echo message="WARNING : The 'jboss.home.3x' property has not been "/>
<echo message="set. No test will be run on that container."/>
<echo message="******************************************************"/>
<echo message=""/>
</target>
<!--
========================================================================
Prepare directories and variables for running the tests
========================================================================
-->
<target name="prepare.test.jboss.3x"
depends="check.test.jboss.3x,testwar" if="jboss.home.3x">
<echo message="jboss.home.3x = ${jboss.home.3x}"/>
<property name="target.jboss3x.dir" value="${target.test.dir}/jboss3x"/>
<property name="conf.jboss3x.dir" value="${conf.test.dir}/jboss3x"/>
<!-- Create a server configuration using the minimal JBoss
configuration and adding the JBossWeb Service -->
<copy todir="${target.jboss3x.dir}/server/cactus">
<fileset dir="${jboss.home.3x}/server/minimal"/>
<!--fileset dir="${jboss.home.3x}/server/default"/-->
</copy>
<copy todir="${target.jboss3x.dir}/server/cactus/deploy/jbossweb.sar">
<fileset dir="${jboss.home.3x}/server/default/deploy/jbossweb.sar"/>
</copy>
<copy todir="${target.jboss3x.dir}/server/cactus/lib">
<fileset dir="${jboss.home.3x}/server/default/lib">
<include name="javax.servlet.jar"/>
<include name="jboss.jar"/>
</fileset>
</copy>
<!-- Create the war file -->
<copy file="${target.test.dir}/test.war"
tofile="${target.jboss3x.dir}/server/cactus/deploy/test.war"/>
<!-- Update the war to include the proprietary jboss-web.xml and
*.properties config files. -->
<!-- Hack: Make sure jboss-web.xml is always newer than the war so that
the later is always updated. Waiting for an Ant bug fix -->
<touch file="${target.jboss3x.dir}/server/cactus/deploy/test.war"
datetime="06/28/2000 2:02 pm"/>
<war update="true"
warfile="${target.jboss3x.dir}/server/cactus/deploy/test.war">
<!--webinf dir="${conf.jboss3x.dir}">
<include name="jboss-web.xml"/>
</webinf-->
<classes dir="${conf.jboss3x.dir}">
<include name="*.properties"/>
</classes>
</war>
</target>
1.15 +1 -0 jakarta-cactus/sample-servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 24 Nov 2002 21:44:55 -0000 1.14
+++ build.xml 1 Dec 2002 19:30:15 -0000 1.15
@@ -362,6 +362,7 @@
<property name="weblogic.home.61"/>
<property name="weblogic.home.70"/>
<property name="enhydra.home.31"/>
+ <property name="jboss.home.3x"/>
<property name="test.port"/>
<property name="log4j.jar"/>
<property name="clover.jar"/>
1.2 +1 -0
jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/web.xml
Index: web.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/sample-servlet/conf/sample/conf/test/j2ee13/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 10 Mar 2002 14:26:02 -0000 1.1
+++ web.xml 1 Dec 2002 19:30:15 -0000 1.2
@@ -101,6 +101,7 @@
<login-config>
<auth-method>BASIC</auth-method>
+ <realm-name>Sample Cactus Servlet Application</realm-name>
</login-config>
<security-role>
1.61 +3 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- changes.xml 24 Nov 2002 21:44:55 -0000 1.60
+++ changes.xml 1 Dec 2002 19:30:15 -0000 1.61
@@ -48,6 +48,9 @@
</devs>
<release version="1.5" date="- in CVS">
+ <action dev="VMA" type="add">
+ Added automated Ant scripts for JBoss/Jetty 3.x.
+ </action>
<action dev="VMA" type="add" due-to="Christopher Lenz"
due-to-email="[EMAIL PROTECTED]">
Added new extension class to help unit test JSP Taglibs. See the
<code>TestJspTagLifecycle</code> test class in the sample-servlet
1.34 +1 -1 jakarta-cactus/documentation/docs/xdocs/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/todo.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- todo.xml 29 Nov 2002 08:14:53 -0000 1.33
+++ todo.xml 1 Dec 2002 19:30:15 -0000 1.34
@@ -61,7 +61,7 @@
Add support for Enhydra 5.
</action>
<action>
- Add Ant scripts for JBoss/Tomcat and JBoss/Jetty.
+ Add Ant scripts for JBoss/Tomcat.
</action>
<action assigned-to="IAS">
Migrate from Stylebook to Velocity-Anakia.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
