JBossWS SVN: r3630 - trunk/build.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 10:26:01 -0400 (Tue, 19 Jun 2007)
New Revision: 3630
Added:
trunk/build/build.conf.example
Removed:
trunk/build/build.conf
Log:
Rename build.conf
Deleted: trunk/build/build.conf
===================================================================
--- trunk/build/build.conf 2007-06-19 13:59:46 UTC (rev 3629)
+++ trunk/build/build.conf 2007-06-19 14:26:01 UTC (rev 3630)
@@ -1,7 +0,0 @@
-
-##
-## Build configuration
-##
-
-# Uncomment when using JDK 6
-#USE_JDK6=true
Copied: trunk/build/build.conf.example (from rev 3623, trunk/build/build.conf)
===================================================================
--- trunk/build/build.conf.example (rev 0)
+++ trunk/build/build.conf.example 2007-06-19 14:26:01 UTC (rev 3630)
@@ -0,0 +1,7 @@
+
+##
+## Build configuration
+##
+
+# Uncomment when using JDK 6
+USE_JDK6=true
16 years, 11 months
JBossWS SVN: r3629 - in trunk/build/hudson/hudson-home/jobs: AS-Tests-AS-4.0 and 18 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 09:59:46 -0400 (Tue, 19 Jun 2007)
New Revision: 3629
Modified:
trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
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.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.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.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
Log:
Use build.sh instead of ant
Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -23,7 +23,7 @@
#
cd $SVNBASE
rm -rf thirdparty/*
-ant -f ./build/build.xml clean main
+./build.sh -f ./build/build.xml clean main
#
# Verify build
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,8 +30,8 @@
# build/deploy jbossws-native
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 jars
-ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40
+./build.sh $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 jars
+./build.sh $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40
#
# start jbossas
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-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
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-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss40
+./build.sh $ENVIRONMENT deploy-jboss40
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -22,7 +22,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -33,13 +33,13 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-native-(a)version.id@
-ant $ENVIRONMENT deploy-jboss40
+./build.sh $ENVIRONMENT deploy-jboss40
#
# start jbossas
@@ -57,7 +57,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -22,7 +22,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -33,13 +33,13 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-native-(a)version.id@
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -57,7 +57,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -22,7 +22,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -33,13 +33,13 @@
# Build distro
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-native-(a)version.id@
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -57,7 +57,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -21,7 +21,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -32,13 +32,13 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-sunri-(a)version.id@
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -56,7 +56,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -21,7 +21,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -32,13 +32,13 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-sunri-(a)version.id@
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -56,7 +56,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -21,7 +21,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -32,13 +32,13 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-xfire-(a)version.id@
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -56,7 +56,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -21,7 +21,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -32,13 +32,13 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT build-bin-dist
+./build.sh $ENVIRONMENT build-bin-dist
#
# Deploy distro
#
cd output/jbossws-xfire-(a)version.id@
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -56,7 +56,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build jbws-jboss40
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT deploy-jboss40
+./build.sh $ENVIRONMENT deploy-jboss40
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build jbws-jboss42
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build deploy-jboss50
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build sunri
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build sunri-jboss50
#
cd $JBWSDIR/integration/sunri
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
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-19 13:47:10 UTC (rev 3628)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-19 13:59:46 UTC (rev 3629)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build xfire
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT deploy-jboss42
+./build.sh $ENVIRONMENT deploy-jboss42
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
16 years, 11 months
JBossWS SVN: r3628 - trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 09:47:10 -0400 (Tue, 19 Jun 2007)
New Revision: 3628
Modified:
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
Log:
Move to build.sh
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-19 12:02:18 UTC (rev 3627)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-19 13:47:10 UTC (rev 3628)
@@ -19,7 +19,7 @@
#
cd $JBWSDIR/build
cp ant.properties.example ant.properties
-ant clean
+./build.sh clean
#
# stop jbossas
@@ -30,7 +30,7 @@
# Build xfire
#
cd $JBWSDIR/integration/xfire
-ant $ENVIRONMENT deploy-jboss50
+./build.sh $ENVIRONMENT deploy-jboss50
#
# start jbossas
@@ -48,7 +48,7 @@
#
# execute tests
#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
#
16 years, 11 months
JBossWS SVN: r3627 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 08:02:18 -0400 (Tue, 19 Jun 2007)
New Revision: 3627
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
Log:
Exclude JBWS-1616 for SunRI and dump FIXME instead
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-19 10:50:24 UTC (rev 3626)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-19 12:02:18 UTC (rev 3627)
@@ -57,12 +57,19 @@
Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName);
TestEndpoint port = service.getPort(TestEndpoint.class);
- // [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation
- Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl");
- String nsURI = wsdl.getNamespace("jbws1616");
- assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616", nsURI);
-
- // [JBWS-1655] Add support for endpoint address rewriting
+ if(!isIntegrationSunRI())
+ {
+ // [JBWS-1616] Verify correct bahaviour of @WebService.wsdlLocation
+ Definition wsdl = getWSDLDefinition(soapAddress + "?wsdl");
+ String nsURI = wsdl.getNamespace("jbws1616");
+ assertEquals("http://jira.jboss.org/jira/browse/JBWS-1616", nsURI);
+ }
+ else
+ {
+ System.out.println("FIXME [JBWS-1616]: Verify correct bahaviour of @WebService.wsdlLocation");
+ }
+
+ // [JBWS-1655] Add support for endpoint address rewriting
BindingProvider bp = (BindingProvider)port;
bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress);
16 years, 11 months
JBossWS SVN: r3626 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 06:50:24 -0400 (Tue, 19 Jun 2007)
New Revision: 3626
Modified:
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java
Log:
Service doesnt extend from ServiceExt anymore, therefore casting to ConfigProvider will fail
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-06-19 09:29:28 UTC (rev 3625)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-06-19 10:50:24 UTC (rev 3626)
@@ -101,7 +101,6 @@
public String testService2(String reqStr) throws Exception
{
Service service = (Service)iniCtx.lookup("java:comp/env/Service2");
- verifyConfig((ConfigProvider)service);
TestEndpoint port = service.getPort(TestEndpoint.class);
verifyConfig((ConfigProvider)port);
16 years, 11 months
JBossWS SVN: r3625 - in trunk/integration: xfire/ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 05:29:28 -0400 (Tue, 19 Jun 2007)
New Revision: 3625
Modified:
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
Log:
One more time: wsdl4j.jar
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-19 09:11:35 UTC (rev 3624)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-19 09:29:28 UTC (rev 3625)
@@ -100,6 +100,7 @@
</fileset>
<fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
<include name="jbossws-jboss42.jar"/>
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-19 09:11:35 UTC (rev 3624)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-19 09:29:28 UTC (rev 3625)
@@ -101,6 +101,7 @@
</fileset>
<fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
<include name="jbossws-jboss42.jar"/>
16 years, 11 months
JBossWS SVN: r3624 - in trunk/integration: native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 05:11:35 -0400 (Tue, 19 Jun 2007)
New Revision: 3624
Removed:
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
Modified:
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
trunk/integration/xfire/ant-import/build-bin-dist.xml
Log:
EndpointName deployer strips leading slash from context-root
Deleted: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java 2007-06-19 09:11:35 UTC (rev 3624)
@@ -1,54 +0,0 @@
-/*
- * 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.wsf.stack.jbws;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.wsf.spi.deployment.AbstractDeployer;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-/**
- * A deployer that assigns the complete name to the Endpoint
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class EndpointNameDeployer extends AbstractDeployer
-{
- @Override
- public void create(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- if (sepMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- ObjectName sepID = sepMetaData.getServiceEndpointID();
- ep.setName(sepID);
- }
- }
-}
\ No newline at end of file
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-19 09:11:35 UTC (rev 3624)
@@ -134,7 +134,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 09:11:35 UTC (rev 3624)
@@ -135,7 +135,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 09:11:35 UTC (rev 3624)
@@ -139,7 +139,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-19 09:11:35 UTC (rev 3624)
@@ -150,7 +150,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer">
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-06-19 09:11:35 UTC (rev 3624)
@@ -38,7 +38,12 @@
{
String contextRoot = dep.getService().getContextRoot();
- for (Endpoint ep : dep.getService().getEndpoints())
+ if(contextRoot.startsWith("/"))
+ contextRoot = contextRoot.substring(1);
+ else
+ throw new IllegalArgumentException("Expected context-root with leading slash");
+
+ for (Endpoint ep : dep.getService().getEndpoints())
{
StringBuilder name = new StringBuilder(Endpoint.SEPID_DOMAIN + ":");
name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot + ",");
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-19 09:11:35 UTC (rev 3624)
@@ -97,6 +97,7 @@
<copy todir="${bindist.lib.dir}" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
<include name="jbossws-spi.jar"/>
+ <include name="jbossws-spi-scripts.zip"/>
</fileset>
<fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
16 years, 11 months
JBossWS SVN: r3623 - trunk/integration/sunri/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-19 04:49:13 -0400 (Tue, 19 Jun 2007)
New Revision: 3623
Modified:
trunk/integration/sunri/ant-import/build-bin-dist.xml
Log:
Include jbossws-spi-scripts.zip in distribution
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-19 03:22:39 UTC (rev 3622)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-19 08:49:13 UTC (rev 3623)
@@ -96,6 +96,7 @@
<copy todir="${bindist.lib.dir}" overwrite="true">
<fileset dir="${spi.dir}/output/lib">
<include name="jbossws-spi.jar"/>
+ <include name="jbossws-spi-scripts.zip"/>
</fileset>
<fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
16 years, 11 months
JBossWS SVN: r3622 - in tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws: jbws1665 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: david.boeren
Date: 2007-06-18 23:22:39 -0400 (Mon, 18 Jun 2007)
New Revision: 3622
Added:
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java
tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java
Log:
Adding test case skeleton for JBWS-1665
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,9 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class CoordinateData implements Serializable {
+ public BigDecimal latitude;
+ public BigDecimal longitude;
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,75 @@
+/*
+ * 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.jbws1665;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+
+/**
+ * incorrect wsdl generation
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1665
+ */
+public class JBWS1665TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService";
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar");
+ }
+
+ public void testWebService() throws Exception
+ {
+ assertWSDLAccess();
+
+ // Need to validate the WSDL is property populated. Several fields such as
+ // element names are being left blank. This is related to case 16130. The
+ // entire generated wsdl is attached to the case.
+
+ /*
+ QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService");
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class);
+ */
+ }
+
+ private void assertWSDLAccess() throws MalformedURLException
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ assertNotNull(wsdlDefinitions);
+ }
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,24 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+import java.io.Serializable;
+
+public class PropertyData implements Serializable {
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,90 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TraceData", propOrder = { "type", "source", "time",
+ "coordinate", "mileage", "heading", "speed", "property" })
+public class TraceData implements Serializable {
+ @XmlElement(required=true)
+ private short type;
+ @XmlElement(required=true)
+ private String source;
+ @XmlElement(required=true)
+ private Calendar time;
+ private CoordinateData coordinate;
+ private Integer mileage;
+ private Short heading;
+ private Short speed;
+ private PropertyData[] property;
+
+ public CoordinateData getCoordinate() {
+ return coordinate;
+ }
+
+ public void setCoordinate(CoordinateData coordinate) {
+ this.coordinate = coordinate;
+ }
+
+ public Short getHeading() {
+ return heading;
+ }
+
+ public void setHeading(Short heading) {
+ this.heading = heading;
+ }
+
+ public Integer getMileage() {
+ return mileage;
+ }
+
+ public void setMileage(Integer mileage) {
+ this.mileage = mileage;
+ }
+
+ public String getSource() {
+ return source;
+ }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
+
+ public Short getSpeed() {
+ return speed;
+ }
+
+ public void setSpeed(Short speed) {
+ this.speed = speed;
+ }
+
+ public Calendar getTime() {
+ return time;
+ }
+
+ public void setTime(Calendar time) {
+ this.time = time;
+ }
+
+ public short getType() {
+ return type;
+ }
+
+ public void setType(short type) {
+ this.type = type;
+ }
+
+ public void setProperty(PropertyData[] property) {
+ this.property = property;
+ }
+
+ public PropertyData[] getProperty() {
+ return property;
+ }
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,42 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TracePollData", propOrder = { "traces", "mark", "more" })
+public class TracePollData implements Serializable {
+ @XmlElement(required=true,nillable=true)
+ protected TraceData[] traces;
+ @XmlElement(required = true, nillable = true)
+ protected String mark;
+ protected boolean more;
+
+ public String getMark() {
+ return mark;
+ }
+
+ public void setMark(String mark) {
+ this.mark = mark;
+ }
+
+ public boolean isMore() {
+ return more;
+ }
+
+ public void setMore(boolean more) {
+ this.more = more;
+ }
+
+ public void setTraces(TraceData[] traces) {
+ this.traces = traces;
+ }
+
+ public TraceData[] getTraces() {
+ return traces;
+ }
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,38 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+import java.rmi.RemoteException;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.ejb.FinderException;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@Stateless
+@WebService(name = "TrackingService", targetNamespace = "http://fleetworks.acunia.com/fleet/service")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class TrackingServiceBean implements TrackingServiceInterface {
+ @WebMethod
+ public TracePollData pollTraces(
+ @WebParam(name="customer") String customer,
+ @WebParam(name="mark") String mark) throws NullPointerException
+ {
+ return null;
+ }
+
+ @WebMethod
+ public void requestTrace(
+ @WebParam(name="customer") String customer,
+ @WebParam(name="terminals") String[] terminals)
+ throws NullPointerException
+ {
+ }
+}
Added: tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java
===================================================================
--- tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java (rev 0)
+++ tags/jbossws-1.2.1.GA/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java 2007-06-19 03:22:39 UTC (rev 3622)
@@ -0,0 +1,7 @@
+package org.jboss.test.ws.jaxws.jbws1665;
+
+public interface TrackingServiceInterface {
+ public TracePollData pollTraces(String customer, String mark) throws NullPointerException;
+
+ public void requestTrace(String customer, String[] terminals) throws NullPointerException;
+}
16 years, 11 months
JBossWS SVN: r3621 - in trunk/integration: xfire/ant-import and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-18 16:43:43 -0400 (Mon, 18 Jun 2007)
New Revision: 3621
Modified:
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-bin-dist.xml
Log:
SPI script dir moved.
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-18 20:39:56 UTC (rev 3620)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-18 20:43:43 UTC (rev 3621)
@@ -73,7 +73,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
+ <fileset dir="${spi.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-18 20:39:56 UTC (rev 3620)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-18 20:43:43 UTC (rev 3621)
@@ -75,7 +75,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/etc">
+ <fileset dir="${spi.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
16 years, 11 months