vmassol 2003/01/25 13:49:48
Modified: petals/ant/src/scripts/share build-share.xml
petals/ant/src/confs/share/orion1x application.xml
default-web-site.xml
petals/ant/src/scripts/j2ee13 build.xml
Added: petals/ant/src/scripts/share build-tests-orion1x.xml
Log:
Added scripts for Orion 1.x (Tested with Orion 1.5.4 and 1.6.0)
Revision Changes Path
1.4 +1 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-share.xml 25 Jan 2003 11:29:39 -0000 1.3
+++ build-share.xml 25 Jan 2003 21:49:48 -0000 1.4
@@ -62,6 +62,7 @@
<!-- Filters -->
<filter token="cactus.port" value="${cactus.port}"/>
+ <filter token="cactus.context" value="${cactus.context}"/>
<!-- Initialize Cactus custom Ant task needed for running the server
tests -->
1.1
jakarta-cactus/petals/ant/src/scripts/share/build-tests-orion1x.xml
Index: build-tests-orion1x.xml
===================================================================
<!-- Global properties -->
<property name="cactus.conf.orion1x" value="${cactus.conf.dir}/orion1x"/>
<property name="cactus.target.orion1x" value="${cactus.target.dir}/orion1x"/>
<!--
========================================================================
Run Orion 1.x tests
========================================================================
-->
<target name="cactus.run.orion1x"
depends="cactus.init,cactus.setup.orion1x,cactus.war,cactus.deploy.orion1x"
if="cactus.home.orion1x" description="Run tests on Orion 1.x">
<!-- Start the servlet engine, wait for it to be started, run the
unit tests, stop the servlet engine, wait for it to be stopped.
The servlet engine is stopped if the tests fail for any reason -->
<runservertests
testURL="http://localhost:${cactus.port}/${cactus.context}/ServletRedirector?Cactus_Service=RUN_TEST";
startTarget="cactus.start.orion1x"
stopTarget="cactus.stop.orion1x"
testTarget="cactus.test"/>
</target>
<!--
========================================================================
Start Orion 1.x
========================================================================
-->
<target name="cactus.start.orion1x" description="Start Orion 1.x"
depends="cactus.check.orion1x" if="cactus.home.orion1x">
<java jvm="${cactus.jvm}" classname="com.evermind.server.ApplicationServer"
fork="yes">
<arg value="-config"/>
<arg value="${cactus.target.orion1x}/conf/server.xml"/>
<classpath>
<fileset dir="${cactus.home.orion1x}">
<include name="*.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Stop Orion 1.x
========================================================================
-->
<target name="cactus.stop.orion1x" description="Stop Orion 1.x"
depends="cactus.check.orion1x" if="cactus.home.orion1x">
<java jvm="${cactus.jvm}"
classname="com.evermind.client.orion.OrionConsoleAdmin"
fork="yes">
<arg value="ormi://localhost:23791/"/>
<arg value="admin"/>
<arg value="password"/>
<arg value="-shutdown"/>
<classpath>
<fileset dir="${cactus.home.orion1x}">
<include name="*.jar"/>
</fileset>
</classpath>
</java>
</target>
<!--
========================================================================
Display a warning message if the needed servlet engine home property
is not set
========================================================================
-->
<target name="cactus.check.orion1x" unless="cactus.home.orion1x">
<echo message=""/>
<echo message="******************************************************"/>
<echo message="WARNING : The 'cactus.home.orion1x' property has not"/>
<echo message="been set. No test will be run on that servlet engine."/>
<echo message="******************************************************"/>
<echo message=""/>
</target>
<!--
========================================================================
Deploy the cactified webapp
========================================================================
-->
<target name="cactus.deploy.orion1x"
description="Deploy the webapp on Orion 1.x">
<jar destfile="${cactus.target.orion1x}/${cactus.context}.war">
<fileset dir="${cactus.target.dir}/${cactus.context}"/>
</jar>
</target>
<!--
========================================================================
Set up a valid Orion 1.x directory structure in the
cactus.target.orion1x directory.
========================================================================
-->
<target name="cactus.setup.orion1x"
depends="cactus.check.orion1x" if="cactus.home.orion1x"
description="Set up a Orion 1.x directory structure">
<!-- Create work and conf directories and copy configuration files -->
<mkdir dir="${cactus.target.orion1x}"/>
<mkdir dir="${cactus.target.orion1x}/conf"/>
<!-- Orion need to have a /persistence directory created, otherwise
it throws an error -->
<mkdir dir="${cactus.target.orion1x}/persistence"/>
<copy todir="${cactus.target.orion1x}/conf" filtering="on">
<fileset dir="${cactus.conf.orion1x}"/>
</copy>
</target>
1.2 +1 -1
jakarta-cactus/petals/ant/src/confs/share/orion1x/application.xml
Index: application.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/confs/share/orion1x/application.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- application.xml 25 Jan 2003 21:15:05 -0000 1.1
+++ application.xml 25 Jan 2003 21:49:48 -0000 1.2
@@ -3,7 +3,7 @@
<orion-application>
- <web-module id="test" path="../test.war"/>
+ <web-module id="test" path="[EMAIL PROTECTED]@.war"/>
<security-role-mapping name="test">
<user name="testuser"/>
1.2 +2 -2
jakarta-cactus/petals/ant/src/confs/share/orion1x/default-web-site.xml
Index: default-web-site.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/petals/ant/src/confs/share/orion1x/default-web-site.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-web-site.xml 25 Jan 2003 21:15:05 -0000 1.1
+++ default-web-site.xml 25 Jan 2003 21:49:48 -0000 1.2
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<!DOCTYPE web-site PUBLIC "Orion Web-site"
"http://www.orionserver.com/dtds/web-site.dtd";>
-<web-site host="[ALL]" port="@test.port@" display-name="Default Orion WebSite">
+<web-site host="[ALL]" port="@cactus.port@" display-name="Default Orion WebSite">
<!-- The default web-app for this site, bound to the root -->
<default-web-app application="default" name="test"/>
- <web-app application="default" name="test" root="/test"/>
+ <web-app application="default" name="test" root="[EMAIL PROTECTED]@"/>
</web-site>
1.5 +2 -6 jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/petals/ant/src/scripts/j2ee13/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 25 Jan 2003 20:57:43 -0000 1.4
+++ build.xml 25 Jan 2003 21:49:48 -0000 1.5
@@ -5,10 +5,8 @@
<!ENTITY build-tests-tomcat4x SYSTEM "file:./scripts/build-tests-tomcat4x.xml">
<!ENTITY build-tests-jboss3x SYSTEM "file:./scripts/build-tests-jboss3x.xml">
<!ENTITY build-tests-resin2x SYSTEM "file:./scripts/build-tests-resin2x.xml">
+ <!ENTITY build-tests-orion1x SYSTEM "file:./scripts/build-tests-orion1x.xml">
<!--
- <!ENTITY build-tests-orion-14 SYSTEM "file:./scripts/build-tests-orion-14.xml">
- <!ENTITY build-tests-orion-15 SYSTEM "file:./scripts/build-tests-orion-15.xml">
- <!ENTITY build-tests-orion-16 SYSTEM "file:./scripts/build-tests-orion-16.xml">
<!ENTITY build-tests-weblogic-61 SYSTEM
"file:./scripts/build-tests-weblogic-61.xml">
<!ENTITY build-tests-weblogic-70 SYSTEM
"file:./scripts/build-tests-weblogic-70.xml">
-->
@@ -68,10 +66,8 @@
&build-tests-tomcat4x;
&build-tests-jboss3x;
&build-tests-resin2x;
+ &build-tests-orion1x;
<!--
- &build-tests-orion-14;
- &build-tests-orion-15;
- &build-tests-orion-16;
&build-tests-weblogic-61;
&build-tests-weblogic-70;
-->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
