10:25 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 23:25:25 -0400 (Thu, 31 May 2007)
New Revision: 3348
Added:
trunk/build/hudson/jboss/bin/http-spider.sh
Removed:
trunk/build/hudson/jboss/bin/http.sh
Modified:
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
Log:
Fix deploy macros. Add timeout to http-spider
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-05-31 19:40:02 UTC
(rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-01 03:25:25 UTC
(rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-05-31 19:40:02 UTC
(rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-01 03:25:25 UTC
(rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-05-31 19:40:02
UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 03:25:25
UTC (rev 3348)
@@ -46,7 +46,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-31
19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01
03:25:25 UTC (rev 3348)
@@ -38,7 +38,7 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http.sh $JBOSS_BINDADDR:8080
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
if [ "$?" -eq 1 ]; then
echo "Failed to start jboss"
exit 1
Copied: trunk/build/hudson/jboss/bin/http-spider.sh (from rev 3346,
trunk/build/hudson/jboss/bin/http.sh)
===================================================================
--- trunk/build/hudson/jboss/bin/http-spider.sh (rev 0)
+++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 03:25:25 UTC (rev 3348)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+#
+# Simple helper that checks if an HTTP host is available.
+# (Relies on wget)
+#
+# Within hudson it can be used to test if the AS instance
+# has successfully booted.
+#
+# @author Heiko.Braun(a)jboss.com
+#
+
+TIMEOUT=2 # wget timeout in sec
+SLEEP_TIME=10 # the actual sleep time in between test
+NUM_RETRIES=12 # equals 120 seconds before exit
+
+if [ "x$1" = "x" ]; then
+ echo "Usage: http.sh <hostname:port>"
+ exit 0
+fi
+
+COUNTER=0
+while [ $COUNTER -lt $NUM_RETRIES ]; do
+ if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then
+ echo "'$1' is available"
+ exit 0
+ else
+ echo "'$1' does not respond, wait another $SLEEP_TIME seconds"
+ fi
+ sleep $SLEEP_TIME
+ let COUNTER=COUNTER+1
+done
+
+echo "Unable to connect to $1, exiting..."
+exit 1
+
+
Deleted: trunk/build/hudson/jboss/bin/http.sh
===================================================================
--- trunk/build/hudson/jboss/bin/http.sh 2007-05-31 19:40:02 UTC (rev 3347)
+++ trunk/build/hudson/jboss/bin/http.sh 2007-06-01 03:25:25 UTC (rev 3348)
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-#
-# Simple helper that checks if an HTTP host is available.
-# (Relies on wget)
-#
-# Within hudson it can be used to test if the AS instance
-# has successfully booted.
-#
-# @author Heiko.Braun(a)jboss.com
-#
-
-SLEEP_TIME=10 # the actual sleep time in between test
-NUM_RETRIES=12 # equals 120 seconds before exit
-
-if [ "x$1" = "x" ]; then
- echo "Usage: http.sh <hostname:port>"
- exit 0
-fi
-
-COUNTER=0
-while [ $COUNTER -lt $NUM_RETRIES ]; do
- if wget --spider $1 &> /dev/null; then
- echo "'$1' is available"
- exit 0
- else
- echo "'$1' does not respond, wait another $SLEEP_TIME seconds"
- fi
- sleep $SLEEP_TIME
- let COUNTER=COUNTER+1
-done
-
-echo "Unable to connect to $1, exiting..."
-exit 1
-
-
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-31 19:40:02 UTC (rev
3347)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-01 03:25:25 UTC (rev
3348)
@@ -12,83 +12,46 @@
<!-- $Id$ -->
<project>
-
- <import
file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50"
depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to
jboss50">
- <ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50"
inheritall="false"/>
- <macro-deploy-native50
- spilibs="${spi.dir}/output/lib"
- jbosslibs="${int.jboss50.dir}/output/lib"
- corelibs="${core.dir}/output/lib"
- stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty">
- <!--copy-tasks>
- <copy todir="${jboss50.home}/bin"
overwrite="true">
- <fileset dir="${build.dir}/etc">
- <include name="*.bat"/>
- <include name="*.sh"/>
- </fileset>
- </copy>
- </copy-tasks-->
-
- </macro-deploy-native50>
- </target>
-
- <!-- Remove jbossws from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare"
description="Remove jbossws from jboss50">
- <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50"
inheritall="false"/>
- <macro-undeploy-native50>
- <!--delete-tasks>
- <delete>
- <fileset dir="${jboss50.home}/bin">
- <include name="ws*.sh"/>
- <include name="ws*.bat"/>
- </fileset>
- </delete>
- </delete-tasks-->
- </macro-undeploy-native50>
- </target>
-
- <!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42"
depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to
jboss42">
- <ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
- <macro-deploy-native42
- spilibs="${spi.dir}/output/lib"
- jbosslibs="${int.jboss42.dir}/output/lib"
- corelibs="${core.dir}/output/lib"
- stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty">
- <copy-tasks>
- <copy todir="${jboss42.home}/bin"
overwrite="true">
- <fileset dir="${build.dir}/etc">
- <include name="*.bat"/>
- <include name="*.sh"/>
- </fileset>
- </copy>
- </copy-tasks>
- </macro-deploy-native42>
- </target>
-
- <!-- Remove jbossws from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare"
description="Remove jbossws from jboss42">
- <macro-undeploy-native42>
- <delete-tasks>
- <delete>
- <fileset dir="${jboss42.home}/bin">
- <include name="ws*.sh"/>
- <include name="ws*.bat"/>
- </fileset>
- </delete>
- </delete-tasks>
- </macro-undeploy-native42>
- </target>
+
+ <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <!-- Deploy jbossws to jboss50 -->
+ <target name="deploy-jboss50"
depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to
jboss50">
+ <ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="deploy-jboss50"
inheritall="false"/>
+ <macro-deploy-native50
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss50.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ stacklibs="${int.native.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss50 -->
+ <target name="undeploy-jboss50" depends="prepare"
description="Remove jbossws from jboss50">
+ <ant antfile="${spi.dir}/build.xml" target="undeploy-jboss50"
inheritall="false"/>
+ <macro-undeploy-native50/>
+ </target>
+
+ <!-- Deploy jbossws to jboss42 -->
+ <target name="deploy-jboss42"
depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to
jboss42">
+ <ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
+ <macro-deploy-native42
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ stacklibs="${int.native.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
+
+ <!-- Remove jbossws from jboss42 -->
+ <target name="undeploy-jboss42" depends="prepare"
description="Remove jbossws from jboss42">
+ <macro-undeploy-native42/>
+ </target>
</project>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-31 19:40:02 UTC
(rev 3347)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 03:25:25 UTC
(rev 3348)
@@ -23,7 +23,6 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
<sequential>
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
@@ -67,8 +66,6 @@
</fileset>
</copy>
- <copy-tasks/>
-
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="(a){stacklibs}/jbossws-native50-deployer.zip"/>
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
@@ -81,7 +78,6 @@
</macrodef>
<macrodef name="macro-undeploy-native50">
- <element name="delete-tasks" optional="yes"/>
<sequential>
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
<delete>
@@ -122,8 +118,6 @@
<delete
file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
<!-- Undeploy juddi-service.sar -->
<delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-
- <delete-tasks/>
</sequential>
</macrodef>
@@ -133,7 +127,6 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
- <element name="copy-tasks" optional="yes"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
<copy todir="${jboss42.home}/client" overwrite="true">
@@ -168,8 +161,6 @@
</fileset>
</copy>
- <copy-tasks/>
-
<mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="(a){stacklibs}/jbossws-native42.sar"/>
<!-- Deploy juddi-service.sar -->
@@ -179,7 +170,6 @@
</macrodef>
<macrodef name="macro-undeploy-native42">
- <element name="delete-tasks" optional="yes"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
<delete>
@@ -216,8 +206,6 @@
<delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<!-- Undeploy juddi-service.sar -->
<delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
-
- <delete-tasks/>
</sequential>
</macrodef>
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-31 19:40:02 UTC
(rev 3347)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 03:25:25 UTC
(rev 3348)
@@ -25,6 +25,15 @@
<sequential>
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
<copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -32,12 +41,6 @@
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
</fileset>
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
@@ -69,9 +72,8 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
-
<include name="jbossws-jboss50.jar"/>
-
+ <include name="jbossws-spi.jar"/>
<include name="jbossws-sunri-client.jar"/>
</fileset>
<fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
@@ -90,6 +92,15 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
<copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{stacklibs}">
+ <include name="jbossws-sunri-client.jar"/>
+ </fileset>
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -97,9 +108,6 @@
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
</fileset>
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
</copy>
<copy todir="${jboss42.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
@@ -112,11 +120,6 @@
<include name="jbossws-jboss42.jar"/>
</fileset>
</copy>
- <copy todir="${jboss42.home}/client">
- <fileset dir="@{stacklibs}">
- <include name="jbossws-sunri-client.jar"/>
- </fileset>
- </copy>
<mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
<unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="(a){stacklibs}/jbossws-sunri42.sar"/>
</sequential>
@@ -132,9 +135,8 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
-
<include name="jbossws-jboss42.jar"/>
-
+ <include name="jbossws-spi.jar"/>
<include name="jbossws-sunri-client.jar"/>
</fileset>
<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-31 19:40:02 UTC
(rev 3347)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 03:25:25 UTC
(rev 3348)
@@ -26,17 +26,17 @@
<sequential>
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
<copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
@@ -85,17 +85,17 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
<copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
</copy>
<copy todir="${jboss42.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">