JBossWS SVN: r3358 - in trunk: integration/sunri/src/test/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 07:13:38 -0400 (Fri, 01 Jun 2007)
New Revision: 3358
Modified:
trunk/build/version.properties
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
Log:
Enable sunri oneway
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-06-01 11:02:01 UTC (rev 3357)
+++ trunk/build/version.properties 2007-06-01 11:13:38 UTC (rev 3358)
@@ -34,4 +34,4 @@
# Hudson setup
apache-tomcat=5.5.20
-sun-hudson=1.93
+sun-hudson=1.106
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:02:01 UTC (rev 3357)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:13:38 UTC (rev 3358)
@@ -8,7 +8,6 @@
# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
-org/jboss/test/ws/jaxws/samples/oneway/**
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-06-01 11:02:01 UTC (rev 3357)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-06-01 11:13:38 UTC (rev 3358)
@@ -60,7 +60,7 @@
QName serviceName = new QName(targetNS, "PingEndpointService");
QName portName = new QName(targetNS, "PingEndpointPort");
Service service = Service.create(wsdlURL, serviceName);
- Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD);
+ Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD);
String payload = "<ns1:ping xmlns:ns1='http://oneway.samples.jaxws.ws.test.jboss.org/'/>";
dispatch.invokeOneWay(new StreamSource(new StringReader(payload)));
17 years, 6 months
- 1
- 0
JBossWS SVN: r3357 - in trunk/build/hudson/hudson-home/jobs: Core-Tests-AS-5.0 and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-01 07:02:01 -0400 (Fri, 01 Jun 2007)
New Revision: 3357
Modified:
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
Log:
2nd generation bootstrap error checking
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -46,11 +46,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
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-06-01 10:58:04 UTC (rev 3356)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-01 11:02:01 UTC (rev 3357)
@@ -38,11 +38,13 @@
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080
-if [ "$?" -eq 1 ]; then
- echo "Failed to start jboss"
- exit 1
-fi
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $JBWSDIR
+if [ -e $JBWSDIR/spider.failed ]; then
+ echo "Failed"
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+echo "Success"
#
# execute tests
17 years, 6 months
- 1
- 0
JBossWS SVN: r3356 - trunk/build/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-01 06:58:04 -0400 (Fri, 01 Jun 2007)
New Revision: 3356
Modified:
trunk/build/hudson/jboss/bin/http-spider.sh
Log:
Rely on files instead of exit codes. Seems to interfere with hudson
Modified: trunk/build/hudson/jboss/bin/http-spider.sh
===================================================================
--- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 08:22:21 UTC (rev 3355)
+++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 10:58:04 UTC (rev 3356)
@@ -10,32 +10,37 @@
#
# @author Heiko.Braun(a)jboss.com
#
-# $Id: $
+# $Revision: $
#
#############################################################
-TIMEOUT=2 # wget timeout in sec
-SLEEP_TIME=10 # the actual sleep time in between test
-NUM_RETRIES=12 # equals 120 seconds before exit
+TIMEOUT=10 # wget timeout in sec
+SLEEP_TIME=5 # the actual sleep time in between test
+NUM_RETRIES=2 # equals 120 seconds before exit
if [ "x$1" = "x" ]; then
- echo "Usage: http.sh <hostname:port>"
- exit 0
+ echo "Usage: http.sh <hostname:port>"
fi
+# cleanup
+rm ./spider.success 2&>1 /dev/null
+rm ./spider.failed 2&>1 /dev/null
+
COUNTER=0
while [ $COUNTER -lt $NUM_RETRIES ]; do
if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then
- echo "Try $COUNTER: '$1' is available"
+ touch ./spider.success
+ echo "Try $COUNTER: '$1' is available" > ./spider.success
exit 0
else
- echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds"
+ echo "Try $COUNTER: '$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
+touch ./spider.failed
+echo "Unable to connect to $1, exiting..." > spider.failed
+exit 0
17 years, 6 months
- 1
- 0
JBossWS SVN: r3355 - in trunk/integration: sunri/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-01 04:22:21 -0400 (Fri, 01 Jun 2007)
New Revision: 3355
Modified:
trunk/integration/spi/etc/wsprovide.sh
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
Log:
Additional binary dependencies for SunRIProviderImpl
Modified: trunk/integration/spi/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/etc/wsprovide.sh 2007-06-01 07:15:13 UTC (rev 3354)
+++ trunk/integration/spi/etc/wsprovide.sh 2007-06-01 08:22:21 UTC (rev 3355)
@@ -79,6 +79,10 @@
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
echo "Seems to be a Sun-RI stack deployed"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-sunri-client.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
else
echo "Seems to be a JBossWS-Native stack deployed"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 07:15:13 UTC (rev 3354)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 08:22:21 UTC (rev 3355)
@@ -24,6 +24,8 @@
<attribute name="thirdpartylibs"/>
<sequential>
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+
+ <!-- CLIENT JARS -->
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
<include name="jbossws-spi.jar"/>
@@ -40,20 +42,28 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
</fileset>
</copy>
+
+ <!--SERVER JARS -->
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- BOOTSTRAP JARS -->
<copy todir="${jboss50.home}/lib" overwrite="true">
<fileset dir="@{thirdpartylibs}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
</copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{jbosslibs}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
-
+
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
@@ -69,16 +79,25 @@
<macrodef name="macro-undeploy-sunri50">
<sequential>
<delete>
+
+ <!-- CLIENT JARS -->
<fileset dir="${jboss50.home}/client">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+
<include name="jbossws-jboss50.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-sunri-client.jar"/>
</fileset>
+
+ <!-- SERVER JARS -->
<fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -112,6 +131,10 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
</fileset>
</copy>
<copy todir="${jboss42.home}/lib" overwrite="true">
@@ -143,6 +166,11 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+
<include name="jbossws-jboss42.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-sunri-client.jar"/>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3354 - trunk/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-06-01 03:15:13 -0400 (Fri, 01 Jun 2007)
New Revision: 3354
Modified:
trunk/build/ant-import/build-testsuite.xml
Log:
Forgotten classpath entry, required for PolicyMetaDataBuilderTestCase
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-06-01 05:41:20 UTC (rev 3353)
+++ trunk/build/ant-import/build-testsuite.xml 2007-06-01 07:15:13 UTC (rev 3354)
@@ -150,6 +150,7 @@
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
+ <pathelement location="${tests.output.dir}/resources/jaxws/wspolicy"/>
<path refid="tests.javac.classpath"/>
</path>
</target>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3353 - trunk/integration/native/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 01:41:20 -0400 (Fri, 01 Jun 2007)
New Revision: 3353
Modified:
trunk/integration/native/ant-import/macros-deploy-native.xml
Log:
Fix missing jbossws-spi.jar deployment
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 05:17:35 UTC (rev 3352)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-01 05:41:20 UTC (rev 3353)
@@ -28,6 +28,9 @@
<!-- CLIENT JARS -->
<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>
@@ -41,10 +44,10 @@
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
<include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
@@ -56,6 +59,9 @@
<!-- SERVER JARS -->
<copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -84,24 +90,21 @@
<!-- CLIENT JARS -->
<fileset dir="${jboss50.home}/client">
-
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss50.jar"/>
+ <include name="jbossws-spi.jar"/>
<include name="policy.jar"/>
-
- <include name="jbossws-integration-tools.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
-
- <include name="jbossws-jboss50.jar"/>
-
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
</fileset>
<!-- SERVER JARS -->
@@ -130,6 +133,9 @@
<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>
@@ -151,6 +157,9 @@
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
@@ -174,26 +183,26 @@
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<delete>
<fileset dir="${jboss42.home}/client">
- <!--include name="jbossws-spi.jar"/-->
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="policy.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-integration-tools.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
-
<include name="jbossws-jboss42.jar"/>
-
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
+ <include name="jbossws-spi.jar"/>
+ <include name="policy.jar"/>
<include name="wsdl4j.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
+ <!-- remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
</fileset>
<fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
+ <!-- remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
</fileset>
<fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
<include name="jbossws-spi.jar"/>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3352 - in trunk/jbossws-core/src: test/java/org/jboss/test/ws/jaxws/wspolicy and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-06-01 01:17:35 -0400 (Fri, 01 Jun 2007)
New Revision: 3352
Added:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/TestMultipleEndpointPolicy.java
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy.xml
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy2.xml
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy.xml
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy2.xml
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy.xml
trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy2.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
Added new test case on PolicyMetaDataBuilder
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-06-01 05:03:42 UTC (rev 3351)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-06-01 05:17:35 UTC (rev 3352)
@@ -281,10 +281,7 @@
}
catch (UnsupportedPolicy e)
{
- if (log.isDebugEnabled())
- {
- log.debug("Policy Not supported:" + policy.getPolicyURI());
- }
+ log.warn("Policy Not supported:" + policy.getPolicyURI());
}
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 05:03:42 UTC (rev 3351)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-06-01 05:17:35 UTC (rev 3352)
@@ -105,4 +105,47 @@
("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
}
+
+ public void testAnnotationEndpointScopePolicies() throws Exception
+ {
+ Map<String,Class> map = new HashMap<String,Class>();
+ map.put("http://www.fabrikam123.example.com/stock", NopAssertionDeployer.class);
+ PolicyDeployer deployer = PolicyDeployer.newInstance(map);
+ PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
+ builder.setToolMode(true);
+
+ EndpointMetaData epMetaData = new ServerEndpointMetaData(null, new QName("dummyPortName"),
+ new QName("dummyPortTypeName"), Type.JAXWS);
+ builder.processPolicyAnnotations(epMetaData, TestMultipleEndpointPolicy.class, null);
+
+ PolicyMetaExtension policyExt = (PolicyMetaExtension)epMetaData.getExtension(Constants.URI_WS_POLICY);
+
+ Collection<Policy> portPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT);
+ assertNotNull(portPolicies);
+ assertEquals(2, portPolicies.size());
+ Iterator<Policy> portPoliciesIterator = portPolicies.iterator();
+ String id1 = portPoliciesIterator.next().getId();
+ String id2 = portPoliciesIterator.next().getId();
+ assertTrue(("uselessPortPolicy".equalsIgnoreCase(id1) && "uselessPortPolicy2".equalsIgnoreCase(id2)) ||
+ ("uselessPortPolicy".equalsIgnoreCase(id2) && "uselessPortPolicy2".equalsIgnoreCase(id1)));
+
+ Collection<Policy> portTypePolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE);
+ assertNotNull(portTypePolicies);
+ assertEquals(2, portTypePolicies.size());
+ Iterator<Policy> portTypePoliciesIterator = portTypePolicies.iterator();
+ String id3 = portTypePoliciesIterator.next().getId();
+ String id4 = portTypePoliciesIterator.next().getId();
+ assertTrue(("uselessPortTypePolicy".equalsIgnoreCase(id3) && "uselessPortTypePolicy2".equalsIgnoreCase(id4)) ||
+ ("uselessPortTypePolicy".equalsIgnoreCase(id4) && "uselessPortTypePolicy2".equalsIgnoreCase(id3)));
+
+ Collection<Policy> bindingPolicies = policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING);
+ assertNotNull(bindingPolicies);
+ assertEquals(2, bindingPolicies.size());
+ Iterator<Policy> bindingPoliciesIterator = bindingPolicies.iterator();
+ String id5 = bindingPoliciesIterator.next().getId();
+ String id6 = bindingPoliciesIterator.next().getId();
+ assertTrue(("uselessBindingPolicy".equalsIgnoreCase(id5) && "uselessBindingPolicy2".equalsIgnoreCase(id6)) ||
+ ("uselessBindingPolicy".equalsIgnoreCase(id6) && "uselessBindingPolicy2".equalsIgnoreCase(id5)));
+ }
+
}
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/TestMultipleEndpointPolicy.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/TestMultipleEndpointPolicy.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/TestMultipleEndpointPolicy.java 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,22 @@
+package org.jboss.test.ws.jaxws.wspolicy;
+
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
+
+@PolicyAttachment({@Policy( policyFileLocation="AnnotationPortPolicy.xml",
+ scope = PolicyScopeLevel.WSDL_PORT ),
+ @Policy( policyFileLocation="AnnotationPortPolicy2.xml",
+ scope = PolicyScopeLevel.WSDL_PORT ),
+ @Policy( policyFileLocation="AnnotationBindingPolicy.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING ),
+ @Policy( policyFileLocation="AnnotationBindingPolicy2.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING ),
+ @Policy( policyFileLocation="AnnotationPortTypePolicy.xml",
+ scope = PolicyScopeLevel.WSDL_PORT_TYPE ),
+ @Policy( policyFileLocation="AnnotationPortTypePolicy2.xml",
+ scope = PolicyScopeLevel.WSDL_PORT_TYPE )})
+public class TestMultipleEndpointPolicy
+{
+
+}
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessBindingPolicy" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy2.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy2.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationBindingPolicy2.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessBindingPolicy2" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessPortPolicy" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy2.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy2.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortPolicy2.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessPortPolicy2" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessPortTypePolicy" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
Added: trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy2.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy2.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxws/wspolicy/AnnotationPortTypePolicy2.xml 2007-06-01 05:17:35 UTC (rev 3352)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsp:Policy wsu:Id="uselessPortTypePolicy2" xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">
+ <fab:useless>nothing</fab:useless>
+</wsp:Policy>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3351 - in trunk: integration/sunri and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-01 01:03:42 -0400 (Fri, 01 Jun 2007)
New Revision: 3351
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
Modified:
trunk/build/README-COMMITTERS
trunk/build/version.properties
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/integration/sunri/version.properties
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/integration/xfire/version.properties
trunk/jbossws-core/version.properties
trunk/testsuite/ant-import/build-jars-jaxws.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml
Log:
Enable sunri logicalhandler
Modified: trunk/build/README-COMMITTERS
===================================================================
--- trunk/build/README-COMMITTERS 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/build/README-COMMITTERS 2007-06-01 05:03:42 UTC (rev 3351)
@@ -8,11 +8,13 @@
enable-auto-props = yes
[auto-props]
+*.bat = svn:keywords=Id Revision;svn:eol-style=LF
*.java = svn:keywords=Id Revision;svn:eol-style=LF
+*.sh = svn:keywords=Id Revision;svn:eol-style=LF
+*.txt = svn:keywords=Id Revision;svn:eol-style=LF
+*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF
*.xml = svn:keywords=Id Revision;svn:eol-style=LF
-*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF
*.xsd = svn:keywords=Id Revision;svn:eol-style=LF
-*.txt = svn:keywords=Id Revision;svn:eol-style=LF
2. If you are using an IDE, make sure that it refers to the same config. So,
for example, if you are using Eclipse with Subclipse on windows, you need to
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/build/version.properties 2007-06-01 05:03:42 UTC (rev 3351)
@@ -20,6 +20,7 @@
jboss-common-logging-log4j=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
jboss-javaee=5.0.0-SNAPSHOT
+jboss-jaxr=1.2.0.GA
jboss-jbossxb=2.0.0.CR2
jboss-microcontainer=2.0.0.Beta3
junit=3.8.1
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -59,6 +59,9 @@
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/>
<copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -81,6 +84,8 @@
</fileset>
</delete>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -122,6 +127,9 @@
</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="@{stacklibs}/jbossws-sunri42.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -144,6 +152,8 @@
</fileset>
</delete>
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 05:03:42 UTC (rev 3351)
@@ -2,12 +2,12 @@
# $Id$
#
-# [JBWS-1699] - Fix WebServiceContext.getMessageContext()
+# [JBWS-1699] Fix WebServiceContext.getMessageContext()
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
-#org/jboss/test/ws/jaxws/samples/httpbinding/**
+# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
+
org/jboss/test/ws/jaxws/samples/oneway/**
org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
Modified: trunk/integration/sunri/version.properties
===================================================================
--- trunk/integration/sunri/version.properties 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/integration/sunri/version.properties 2007-06-01 05:03:42 UTC (rev 3351)
@@ -4,8 +4,6 @@
sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
# Thirdparty library versions
-jboss-jaxr=1.2.0.GA
-jboss-jbossws-spi=SNAPSHOT
jboss-security-spi=2.0.0.Beta
sun-jaxws=2.1.1
sun-servlet=2.5
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -57,6 +57,9 @@
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/>
<copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -74,6 +77,8 @@
</fileset>
</delete>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -113,6 +118,9 @@
</copy>
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
<unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire42.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -130,6 +138,8 @@
</fileset>
</delete>
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
Modified: trunk/integration/xfire/version.properties
===================================================================
--- trunk/integration/xfire/version.properties 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/integration/xfire/version.properties 2007-06-01 05:03:42 UTC (rev 3351)
@@ -6,9 +6,6 @@
# Thirdparty library versions
ibm-wsdl4j=1.6.2
jboss-jaxr=1.2.0.GA
-jboss-jbossws-spi=SNAPSHOT
jboss-security-spi=2.0.0.Beta
-sun-jaxb=2.1.3
-sun-servlet=2.5
xfire=1.2.6
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/jbossws-core/version.properties 2007-06-01 05:03:42 UTC (rev 3351)
@@ -21,7 +21,6 @@
hibernate=3.2.1.GA
jaxen=1.1-beta-10
jboss-ejb3=1.0.0.CR9-jboss4.0.5
-jboss-jaxr=1.2.0.GA
jboss-remoting=2.0.0.GA
jboss-security=4.0.5.GA
jboss-vfs=2.0.0.Beta2
Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -129,6 +129,7 @@
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/>
@@ -141,6 +142,7 @@
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/>
<include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -53,26 +53,40 @@
QName serviceName = new QName("http://org.jboss.ws/jaxws/samples/logicalhandler", "SOAPEndpointService");
Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName);
SOAPEndpointJAXB port = (SOAPEndpointJAXB)service.getPort(SOAPEndpointJAXB.class);
-
+
BindingProvider bindingProvider = (BindingProvider)port;
bindingProvider.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress);
String retStr = port.echo("hello");
-
+
StringBuffer expStr = new StringBuffer("hello");
- expStr.append(":LogicalClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":LogicalServerHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Outbound:LogicalJAXBHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ }
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalJAXBHandler");
expStr.append(":endpoint");
- expStr.append(":LogicalServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":LogicalClientHandler");
+ expStr.append(":Outbound:LogicalJAXBHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalJAXBHandler");
+ }
assertEquals(expStr.toString(), retStr);
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -56,19 +56,33 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
- expStr.append(":LogicalClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":LogicalServerHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Outbound:LogicalSourceHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ }
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalSourceHandler");
expStr.append(":endpoint");
- expStr.append(":LogicalServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":LogicalClientHandler");
+ expStr.append(":Outbound:LogicalSourceHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalSourceHandler");
+ }
assertEquals(expStr.toString(), retStr);
}
@@ -83,19 +97,33 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
- expStr.append(":LogicalClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":LogicalServerHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Outbound:LogicalSourceHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ }
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalSourceHandler");
expStr.append(":endpoint");
- expStr.append(":LogicalServerHandler");
- expStr.append(":SOAP11ServerHandler");
- expStr.append(":PortServerHandler");
- expStr.append(":PortClientHandler");
- expStr.append(":SOAP11ClientHandler");
- expStr.append(":LogicalClientHandler");
+ expStr.append(":Outbound:LogicalSourceHandler");
+ expStr.append(":Outbound:ProtocolHandler");
+ expStr.append(":Outbound:PortHandler");
+ if (isIntegrationSunRI())
+ {
+ System.out.println("FIXME: [JBWS-1672] SunRI does not respect @HandlerChain on client SEI");
+ }
+ else
+ {
+ expStr.append(":Inbound:PortHandler");
+ expStr.append(":Inbound:ProtocolHandler");
+ expStr.append(":Inbound:LogicalSourceHandler");
+ }
assertEquals(expStr.toString(), retStr);
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -24,6 +24,7 @@
// $Id$
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.MessageContext;
@@ -35,16 +36,16 @@
@Override
public boolean handleOutbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Outbound");
}
@Override
public boolean handleInbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Inbound");
}
- public boolean appendHandlerName(MessageContext msgContext)
+ private boolean appendHandlerName(MessageContext msgContext, String direction)
{
try
{
@@ -52,26 +53,37 @@
LogicalMessageContext logicalContext = (LogicalMessageContext)msgContext;
JAXBContext jaxb = JAXBContext.newInstance(Echo.class.getPackage().getName());
Object payload = logicalContext.getMessage().getPayload(jaxb);
+
+ JAXBElement jaxbElement = null;
+ if (payload instanceof JAXBElement)
+ {
+ jaxbElement = (JAXBElement)payload;
+ payload = jaxbElement.getValue();
+ }
- String handlerName = getHandlerName();
-
if (payload instanceof Echo)
{
Echo echo = (Echo)payload;
String value = echo.getString1();
- echo.setString1(value + ":" + handlerName);
+ echo.setString1(value + ":" + direction + ":LogicalJAXBHandler");
}
else if (payload instanceof EchoResponse)
{
EchoResponse echo = (EchoResponse)payload;
String value = echo.getResult();
- echo.setResult(value + ":" + handlerName);
+ echo.setResult(value + ":" + direction + ":LogicalJAXBHandler");
}
else
{
throw new WebServiceException("Invalid payload type: " + payload);
}
+ if (jaxbElement != null)
+ {
+ jaxbElement.setValue(payload);
+ payload = jaxbElement;
+ }
+
// Set the updated payload
logicalContext.getMessage().setPayload(payload, jaxb);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -53,16 +53,16 @@
@Override
public boolean handleOutbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Outbound");
}
@Override
public boolean handleInbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Inbound");
}
- public boolean appendHandlerName(MessageContext msgContext)
+ private boolean appendHandlerName(MessageContext msgContext, String direction)
{
try
{
@@ -78,7 +78,7 @@
Element element = DOMUtils.getFirstChildElement(root);
String oldValue = DOMUtils.getTextContent(element);
- String newValue = oldValue + ":" + getHandlerName();
+ String newValue = oldValue + ":" + direction + ":LogicalSourceHandler";
element.setTextContent(newValue);
log.debug("oldValue: " + oldValue);
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.logicalhandler;
+
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+
+/**
+ * A jaxws protocol handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 24-Nov-2005
+ */
+public class PortHandler extends GenericSOAPHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(PortHandler.class);
+
+ @Override
+ public boolean handleOutbound(MessageContext msgContext)
+ {
+ return appendHandlerName(msgContext, "Outbound");
+ }
+
+ @Override
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ return appendHandlerName(msgContext, "Inbound");
+ }
+
+ private boolean appendHandlerName(MessageContext msgContext, String direction)
+ {
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+ soapElement = (SOAPElement)soapElement.getChildElements().next();
+
+ String oldValue = soapElement.getValue();
+ String newValue = oldValue + ":" + direction + ":PortHandler";
+ soapElement.setValue(newValue);
+
+ log.debug("oldValue: " + oldValue);
+ log.debug("newValue: " + newValue);
+
+ return true;
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -45,16 +45,16 @@
@Override
public boolean handleOutbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Outbound");
}
-
+
@Override
public boolean handleInbound(MessageContext msgContext)
{
- return appendHandlerName(msgContext);
+ return appendHandlerName(msgContext, "Inbound");
}
-
- private boolean appendHandlerName(MessageContext msgContext)
+
+ private boolean appendHandlerName(MessageContext msgContext, String direction)
{
try
{
@@ -63,7 +63,7 @@
soapElement = (SOAPElement)soapElement.getChildElements().next();
String oldValue = soapElement.getValue();
- String newValue = oldValue + ":" + getHandlerName();
+ String newValue = oldValue + ":" + direction + ":ProtocolHandler";
soapElement.setValue(newValue);
log.debug("oldValue: " + oldValue);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -31,7 +31,7 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
-@WebService()
+@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-client-jaxb-handlers.xml")
public interface SOAPEndpointJAXB
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDoc.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -31,7 +31,7 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
-@WebService()
+@WebService(name = "SOAPEndpointDoc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-client-source-handlers.xml")
public interface SOAPEndpointSourceDoc
{
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpc.java 2007-06-01 05:03:42 UTC (rev 3351)
@@ -29,12 +29,11 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-@WebService()
+@WebService(name = "SOAPEndpointRpc", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler")
@HandlerChain(file = "jaxws-client-source-handlers.xml")
@SOAPBinding(style = Style.RPC)
public interface SOAPEndpointSourceRpc
{
-
@WebMethod
public String echo(String string1);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -24,7 +24,7 @@
<port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern>
<handler>
<handler-name> PortClientHandler </handler-name>
- <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class>
+ <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class>
</handler>
</handler-chain>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -24,7 +24,7 @@
<port-name-pattern>ns1:SOAPEndpoint*</port-name-pattern>
<handler>
<handler-name> PortClientHandler </handler-name>
- <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class>
+ <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class>
</handler>
</handler-chain>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -24,7 +24,7 @@
<port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern>
<handler>
<handler-name> PortServerHandler </handler-name>
- <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class>
+ <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class>
</handler>
</handler-chain>
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-06-01 03:38:21 UTC (rev 3350)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-06-01 05:03:42 UTC (rev 3351)
@@ -24,7 +24,7 @@
<port-name-pattern>ns1:SOAPEndpoint*</port-name-pattern>
<handler>
<handler-name> PortServerHandler </handler-name>
- <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class>
+ <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler </handler-class>
</handler>
</handler-chain>
17 years, 6 months
- 1
- 0
JBossWS SVN: r3350 - trunk/build/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 23:38:21 -0400 (Thu, 31 May 2007)
New Revision: 3350
Modified:
trunk/build/hudson/jboss/bin/http-spider.sh
Log:
More logging
Modified: trunk/build/hudson/jboss/bin/http-spider.sh
===================================================================
--- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 03:33:16 UTC (rev 3349)
+++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 03:38:21 UTC (rev 3350)
@@ -26,7 +26,7 @@
COUNTER=0
while [ $COUNTER -lt $NUM_RETRIES ]; do
if wget --spider --timeout=$TIMEOUT --tries=1 $1 &> /dev/null; then
- echo "'$1' is available"
+ echo "Try $COUNTER: '$1' is available"
exit 0
else
echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds"
17 years, 6 months
- 1
- 0
JBossWS SVN: r3349 - trunk/build/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-31 23:33:16 -0400 (Thu, 31 May 2007)
New Revision: 3349
Modified:
trunk/build/hudson/jboss/bin/http-spider.sh
Log:
Add try counter log
Modified: trunk/build/hudson/jboss/bin/http-spider.sh
===================================================================
--- trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 03:25:25 UTC (rev 3348)
+++ trunk/build/hudson/jboss/bin/http-spider.sh 2007-06-01 03:33:16 UTC (rev 3349)
@@ -1,5 +1,6 @@
#!/bin/sh
+#############################################################
#
# Simple helper that checks if an HTTP host is available.
# (Relies on wget)
@@ -9,6 +10,9 @@
#
# @author Heiko.Braun(a)jboss.com
#
+# $Id: $
+#
+#############################################################
TIMEOUT=2 # wget timeout in sec
SLEEP_TIME=10 # the actual sleep time in between test
@@ -25,7 +29,7 @@
echo "'$1' is available"
exit 0
else
- echo "'$1' does not respond, wait another $SLEEP_TIME seconds"
+ echo "Try $COUNTER: '$1' does not respond, wait another $SLEEP_TIME seconds"
fi
sleep $SLEEP_TIME
let COUNTER=COUNTER+1
17 years, 6 months
- 1
- 0