5:31 a.m.
Author: objectiser
Date: 2011-02-10 06:31:33 -0500 (Thu, 10 Feb 2011)
New Revision: 1304
Added:
trunk/qa/hudson-riftsaw-local-as6.sh
Modified:
trunk/integration-tests/build.xml
trunk/qa/build.xml
Log:
Fix the AS6 server shutdown issue.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2011-02-09 14:35:00 UTC (rev 1303)
+++ trunk/integration-tests/build.xml 2011-02-10 11:31:33 UTC (rev 1304)
@@ -17,7 +17,15 @@
<condition property="is.cxf.ws.stack">
<equals arg1="${ws.stack}" arg2="cxf"/>
</condition>
-
+
+ <condition property="shutdown.parameters" value="-s
jnp://localhost:1099 --shutdown" >
+ <equals arg1="${as.version}" arg2="5"/>
+ </condition>
+
+ <condition property="shutdown.parameters" value="-s
service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi" >
+ <equals arg1="${as.version}" arg2="6"/>
+ </condition>
+
<condition property="is.db2.driver.available">
<or>
<not>
@@ -147,14 +155,17 @@
<echo>Stopping the server</echo>
<echo>Server is at ${org_jboss_as_home}</echo>
+ <echo>Shutting down server version ${as.version} with parameters
${shutdown.parameters}</echo>
+
<java classname="org.jboss.Shutdown" fork="true"
failonerror="false" resultproperty="shutdown.rc">
- <arg line="-s jnp://localhost:1099 --shutdown"/>
+ <arg line="${shutdown.parameters}"/>
<classpath>
<pathelement
path="${org_jboss_as_home}/bin/shutdown.jar"/>
<pathelement
path="${org_jboss_as_home}/client/jbossall-client.jar"/>
<pathelement path="${JAVA_HOME}/lib/tools.jar"/>
</classpath>
</java>
+
<echo>Shutdown rc = ${shutdown.rc}</echo>
<condition property="shutdown.okay">
<equals arg1="${shutdown.rc}" arg2="0"/>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2011-02-09 14:35:00 UTC (rev 1303)
+++ trunk/qa/build.xml 2011-02-10 11:31:33 UTC (rev 1304)
@@ -86,6 +86,14 @@
<equals arg1="true" arg2="${replace.qa.jdbc}" />
</condition>
+ <condition property="shutdown.parameters" value="-s
jnp://localhost:1099 --shutdown" >
+ <equals arg1="${as.version}" arg2="5"/>
+ </condition>
+
+ <condition property="shutdown.parameters" value="-s
service:jmx:rmi:///jndi/rmi://localhost:1090/jmxrmi" >
+ <equals arg1="${as.version}" arg2="6"/>
+ </condition>
+
<!-- remove the riftsaw.home -->
<target name="clean"
description="Clean the RiftSaw home">
@@ -244,8 +252,10 @@
<echo>Stopping the server</echo>
<echo>Server is at ${org_jboss_as_home}</echo>
- <java classname="org.jboss.Shutdown" fork="true"
failonerror="false" resultproperty="shutdown.rc">
- <arg line="-s jnp://localhost:1099 --shutdown"/>
+ <echo>Shutting down server version ${as.version} with parameters
${shutdown.parameters}</echo>
+
+ <java classname="org.jboss.Shutdown" fork="true"
failonerror="false" resultproperty="shutdown.rc">
+ <arg line="${shutdown.parameters}"/>
<classpath>
<pathelement
path="${org_jboss_as_home}/bin/shutdown.jar"/>
<pathelement
path="${org_jboss_as_home}/client/jbossall-client.jar"/>
Added: trunk/qa/hudson-riftsaw-local-as6.sh
===================================================================
--- trunk/qa/hudson-riftsaw-local-as6.sh (rev 0)
+++ trunk/qa/hudson-riftsaw-local-as6.sh 2011-02-10 11:31:33 UTC (rev 1304)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Run Riftsaw Integration tests.
+
+MAVEN_OPTS="-Xms512M -Xmx1024M"
+
+RIFTSAW_PARENT_DIR="$1"
+DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
+
+JBOSS_VERSION="6.0.0.Final"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
+AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
+AS_CONFIG="default"
+REPLACE_QA_JDBC="true"
+JBOSS_ESB_VERSION="4.9"
+JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
+
+STARTUP_TIME="3"
+
+DATABASE=hsql
+
+WS_STACK="native"
+WS_VERSION="3.1.2.GA" # so we don't overwrite the cxf 3.4.1 installed
with as6
+WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
+
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR
-Djboss.filename=jboss-as-distribution-${JBOSS_VERSION}.zip -Das.version=6
-Ddatabase=$DATABASE -Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg_jboss_as_home=$AS_HOME
-Dorg_jboss_as_config=$AS_CONFIG -Djboss.version=$JBOSS_VERSION
-Djbossesb.version=$JBOSS_ESB_VERSION -Dws.stack=$WS_STACK -Dws.version=$WS_VERSION
-Dws.stack.dir=$WS_STACK_DIR -Dorg_jboss_esb_home=$JBOSS_ESB_HOME
-Ddownload.dir=$DOWNLOAD_DIR -Dstartup.time=$STARTUP_TIME -Dtest.delay=$TEST_DELAY
-Dtestesb=false"
+echo ANT_PROPERTIES=${ANT_PROPERTIES}
+
+# build RiftSaw and running unit test
+cd ..
+mvn clean install
+#-Pdocs -Dmaven.repo.local=${WORKSPACE}/m2-repo
+
+# run integration test
+cd qa
+ant $ANT_PROPERTIES stop-server
+ant $ANT_PROPERTIES clean
+ant $ANT_PROPERTIES install.jbossas #was install.jbossesb
+
+# build the RiftSaw and run integration tests
+
+cd ../integration-tests
+mvn $ANT_PROPERTIES clean install
+#-Dmaven.repo.local=${WORKSPACE}/m2-repo
Property changes on: trunk/qa/hudson-riftsaw-local-as6.sh
___________________________________________________________________
Name: svn:executable
+ *