JBossWS SVN: r4157 - in trunk/build/hudson/hudson-home/jobs: AS-Tests-AS-4.2 and 19 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 08:18:30 -0400 (Fri, 03 Aug 2007)
New Revision: 4157
Modified:
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-JDK6/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
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
Log:
REmove dependency on module 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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# build/deploy jbossws-native
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 jars
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 clean jars
ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40
#
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT clean 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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss50
+cp ant.properties.example ant.properties
+ant $ENVIRONMENT clean 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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss40
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss40
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -26,13 +26,6 @@
fi
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -41,7 +34,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# deploy to jboss
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss50
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss50
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -18,13 +18,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -33,7 +26,8 @@
# Build distro
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -18,13 +18,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -33,7 +26,8 @@
# Build distro
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -18,13 +18,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -33,7 +26,8 @@
# Build distro
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -17,13 +17,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -32,7 +25,8 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -17,13 +17,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -32,7 +25,8 @@
# Build distro
#
cd $JBWSDIR/integration/sunri
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -17,13 +17,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -32,7 +25,8 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -17,13 +17,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -32,7 +25,8 @@
# Build distro
#
cd $JBWSDIR/integration/xfire
-./build.sh $ENVIRONMENT build-bin-dist
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean build-bin-dist
#
# Deploy distro
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build jbws-jboss40
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss40
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss40
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build jbws-jboss42
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build deploy-jboss50
#
cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss50
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss50
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build sunri
#
cd $JBWSDIR/integration/sunri
-./build.sh $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build sunri-jboss50
#
cd $JBWSDIR/integration/sunri
-./build.sh $ENVIRONMENT deploy-jboss50
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss50
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build xfire
#
cd $JBWSDIR/integration/xfire
-./build.sh $ENVIRONMENT deploy-jboss42
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss42
#
# start jbossas
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-08-03 12:09:23 UTC (rev 4156)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-03 12:18:30 UTC (rev 4157)
@@ -15,13 +15,6 @@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
# stop jbossas
#
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
@@ -30,7 +23,8 @@
# Build xfire
#
cd $JBWSDIR/integration/xfire
-./build.sh $ENVIRONMENT deploy-jboss50
+cp ant.properties.example ant.properties
+./build.sh $ENVIRONMENT clean deploy-jboss50
#
# start jbossas
17 years, 4 months
- 1
- 0
JBossWS SVN: r4156 - in trunk: integration/sunri and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 08:09:23 -0400 (Fri, 03 Aug 2007)
New Revision: 4156
Added:
trunk/integration/sunri/ant-import/build-setup.xml
trunk/integration/sunri/ant.properties.example
trunk/integration/sunri/src/main/etc/JBossORG-EULA.txt
trunk/integration/sunri/src/main/etc/default.mf
trunk/integration/xfire/ant-import/build-setup.xml
trunk/integration/xfire/ant.properties.example
trunk/integration/xfire/src/main/etc/JBossORG-EULA.txt
trunk/integration/xfire/src/main/etc/default.mf
trunk/jbossws-core/ant-import/build-setup.xml
trunk/jbossws-core/src/main/etc/JBossORG-EULA.txt
Removed:
trunk/build/ant-import/
trunk/build/etc/
trunk/integration/sunri/IntegrationIssues.txt
Modified:
trunk/integration/sunri/
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/build.xml
trunk/integration/xfire/
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/build.xml
trunk/jbossws-core/
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant.properties.example
trunk/jbossws-core/build.xml
Log:
Decouple stacks from build module
Property changes on: trunk/integration/sunri
___________________________________________________________________
Name: svn:ignore
- output*
version.properties.md5
thirdparty
+ output*
version.properties.md5
thirdparty
ant.properties
Deleted: trunk/integration/sunri/IntegrationIssues.txt
===================================================================
--- trunk/integration/sunri/IntegrationIssues.txt 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/integration/sunri/IntegrationIssues.txt 2007-08-03 12:09:23 UTC (rev 4156)
@@ -1,11 +0,0 @@
-# $Id$
-
-* WSServletContextListener is final and loads sun-jaxws.xml from context classloader.
-We need to provide sun-jaxws.xml dynamically.
-
-* WSServletException is package protected
-
-* WSServlet is final
-
-* WSServletDelegate is final
-
Added: trunk/integration/sunri/ant-import/build-setup.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-setup.xml (rev 0)
+++ trunk/integration/sunri/ant-import/build-setup.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-setup.xml 4147 2007-08-03 10:08:11Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss40.lib" value="${jboss40.home}/lib"/>
+ <property name="jboss40.client" value="${jboss40.home}/client"/>
+ <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
+ <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
+ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+ <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+
+ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -12,7 +12,7 @@
<property name="tests.output.dir" value="${int.sunri.dir}/output/tests"/>
- <import file="${build.dir}/ant-import/build-testsuite.xml"/>
+ <import file="${int.sunri.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
<property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -71,7 +71,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${int.sunri.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.sunri.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Added: trunk/integration/sunri/ant.properties.example
===================================================================
--- trunk/integration/sunri/ant.properties.example (rev 0)
+++ trunk/integration/sunri/ant.properties.example 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,36 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+
+# The JBoss server under test. This can be [jboss50|jboss42]
+jbossws.integration.target=jboss50
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JBoss JMX invoker authentication
+#jmx.authentication.username=admin
+#jmx.authentication.password=admin
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# JDK settings
+#jdk6.home=/usr/java/jdk1.6
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/integration/sunri/build.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -11,15 +11,16 @@
<!-- $Id$ -->
-<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50">
+<project default="main" basedir="." name="JBossWS-SunRI">
- <import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <property name="int.sunri.dir" value="${basedir}"/>
- <import file="${int.sunri.dir}/ant-import/build-bin-dist.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-release.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/>
- <import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-bin-dist.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-testsuite.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -75,8 +76,6 @@
<copy todir="${sunri.output.etc.dir}" filtering="yes">
<fileset dir="${sunri.etc.dir}">
<include name="component-info.xml"/>
- </fileset>
- <fileset dir="${build.dir}/etc">
<include name="default.mf"/>
</fileset>
<filterset>
@@ -84,7 +83,6 @@
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-sunri-${version.id}"/>
- <filtersfile file="${build.dir}/version.properties"/>
<filtersfile file="${int.sunri.dir}/version.properties"/>
</filterset>
</copy>
Added: trunk/integration/sunri/src/main/etc/JBossORG-EULA.txt
===================================================================
--- trunk/integration/sunri/src/main/etc/JBossORG-EULA.txt (rev 0)
+++ trunk/integration/sunri/src/main/etc/JBossORG-EULA.txt 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Added: trunk/integration/sunri/src/main/etc/default.mf
===================================================================
--- trunk/integration/sunri/src/main/etc/default.mf (rev 0)
+++ trunk/integration/sunri/src/main/etc/default.mf 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.2
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=(a)build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: trunk/integration/xfire
___________________________________________________________________
Name: svn:ignore
- thirdparty
output*
version.properties.md5
+ thirdparty
output*
version.properties.md5
ant.properties
Added: trunk/integration/xfire/ant-import/build-setup.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-setup.xml (rev 0)
+++ trunk/integration/xfire/ant-import/build-setup.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-setup.xml 4147 2007-08-03 10:08:11Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss40.lib" value="${jboss40.home}/lib"/>
+ <property name="jboss40.client" value="${jboss40.home}/client"/>
+ <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
+ <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
+ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+ <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+
+ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -12,7 +12,7 @@
<property name="tests.output.dir" value="${int.xfire.dir}/output/tests"/>
- <import file="${build.dir}/ant-import/build-testsuite.xml"/>
+ <import file="${int.xfire.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
<property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -67,7 +67,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${int.xfire.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.xfire.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Added: trunk/integration/xfire/ant.properties.example
===================================================================
--- trunk/integration/xfire/ant.properties.example (rev 0)
+++ trunk/integration/xfire/ant.properties.example 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,36 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
+
+# The JBoss server under test. This can be [jboss50|jboss42]
+jbossws.integration.target=jboss50
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JBoss JMX invoker authentication
+#jmx.authentication.username=admin
+#jmx.authentication.password=admin
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# JDK settings
+#jdk6.home=/usr/java/jdk1.6
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/integration/xfire/build.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -11,15 +11,16 @@
<!-- $Id$ -->
-<project default="main" basedir="../.." name="JBossWS-CXF">
+<project default="main" basedir="." name="JBossWS-CXF">
- <import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <property name="int.xfire.dir" value="${basedir}"/>
- <import file="${int.xfire.dir}/ant-import/build-bin-dist.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-deploy.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-release.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-testsuite.xml"/>
- <import file="${int.xfire.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-bin-dist.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-testsuite.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -75,8 +76,6 @@
<copy todir="${xfire.output.etc.dir}" filtering="yes">
<fileset dir="${xfire.etc.dir}">
<include name="component-info.xml"/>
- </fileset>
- <fileset dir="${build.dir}/etc">
<include name="default.mf"/>
</fileset>
<filterset>
@@ -84,7 +83,6 @@
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-xfire-${version.id}"/>
- <filtersfile file="${build.dir}/version.properties"/>
<filtersfile file="${int.xfire.dir}/version.properties"/>
</filterset>
</copy>
Added: trunk/integration/xfire/src/main/etc/JBossORG-EULA.txt
===================================================================
--- trunk/integration/xfire/src/main/etc/JBossORG-EULA.txt (rev 0)
+++ trunk/integration/xfire/src/main/etc/JBossORG-EULA.txt 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Added: trunk/integration/xfire/src/main/etc/default.mf
===================================================================
--- trunk/integration/xfire/src/main/etc/default.mf (rev 0)
+++ trunk/integration/xfire/src/main/etc/default.mf 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.2
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=(a)build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: trunk/jbossws-core
___________________________________________________________________
Name: svn:ignore
- output-eclipse
output
thirdparty
output*
version.properties.md5
+ output-eclipse
output
thirdparty
output*
version.properties.md5
ant.properties
Added: trunk/jbossws-core/ant-import/build-setup.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-setup.xml (rev 0)
+++ trunk/jbossws-core/ant-import/build-setup.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: build-setup.xml 4147 2007-08-03 10:08:11Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jboss40.lib" value="${jboss40.home}/lib"/>
+ <property name="jboss40.client" value="${jboss40.home}/client"/>
+ <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/>
+ <property name="jboss40.server.lib" value="${jboss40.server}/lib"/>
+ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+ <property name="jboss.server.instance.${jboss.server.instance}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
+ <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+
+ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -12,7 +12,7 @@
<property name="tests.output.dir" value="${core.dir}/output/tests"/>
- <import file="${build.dir}/ant-import/build-testsuite.xml"/>
+ <import file="${core.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
<!-- Define excluded tests -->
<property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
@@ -208,7 +208,7 @@
<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
<ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- <ant antfile="${core.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${core.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: trunk/jbossws-core/ant.properties.example
===================================================================
--- trunk/jbossws-core/ant.properties.example 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/jbossws-core/ant.properties.example 2007-08-03 12:09:23 UTC (rev 4156)
@@ -13,44 +13,8 @@
# The JBoss server instance
jboss.server.instance=default
+jboss.bind.address=localhost
-# Optional Tomcat Home
-#tomcat.home=/usr/java/tomcat
-tomcat.manager.username=manager
-tomcat.manager.password=manager
-
-# Hudson QA Environment
-hudson.username=changeme
-hudson.password=changeme
-
-hudson.root=/home/tdiesler/workspace
-hudson.host=jbws.dyndns.org
-hudson.port=8180
-
-hudson.jdk15=/usr/java/jdk1.5
-hudson.jdk14=/usr/java/jdk1.4
-
-hudson.jbossws-spi.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbossws-spi/trunk
-hudson.jbws-jboss50.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss50/trunk
-hudson.jbws-jboss42.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss42/trunk
-hudson.jbws-jboss40.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss40/trunk
-hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-tc55/trunk
-
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta3
-hudson.jboss50.rev=HEAD
-
-hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss42.build=jboss-4.2.0.GA
-hudson.jboss42.rev=HEAD
-
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
-hudson.jboss40.rev=HEAD
-
-hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com, alejandro.guizar(a)jboss.com
-hudson.smtp.host=mail.navisite.com
-
# JBoss Repository
#jboss.repository=file:/home/tdiesler/svn/repository.jboss.org
jboss.repository=http://repository.jboss.org
@@ -67,8 +31,3 @@
javac.deprecation=yes
javac.fail.onerror=yes
javac.verbose=no
-
-# Use the eclipse compiler to allow for hot code swapping
-# http://www.jboss.org/index.html?module=bb&op=viewtopic&t=65783
-# build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
-
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-03 11:21:08 UTC (rev 4155)
+++ trunk/jbossws-core/build.xml 2007-08-03 12:09:23 UTC (rev 4156)
@@ -11,15 +11,16 @@
<!-- $Id$ -->
-<project default="main" basedir="..">
+<project default="main" basedir=".">
- <import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <property name="core.dir" value="${basedir}"/>
+
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
- <import file="${core.dir}/ant-import/build-deploy.xml"/>
- <import file="${core.dir}/ant-import/build-release.xml"/>
- <import file="${core.dir}/ant-import/build-thirdparty.xml"/>
- <import file="${core.dir}/ant-import-tests/build-testsuite.xml"/>
-
<property name="core.src.dir" value="${core.dir}/src/main"/>
<property name="core.etc.dir" value="${core.src.dir}/etc"/>
<property name="core.java.dir" value="${core.src.dir}/java"/>
@@ -87,7 +88,6 @@
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version" value="jbossws-native-${version.id}"/>
- <filtersfile file="${build.dir}/version.properties"/>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
Added: trunk/jbossws-core/src/main/etc/JBossORG-EULA.txt
===================================================================
--- trunk/jbossws-core/src/main/etc/JBossORG-EULA.txt (rev 0)
+++ trunk/jbossws-core/src/main/etc/JBossORG-EULA.txt 2007-08-03 12:09:23 UTC (rev 4156)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
17 years, 4 months
- 1
- 0
JBossWS SVN: r4155 - branches/jbossws-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-03 07:21:08 -0400 (Fri, 03 Aug 2007)
New Revision: 4155
Modified:
branches/jbossws-2.0/mergeinfo.txt
Log:
mergeinfo for JBWS-1771
Modified: branches/jbossws-2.0/mergeinfo.txt
===================================================================
--- branches/jbossws-2.0/mergeinfo.txt 2007-08-03 10:59:19 UTC (rev 4154)
+++ branches/jbossws-2.0/mergeinfo.txt 2007-08-03 11:21:08 UTC (rev 4155)
@@ -64,3 +64,6 @@
darran.lofthouse(a)jboss.com 01-Aug-07
svn merge -r 4063:4064 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+
+darran.lofthouse(a)jboss.com 02-Aug-07
+svn merge -r 4124:4125 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
17 years, 4 months
- 1
- 0
JBossWS SVN: r4154 - in framework/trunk/src/test: ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 06:59:19 -0400 (Fri, 03 Aug 2007)
New Revision: 4154
Added:
framework/trunk/src/test/ant-import/
framework/trunk/src/test/ant-import/build-jars-jaxws.xml
framework/trunk/src/test/ant-import/build-testsuite.xml
Removed:
framework/trunk/src/test/etc/build-jars-jaxws.xml
Log:
Add build-testsuite.xml
Copied: framework/trunk/src/test/ant-import/build-jars-jaxws.xml (from rev 4146, framework/trunk/src/test/etc/build-jars-jaxws.xml)
===================================================================
--- framework/trunk/src/test/ant-import/build-jars-jaxws.xml (rev 0)
+++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2007-08-03 10:59:19 UTC (rev 4154)
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id: build-jars-jaxws.xml 4121 2007-08-02 20:42:11Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- jaxws-samples-asynchronous -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-context -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF">
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-eardeployment -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-samples-eardeployment.jar"/>
+ <include name="jaxws-samples-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment42.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-samples-eardeployment.jar"/>
+ <include name="jaxws-samples-eardeployment.war"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
+ <include name="application.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-exception -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-handlerchain -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-httpbinding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
+ <include name="wsdl/HttpBinding.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
+ <include name="wsdl/HttpBinding.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-logicalhandler -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/>
+ <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"/>
+ </classes>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
+ <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"/>
+ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-oneway -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-provider -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <include name="wsdl/Provider.wsdl"/>
+ </webinf>
+ </war>
+
+ <!-- jaxws-samples-retail -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
+ <include name="wsdl/*"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-serviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-soapbinding -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-swaref -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/swaref/DocumentPayload*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-samples-webmethod -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webparam -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webresult -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-samples-webservice -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
+ </classes>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </classes>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-webserviceref -->
+ <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <manifest>
+ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
+ </manifest>
+ </jar>
+
+ <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
+ <include name="jboss.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
+ <!-- jaxws-samples-xop-doclit -->
+ <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/>
+ <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/>
+ <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/>
+ </classes>
+ </war>
+
+ <!-- Please add alphabetically -->
+
+ </target>
+
+</project>
Added: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml (rev 0)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-03 10:59:19 UTC (rev 4154)
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id: build-testsuite.xml 4142 2007-08-03 09:32:46Z thomas.diesler(a)jboss.com $ -->
+
+<project>
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Verify required properties that must be set before this file is imported -->
+ <fail message="Tests output dir not set." unless="tests.output.dir"/>
+
+ <!-- Use -Ddebug=true for remote debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
+
+ <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+ otherwise and initialize the node0/node1 cluster hostnames to localhost
+ and ${hostname} by default. If you cannot route multicast traffic between
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
+ <os family="windows"/>
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+
+ <!-- node0 defaults -->
+ <property name="node0" value="${jboss.bind.address}"/>
+ <property name="node0.http.url" value="http://${node0}:8080"/>
+ <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
+ <property name="node0.hajndi.url" value="jnp://${node0}:1100"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-prepare">
+
+ <mkdir dir="${tests.output.dir}/log"/>
+ <delete file="${tests.output.dir}/log/test.log"/>
+
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jboss.home"/>
+ </condition>
+
+ <echo/>
+ <echo message="-----------------------------------------------"/>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="jboss.bind = ${jboss.bind.address}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="-----------------------------------------------"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+ <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40"/>
+
+ <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
+
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ </path>
+
+ <!--
+ The 'tests.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="tests.client.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jboss-jboss50.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss50.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <!-- FIXME jars should be available in the client dir -->
+ <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
+ <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"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/wstx.jar"/>
+ <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
+
+
+ </path>
+ </target>
+
+ <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42">
+
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+
+ </path>
+
+ <!--
+ The 'tests.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="tests.client.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss42.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <!-- FIXME jars should be available in the client dir -->
+ <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"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/wstx.jar"/>
+ <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
+ </path>
+ </target>
+
+ <target name="tests-classpath-jboss40" depends="tests-prepare" if="jbossws.integration.jboss40">
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.client}/jboss-remoting.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.server.lib}/javax.servlet.jar"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ </path>
+
+ <!--
+ The 'tests.client.classpath' contains jars that are available in the target container's client directory.
+ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
+
+ The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
+ The 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
+ -->
+ <path id="tests.client.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
+ <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-saaj.jar"/>
+ <pathelement location="${jboss.client}/jbossws-jboss40.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${jboss.client}/log4j.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <!-- FIXME jars should be available in the client dir -->
+ <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"/>
+
+ <!-- SPI tools -->
+ <pathelement location="${jboss.client}/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jaxws-tools.jar"/>
+ <pathelement location="${jboss.client}/wstx.jar"/>
+ <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
+ </path>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-compile-classes">
+ <attribute name="excludesfile"/>
+ <attribute name="srcdir"/>
+ <sequential>
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <echo message="excludesfile = @{excludesfile}"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="@{excludesfile}">
+ <src path="@{srcdir}"/>
+ <classpath refid="tests.javac.classpath"/>
+ </javac>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-copy-resources">
+ <attribute name="srcdir"/>
+ <sequential>
+
+ <!-- copy etc -->
+ <copy todir="${tests.output.dir}/classes">
+ <fileset dir="@{srcdir}/etc">
+ <include name="jndi.properties"/>
+ <include name="tst.policy"/>
+ <include name="log4j.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jboss.bind.address" value="${node0}"/>
+ </filterset>
+ </copy>
+
+ <!-- copy handler definitions -->
+ <copy todir="${tests.output.dir}/classes">
+ <fileset dir="@{srcdir}/java">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- copy non binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="@{srcdir}/resources">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="java.home" value="${java.home}"/>
+ <filter token="jboss.bind.address" value="${node0}"/>
+ <filter token="tests.output.dir" value="${tests.output.dir}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="@{srcdir}/resources">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Testing -->
+ <!-- ================================================================== -->
+
+ <!-- Run all unit tests and generate a report -->
+ <target name="tests" depends="tests-jars" description="Run all unit tests and generate a report">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
+ <param name="haltonfailure" value="false"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!-- Run smoke test cases -->
+ <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ <!--
+ According to our commit policy, haltonfailure MUST be be true for tests-samples.
+ It is a prerequisite for any commit that this target passes without failure.
+ -->
+ <param name="haltonfailure" value="true"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!-- Run samples test cases -->
+ <target name="tests-samples" depends="tests-init" description="Run samples unit tests">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ </antcall>
+ </target>
+
+ <!-- Run integration test cases -->
+ <target name="tests-integration" depends="tests-jars" description="Run integration unit tests">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ <param name="haltonfailure" value="false"/>
+ </antcall>
+ <antcall target="tests-report"/>
+ </target>
+
+ <!--
+ Run a collection of unit tests.
+ ant -Dtest=jaxws/samples/provider test
+ -->
+ <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/>
+ <param name="haltonfailure" value="false"/>
+ </antcall>
+ </target>
+
+ <!-- Common test target -->
+ <target name="tests-run-internal" depends="tests-init">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}">
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jboss.bind.address" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
+ <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="tests.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <batchtest todir="${tests.output.dir}/reports" fork="true">
+ <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
+ -->
+ <target name="one-test" depends="tests-init" if="test" description="Run a single unit test">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}">
+ <jvmarg line="${remote.debug.line}"/>
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="build.testlog" value="${tests.output.dir}/log"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
+ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="jboss.home" value="${jboss.home}"/>
+ <sysproperty key="jboss.bind.address" value="${node0}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
+ <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/>
+ <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/>
+ <!--
+ http://jira.jboss.com/jira/browse/JBWS-917
+ <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="javax.net.ssl.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/>
+ <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/>
+ <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/>
+ -->
+ <!-- HTTPS hostname wrong: should be <localhost> -->
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
+ <classpath>
+ <path refid="tests.client.classpath"/>
+ <pathelement location="${tests.output.dir}/classes"/>
+ </classpath>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/>
+ </junit>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Reporting -->
+ <!-- ================================================================== -->
+
+ <!-- Build the tests report -->
+ <target name="tests-report" depends="tests-init" description="Build the tests report">
+ <mkdir dir="${tests.output.dir}/reports"/>
+ <junitreport todir="${tests.output.dir}/reports">
+ <fileset dir="${tests.output.dir}/reports">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${tests.output.dir}/reports/html"/>
+ </junitreport>
+ <zip destfile="${tests.output.dir}/test-report-${build.id}.zip">
+ <fileset dir="${tests.output.dir}" includes="reports/**"/>
+ </zip>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <target name="tests-clean" description="Delete all generated test files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
Deleted: framework/trunk/src/test/etc/build-jars-jaxws.xml
===================================================================
--- framework/trunk/src/test/etc/build-jars-jaxws.xml 2007-08-03 10:56:37 UTC (rev 4153)
+++ framework/trunk/src/test/etc/build-jars-jaxws.xml 2007-08-03 10:59:19 UTC (rev 4154)
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id: build-jars-jaxws.xml 4121 2007-08-02 20:42:11Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-jars-jaxws" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/libs"/>
-
- <!-- jaxws-samples-asynchronous -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-context -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF">
- <include name="jboss.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-eardeployment -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-samples-eardeployment.jar"/>
- <include name="jaxws-samples-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
- <include name="jboss-app.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-eardeployment42.ear">
- <fileset dir="${tests.output.dir}/libs">
- <include name="jaxws-samples-eardeployment.jar"/>
- <include name="jaxws-samples-eardeployment.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF">
- <include name="application.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-exception -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-handlerchain -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-httpbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
- <include name="wsdl/HttpBinding.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared">
- <include name="wsdl/HttpBinding.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-logicalhandler -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/>
- <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"/>
- </classes>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/>
- <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"/>
- <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-oneway -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-provider -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
- <include name="wsdl/Provider.wsdl"/>
- </webinf>
- </war>
-
- <!-- jaxws-samples-retail -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF">
- <include name="wsdl/*"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-serviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/ApplicationClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-ejb-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-soapbinding -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-swaref -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-swaref.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/swaref/DocumentPayload*.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-samples-webmethod -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webparam -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webresult -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/>
- </classes>
- </war>
-
- <!-- jaxws-samples-webservice -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/>
- </classes>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02">
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </classes>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02">
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/>
- </fileset>
- </jar>
-
- <!-- jaxws-webserviceref -->
- <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/>
- </classes>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/>
- </manifest>
- </jar>
-
- <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war"
- webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF">
- <include name="jboss.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxws-samples-xop-doclit -->
- <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/>
- <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/>
- </classes>
- </war>
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4153 - in spi/trunk: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-03 06:56:37 -0400 (Fri, 03 Aug 2007)
New Revision: 4153
Added:
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
spi/trunk/src/test/resources/smoke/tools/provide-test.xml
Modified:
spi/trunk/ant-import/build-testsuite.xml
spi/trunk/spi.iml
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java
spi/trunk/src/test/resources/smoke/tools/consume-test.xml
Log:
Fix [JBWS-1732]: WSProvideTask throws IllegalArgumentException
Modified: spi/trunk/ant-import/build-testsuite.xml
===================================================================
--- spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:56:37 UTC (rev 4153)
@@ -62,6 +62,9 @@
<fileset dir="${spi.test.resources.dir}">
<include name="**/*.xml"/>
</fileset>
+ <filterset>
+ <filter token="SPI_DIR" value="${basedir}"/>
+ </filterset>
</copy>
</target>
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/spi.iml 2007-08-03 10:56:37 UTC (rev 4153)
@@ -195,7 +195,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/ant-nodeps.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/ant-launcher.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-08-03 10:56:37 UTC (rev 4153)
@@ -178,7 +178,11 @@
{
try
{
- urls.add(new URL(tok.nextToken()));
+ String path = tok.nextToken();
+ if(!path.startsWith("file://"))
+ path = "file://"+path;
+
+ urls.add(new URL(path));
}
catch (MalformedURLException e)
{
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2007-08-03 10:56:37 UTC (rev 4153)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.wsf.spi.tools;
-import org.jboss.wsf.spi.tools.ant.WSConsumeTask;
-
/**
* Test the WSConsumeTask.
* This test needs to be executed in 'SPI_HOME/output/tests',
@@ -32,9 +30,7 @@
* @version $Revision$
*/
public class AntConsumeTestCase extends BuildFileTest
-{
- WSConsumeTask task;
-
+{
protected void setUp() throws Exception
{
super.setUp();
@@ -48,10 +44,6 @@
"org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory"
);
- // the build files used by this test case needs to build a classpath
- // in this case we assum test execution in 'SPI_HOME/output/tests'
- System.setProperty("SPI_HOME", "../../");
-
configureProject("resources/smoke/tools/consume-test.xml");
}
Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java (rev 0)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2007-08-03 10:56:37 UTC (rev 4153)
@@ -0,0 +1,64 @@
+/*
+ * 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.wsf.spi.tools;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class AntProvideTestCase extends BuildFileTest
+{
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // cleanup events
+ CmdProvideTracker.LAST_EVENT = "";
+
+ // enforce loading of the tracker implemenation
+ System.setProperty(
+ "org.jboss.wsf.spi.tools.ProviderFactoryImpl",
+ "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory"
+ );
+
+ configureProject("resources/smoke/tools/provide-test.xml");
+ }
+
+ public void testPlainInvocation()
+ {
+ executeTarget("plainInvocation");
+ assertTrue("provide() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("provide")!=-1);
+ }
+
+ public void testIncludeWSDL()
+ {
+ executeTarget("includeWSDL");
+ assertTrue("setGenerateWsdl() not invoked", CmdProvideTracker.LAST_EVENT.indexOf("setGenerateWsdl")!=-1);
+ }
+
+ public void testExtraClasspath()
+ {
+ executeTarget("extraClasspath");
+
+ }
+
+}
Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdProvideTracker.java 2007-08-03 10:56:37 UTC (rev 4153)
@@ -67,12 +67,12 @@
public void provide(String endpointClass)
{
-
+ LAST_EVENT += "provide";
}
public void provide(Class<?> endpointClass)
{
-
+ LAST_EVENT += "provide";
}
public void setMessageStream(PrintStream messageStream)
Modified: spi/trunk/src/test/resources/smoke/tools/consume-test.xml
===================================================================
--- spi/trunk/src/test/resources/smoke/tools/consume-test.xml 2007-08-03 10:41:27 UTC (rev 4152)
+++ spi/trunk/src/test/resources/smoke/tools/consume-test.xml 2007-08-03 10:56:37 UTC (rev 4153)
@@ -6,12 +6,12 @@
<project name="consume-test" basedir=".">
- <property environment="env"/>
+ <property name="spi.dir" value="@SPI_DIR@"/>
<!-- Define the JAX-WS wsconsume task -->
<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
<classpath>
- <pathelement location="${env.SPI_HOME}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
</classpath>
</taskdef>
Added: spi/trunk/src/test/resources/smoke/tools/provide-test.xml
===================================================================
--- spi/trunk/src/test/resources/smoke/tools/provide-test.xml (rev 0)
+++ spi/trunk/src/test/resources/smoke/tools/provide-test.xml 2007-08-03 10:56:37 UTC (rev 4153)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ An example build file that used to test the WSConsume Task
+-->
+
+<project name="provide-test" basedir=".">
+
+ <property name="spi.dir" value="@SPI_DIR@"/>
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask">
+ <classpath>
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ </classpath>
+ </taskdef>
+
+ <target name="plainInvocation">
+ <wsprovide genwsdl="false" sei="org.jboss.test.wsf.spi.smoke.tools.CalculatorBean"/>
+ </target>
+
+ <target name="includeWSDL">
+ <wsprovide genwsdl="true" sei="org.jboss.test.wsf.spi.smoke.tools.CalculatorBean"/>
+ </target>
+
+ <target name="extraClasspath">
+ <wsprovide genwsdl="false" sei="org.jboss.test.wsf.spi.smoke.tools.CalculatorBean">
+ <classpath>
+ <pathelement location="${spi.dir}/output/test/classes"/>
+ </classpath>
+ </wsprovide>
+ </target>
+</project>
\ No newline at end of file
Property changes on: spi/trunk/src/test/resources/smoke/tools/provide-test.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
- 1
- 0
JBossWS SVN: r4152 - in trunk: jbossws-core/ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 06:41:27 -0400 (Fri, 03 Aug 2007)
New Revision: 4152
Removed:
trunk/jbossws-core/ant-import/build-testsuite.xml
Modified:
trunk/build/build.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
Log:
Remove references to testsuite.dir
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-08-03 10:26:39 UTC (rev 4151)
+++ trunk/build/build.xml 2007-08-03 10:41:27 UTC (rev 4152)
@@ -123,7 +123,6 @@
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}/output"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
- <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/>
</target>
@@ -131,7 +130,6 @@
<target name="clobber" depends="prepare" description="Cleans up all generated files.">
<delete dir="${build.dir}/output"/>
<ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
- <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
</target>
Deleted: trunk/jbossws-core/ant-import/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 10:26:39 UTC (rev 4151)
+++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 10:41:27 UTC (rev 4152)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id: build-testsuite.xml 4092 2007-08-02 11:14:11Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <property name="tests.output.dir" value="${int.native.dir}/output/tests"/>
- <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
-
- <property name="tests.dir" value="${testsuite.dir}/src"/>
- <property name="tests.java.dir" value="${tests.dir}/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/resources"/>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="tests-init" depends="tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
- <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
- <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${jboss.client}/policy.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
- </target>
-
-</project>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:26:39 UTC (rev 4151)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:41:27 UTC (rev 4152)
@@ -10,18 +10,18 @@
<project>
- <property environment="env"/>
<property name="tests.output.dir" value="${core.dir}/output/tests"/>
+
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
<property name="tests.dir" value="${core.dir}/src/test"/>
<property name="tests.java.dir" value="${tests.dir}/java"/>
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
- <!-- Define excluded tests -->
- <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
- <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
<!--
Init the various classpaths
-->
17 years, 4 months
- 1
- 0
JBossWS SVN: r4151 - trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 06:26:39 -0400 (Fri, 03 Aug 2007)
New Revision: 4151
Removed:
trunk/testsuite/
Log:
Delete testsuite
17 years, 4 months
- 1
- 0
JBossWS SVN: r4150 - in trunk/integration: sunri/src/test and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-03 06:25:40 -0400 (Fri, 03 Aug 2007)
New Revision: 4150
Added:
trunk/integration/sunri/src/test/etc/
trunk/integration/xfire/src/test/etc/
Modified:
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
Log:
Fix test build xfire,sunri
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 10:15:38 UTC (rev 4149)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 10:25:40 UTC (rev 4150)
@@ -11,11 +11,8 @@
<project>
<property name="tests.output.dir" value="${int.sunri.dir}/output/tests"/>
- <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
- <property name="tests.dir" value="${testsuite.dir}/src"/>
- <property name="tests.java.dir" value="${tests.dir}/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+ <import file="${build.dir}/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
<property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -59,7 +56,24 @@
<!-- ================================================================== -->
<target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.sunri.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.sunri.dir}/src/test/java" excludesfile="${excludesfile}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${int.sunri.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${int.sunri.dir}/src/test"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${int.sunri.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
</project>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 10:15:38 UTC (rev 4149)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 10:25:40 UTC (rev 4150)
@@ -11,11 +11,8 @@
<project>
<property name="tests.output.dir" value="${int.xfire.dir}/output/tests"/>
- <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
- <property name="tests.dir" value="${testsuite.dir}/src"/>
- <property name="tests.java.dir" value="${tests.dir}/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+ <import file="${build.dir}/ant-import/build-testsuite.xml"/>
<!-- Define excludesfile -->
<property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
@@ -55,7 +52,24 @@
<!-- ================================================================== -->
<target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.xfire.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${int.xfire.dir}/src/test/java" excludesfile="${excludesfile}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${int.xfire.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${int.xfire.dir}/src/test"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${int.xfire.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
</project>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4149 - spi/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-03 06:15:38 -0400 (Fri, 03 Aug 2007)
New Revision: 4149
Modified:
spi/trunk/ant-import/build-thirdparty.xml
Log:
ant-launcher.jar is required for test execution
Modified: spi/trunk/ant-import/build-thirdparty.xml
===================================================================
--- spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:12:48 UTC (rev 4148)
+++ spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:15:38 UTC (rev 4149)
@@ -40,6 +40,7 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant-launcher.jar" dest="${thirdparty.dir}/ant-launcher.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
@@ -81,7 +82,7 @@
<pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/ant-nodeps.jar"/>
+ <pathelement location="${thirdparty.dir}/ant-launcher.jar"/>
</path>
</target>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4148 - in spi/trunk: ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-03 06:12:48 -0400 (Fri, 03 Aug 2007)
New Revision: 4148
Added:
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java
spi/trunk/src/test/resources/smoke/tools/consume-test.xml
Modified:
spi/trunk/ant-import/build-testsuite.xml
spi/trunk/ant-import/build-thirdparty.xml
spi/trunk/spi.iml
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
Log:
Added WSConsumeTask test case and general Ant task helper classes
Modified: spi/trunk/ant-import/build-testsuite.xml
===================================================================
--- spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:08:11 UTC (rev 4147)
+++ spi/trunk/ant-import/build-testsuite.xml 2007-08-03 10:12:48 UTC (rev 4148)
@@ -43,27 +43,28 @@
</target>
- <target name="tests-compile" depends="init, jars, tests-init">
- <macro-compile-classes srcdir="${spi.test.java.dir}"/>
- </target>
-
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
+
+ <target name="tests-compile" depends="init, jars, tests-init">
+
+ <mkdir dir="${spi.test.output.dir}/classes" />
+ <javac destdir="${spi.test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${spi.test.java.dir}"/>
+ <classpath refid="test.classpath"/>
+ </javac>
- <macrodef name="macro-compile-classes">
- <attribute name="srcdir"/>
- <sequential>
- <mkdir dir="${spi.test.output.dir}/classes" />
+ <!-- copy non binary files -->
+ <mkdir dir="${spi.test.output.dir}/resources"/>
+ <copy todir="${spi.test.output.dir}/resources">
+ <fileset dir="${spi.test.resources.dir}">
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
- <javac destdir="${spi.test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}">
- <src path="@{srcdir}"/>
- <classpath refid="test.classpath"/>
- </javac>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Testing -->
<!-- ================================================================== -->
@@ -114,8 +115,7 @@
<target name="one-test" depends="tests-init" if="test">
<mkdir dir="${spi.test.output.dir}/reports"/>
<junit printsummary="yes" showoutput="yes" dir="${spi.test.output.dir}">
- <jvmarg line="${remote.debug.line}"/>
- <jvmarg value="-Djava.security.manager"/>
+ <jvmarg line="${remote.debug.line}"/>
<sysproperty key="build.testlog" value="${spi.test.output.dir}/log"/>
<classpath>
<path refid="test.classpath"/>
Modified: spi/trunk/ant-import/build-thirdparty.xml
===================================================================
--- spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:08:11 UTC (rev 4147)
+++ spi/trunk/ant-import/build-thirdparty.xml 2007-08-03 10:12:48 UTC (rev 4148)
@@ -79,6 +79,9 @@
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/junit.jar"/>
+
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/ant-nodeps.jar"/>
</path>
</target>
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2007-08-03 10:08:11 UTC (rev 4147)
+++ spi/trunk/spi.iml 2007-08-03 10:12:48 UTC (rev 4148)
@@ -192,6 +192,15 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="common" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/ant-nodeps.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java (rev 0)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2007-08-03 10:12:48 UTC (rev 4148)
@@ -0,0 +1,64 @@
+/*
+ * 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.wsf.spi.tools;
+
+import org.jboss.wsf.spi.tools.ant.WSConsumeTask;
+
+/**
+ * Test the WSConsumeTask.
+ * This test needs to be executed in 'SPI_HOME/output/tests',
+ * because it works with relative paths.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class AntConsumeTestCase extends BuildFileTest
+{
+ WSConsumeTask task;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // cleanup events
+ CmdConsumeTracker.LAST_EVENT = "";
+
+ // enforce loading of the tracker implemenation
+ System.setProperty(
+ "org.jboss.wsf.spi.tools.ConsumerFactoryImpl",
+ "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory"
+ );
+
+ // the build files used by this test case needs to build a classpath
+ // in this case we assum test execution in 'SPI_HOME/output/tests'
+ System.setProperty("SPI_HOME", "../../");
+
+ configureProject("resources/smoke/tools/consume-test.xml");
+ }
+
+ public void testPlainInvocation()
+ {
+ executeTarget("plainInvocation");
+ assertTrue("consume() not invoked", CmdConsumeTracker.LAST_EVENT.indexOf("consume")!=-1);
+ }
+
+}
Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java (rev 0)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java 2007-08-03 10:12:48 UTC (rev 4148)
@@ -0,0 +1,543 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.test.wsf.spi.tools;
+
+import junit.framework.TestCase;
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+
+import java.io.File;
+import java.io.PrintStream;
+import java.net.URL;
+
+/**
+ * A BuildFileTest is a TestCase which executes targets from an Ant buildfile
+ * for testing.
+ *
+ * This class provides a number of utility methods for particular build file
+ * tests which extend this class.
+ *
+ * @author Apache Ant contributors
+ */
+public abstract class BuildFileTest extends TestCase {
+
+ protected Project project;
+
+ private StringBuffer logBuffer;
+ private StringBuffer fullLogBuffer;
+ private StringBuffer outBuffer;
+ private StringBuffer errBuffer;
+ private BuildException buildException;
+
+ /**
+ * Default constructor for the BuildFileTest object.
+ */
+ public BuildFileTest() {
+ super();
+ }
+
+ /**
+ * Constructor for the BuildFileTest object.
+ *
+ * @param name string to pass up to TestCase constructor
+ */
+ public BuildFileTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Automatically calls the target called "tearDown"
+ * from the build file tested if it exits.
+ *
+ * This allows to use Ant tasks directly in the build file
+ * to clean up after each test. Note that no "setUp" target
+ * is automatically called, since it's trivial to have a
+ * test target depend on it.
+ */
+ protected void tearDown() throws Exception {
+ if (project == null) {
+ /*
+ * Maybe the BuildFileTest was subclassed and there is
+ * no initialized project. So we could avoid getting a
+ * NPE.
+ * If there is an initialized project getTargets() does
+ * not return null as it is initialized by an empty
+ * HashSet.
+ */
+ return;
+ }
+ final String tearDown = "tearDown";
+ if (project.getTargets().containsKey(tearDown)) {
+ project.executeTarget(tearDown);
+ }
+ }
+
+ /**
+ * run a target, expect for any build exception
+ *
+ * @param target target to run
+ * @param cause information string to reader of report
+ */
+ public void expectBuildException(String target, String cause) {
+ expectSpecificBuildException(target, cause, null);
+ }
+
+ /**
+ * Assert that only the given message has been logged with a
+ * priority <= INFO when running the given target.
+ */
+ public void expectLog(String target, String log) {
+ executeTarget(target);
+ String realLog = getLog();
+ assertEquals(log, realLog);
+ }
+
+ /**
+ * Assert that the given substring is in the log messages.
+ */
+ public void assertLogContaining(String substring) {
+ String realLog = getLog();
+ assertTrue("expecting log to contain \"" + substring + "\" log was \""
+ + realLog + "\"",
+ realLog.indexOf(substring) >= 0);
+ }
+
+ /**
+ * Assert that the given substring is in the output messages.
+ * @since Ant1.7
+ */
+ public void assertOutputContaining(String substring) {
+ String realOutput = getOutput();
+ assertTrue("expecting output to contain \"" + substring
+ + "\" output was \"" + realOutput + "\"",
+ realOutput.indexOf(substring) >= 0);
+ }
+
+ /**
+ * Assert that the given message has been logged with a priority
+ * <= INFO when running the given target.
+ */
+ public void expectLogContaining(String target, String log) {
+ executeTarget(target);
+ assertLogContaining(log);
+ }
+
+ /**
+ * Gets the log the BuildFileTest object.
+ * Only valid if configureProject() has been called.
+ *
+ * @pre logBuffer!=null
+ * @return The log value
+ */
+ public String getLog() {
+ return logBuffer.toString();
+ }
+
+ /**
+ * Assert that the given message has been logged with a priority
+ * >= VERBOSE when running the given target.
+ */
+ public void expectDebuglog(String target, String log) {
+ executeTarget(target);
+ String realLog = getFullLog();
+ assertEquals(log, realLog);
+ }
+
+ /**
+ * Assert that the given substring is in the log messages.
+ */
+ public void assertDebuglogContaining(String substring) {
+ String realLog = getFullLog();
+ assertTrue("expecting debug log to contain \"" + substring
+ + "\" log was \""
+ + realLog + "\"",
+ realLog.indexOf(substring) >= 0);
+ }
+
+ /**
+ * Gets the log the BuildFileTest object.
+ *
+ * Only valid if configureProject() has been called.
+ *
+ * @pre fullLogBuffer!=null
+ * @return The log value
+ */
+ public String getFullLog() {
+ return fullLogBuffer.toString();
+ }
+
+ /**
+ * execute the target, verify output matches expectations
+ *
+ * @param target target to execute
+ * @param output output to look for
+ */
+ public void expectOutput(String target, String output) {
+ executeTarget(target);
+ String realOutput = getOutput();
+ assertEquals(output, realOutput.trim());
+ }
+
+ /**
+ * Executes the target, verify output matches expectations
+ * and that we got the named error at the end
+ *
+ * @param target target to execute
+ * @param output output to look for
+ * @param error Description of Parameter
+ */
+ public void expectOutputAndError(String target, String output, String error) {
+ executeTarget(target);
+ String realOutput = getOutput();
+ assertEquals(output, realOutput);
+ String realError = getError();
+ assertEquals(error, realError);
+ }
+
+ public String getOutput() {
+ return cleanBuffer(outBuffer);
+ }
+
+ public String getError() {
+ return cleanBuffer(errBuffer);
+ }
+
+ public BuildException getBuildException() {
+ return buildException;
+ }
+
+ private String cleanBuffer(StringBuffer buffer) {
+ StringBuffer cleanedBuffer = new StringBuffer();
+ boolean cr = false;
+ for (int i = 0; i < buffer.length(); i++) {
+ char ch = buffer.charAt(i);
+ if (ch == '\r') {
+ cr = true;
+ continue;
+ }
+
+ if (!cr) {
+ cleanedBuffer.append(ch);
+ } else {
+ cleanedBuffer.append(ch);
+ }
+ }
+ return cleanedBuffer.toString();
+ }
+
+ /**
+ * Sets up to run the named project
+ *
+ * @param filename name of project file to run
+ */
+ public void configureProject(String filename) throws BuildException {
+ configureProject(filename, Project.MSG_DEBUG);
+ }
+
+ /**
+ * Sets up to run the named project
+ *
+ * @param filename name of project file to run
+ */
+ public void configureProject(String filename, int logLevel)
+ throws BuildException {
+ logBuffer = new StringBuffer();
+ fullLogBuffer = new StringBuffer();
+ project = new Project();
+ project.init();
+ File antFile = new File(System.getProperty("root"), filename);
+ project.setUserProperty("ant.file" , antFile.getAbsolutePath());
+ project.addBuildListener(new AntTestListener(logLevel));
+ ProjectHelper.configureProject(project, antFile);
+ }
+
+ /**
+ * Executes a target we have set up
+ *
+ * @pre configureProject has been called
+ * @param targetName target to run
+ */
+ public void executeTarget(String targetName) {
+ PrintStream sysOut = System.out;
+ PrintStream sysErr = System.err;
+ try {
+ sysOut.flush();
+ sysErr.flush();
+ outBuffer = new StringBuffer();
+ PrintStream out = new PrintStream(new AntOutputStream(outBuffer));
+ System.setOut(out);
+ errBuffer = new StringBuffer();
+ PrintStream err = new PrintStream(new AntOutputStream(errBuffer));
+ System.setErr(err);
+ logBuffer = new StringBuffer();
+ fullLogBuffer = new StringBuffer();
+ buildException = null;
+ project.executeTarget(targetName);
+ } finally {
+ System.setOut(sysOut);
+ System.setErr(sysErr);
+ }
+
+ }
+
+ /**
+ * Get the project which has been configured for a test.
+ *
+ * @return the Project instance for this test.
+ */
+ public Project getProject() {
+ return project;
+ }
+
+ /**
+ * Gets the directory of the project.
+ *
+ * @return the base dir of the project
+ */
+ public File getProjectDir() {
+ return project.getBaseDir();
+ }
+
+ /**
+ * Runs a target, wait for a build exception.
+ *
+ * @param target target to run
+ * @param cause information string to reader of report
+ * @param msg the message value of the build exception we are waiting
+ * for set to null for any build exception to be valid
+ */
+ public void expectSpecificBuildException(String target, String cause, String msg) {
+ try {
+ executeTarget(target);
+ } catch (org.apache.tools.ant.BuildException ex) {
+ buildException = ex;
+ if ((null != msg) && (!ex.getMessage().equals(msg))) {
+ fail("Should throw BuildException because '" + cause
+ + "' with message '" + msg
+ + "' (actual message '" + ex.getMessage() + "' instead)");
+ }
+ return;
+ }
+ fail("Should throw BuildException because: " + cause);
+ }
+
+ /**
+ * run a target, expect an exception string
+ * containing the substring we look for (case sensitive match)
+ *
+ * @param target target to run
+ * @param cause information string to reader of report
+ * @param contains substring of the build exception to look for
+ */
+ public void expectBuildExceptionContaining(String target, String cause, String contains) {
+ try {
+ executeTarget(target);
+ } catch (org.apache.tools.ant.BuildException ex) {
+ buildException = ex;
+ if ((null != contains) && (ex.getMessage().indexOf(contains) == -1)) {
+ fail("Should throw BuildException because '" + cause + "' with message containing '" + contains + "' (actual message '" + ex.getMessage() + "' instead)");
+ }
+ return;
+ }
+ fail("Should throw BuildException because: " + cause);
+ }
+
+ /**
+ * call a target, verify property is as expected
+ *
+ * @param target build file target
+ * @param property property name
+ * @param value expected value
+ */
+ public void expectPropertySet(String target, String property, String value) {
+ executeTarget(target);
+ assertPropertyEquals(property, value);
+ }
+
+ /**
+ * assert that a property equals a value; comparison is case sensitive.
+ *
+ * @param property property name
+ * @param value expected value
+ */
+ public void assertPropertyEquals(String property, String value) {
+ String result = project.getProperty(property);
+ assertEquals("property " + property,value,result);
+ }
+
+ /**
+ * assert that a property equals "true".
+ *
+ * @param property property name
+ */
+ public void assertPropertySet(String property) {
+ assertPropertyEquals(property, "true");
+ }
+
+ /**
+ * assert that a property is null.
+ *
+ * @param property property name
+ */
+ public void assertPropertyUnset(String property) {
+ assertPropertyEquals(property, null);
+ }
+
+ /**
+ * call a target, verify named property is "true".
+ *
+ * @param target build file target
+ * @param property property name
+ */
+ public void expectPropertySet(String target, String property) {
+ expectPropertySet(target, property, "true");
+ }
+
+ /**
+ * Call a target, verify property is null.
+ *
+ * @param target build file target
+ * @param property property name
+ */
+ public void expectPropertyUnset(String target, String property) {
+ expectPropertySet(target, property, null);
+ }
+
+ /**
+ * Retrieve a resource from the caller classloader to avoid
+ * assuming a vm working directory. The resource path must be
+ * relative to the package name or absolute from the root path.
+ *
+ * @param resource the resource to retrieve its url.
+ * @throws junit.framework.AssertionFailedError if the resource is not found.
+ */
+ public URL getResource(String resource){
+ URL url = getClass().getResource(resource);
+ assertNotNull("Could not find resource :" + resource, url);
+ return url;
+ }
+
+ /**
+ * an output stream which saves stuff to our buffer.
+ */
+ private static class AntOutputStream extends java.io.OutputStream {
+ private StringBuffer buffer;
+
+ public AntOutputStream( StringBuffer buffer ) {
+ this.buffer = buffer;
+ }
+
+ public void write(int b) {
+ buffer.append((char)b);
+ }
+ }
+
+ /**
+ * Our own personal build listener.
+ */
+ private class AntTestListener implements BuildListener
+ {
+ private int logLevel;
+
+ /**
+ * Constructs a test listener which will ignore log events
+ * above the given level.
+ */
+ public AntTestListener(int logLevel) {
+ this.logLevel = logLevel;
+ }
+
+ /**
+ * Fired before any targets are started.
+ */
+ public void buildStarted(BuildEvent event) {
+ }
+
+ /**
+ * Fired after the last target has finished. This event
+ * will still be thrown if an error occurred during the build.
+ *
+ * @see BuildEvent#getException()
+ */
+ public void buildFinished(BuildEvent event) {
+ }
+
+ /**
+ * Fired when a target is started.
+ *
+ * @see BuildEvent#getTarget()
+ */
+ public void targetStarted(BuildEvent event) {
+ System.out.println("targetStarted " + event.getTarget().getName());
+ }
+
+ /**
+ * Fired when a target has finished. This event will
+ * still be thrown if an error occurred during the build.
+ *
+ * @see BuildEvent#getException()
+ */
+ public void targetFinished(BuildEvent event) {
+ System.out.println("targetFinished " + event.getTarget().getName());
+ }
+
+ /**
+ * Fired when a task is started.
+ *
+ * @see BuildEvent#getTask()
+ */
+ public void taskStarted(BuildEvent event) {
+ //System.out.println("taskStarted " + event.getTask().getTaskName());
+ }
+
+ /**
+ * Fired when a task has finished. This event will still
+ * be throw if an error occurred during the build.
+ *
+ * @see BuildEvent#getException()
+ */
+ public void taskFinished(BuildEvent event) {
+ //System.out.println("taskFinished " + event.getTask().getTaskName());
+ }
+
+ /**
+ * Fired whenever a message is logged.
+ *
+ * @see BuildEvent#getMessage()
+ * @see BuildEvent#getPriority()
+ */
+ public void messageLogged(BuildEvent event) {
+ if (event.getPriority() > logLevel) {
+ // ignore event
+ return;
+ }
+
+ if (event.getPriority() == Project.MSG_INFO ||
+ event.getPriority() == Project.MSG_WARN ||
+ event.getPriority() == Project.MSG_ERR) {
+ logBuffer.append(event.getMessage());
+ }
+ fullLogBuffer.append(event.getMessage());
+ }
+ }
+
+}
+
Property changes on: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/BuildFileTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 10:08:11 UTC (rev 4147)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2007-08-03 10:12:48 UTC (rev 4148)
@@ -88,6 +88,6 @@
public void consume(URL wsdl)
{
-
+ LAST_EVENT += "consume";
}
}
Added: spi/trunk/src/test/resources/smoke/tools/consume-test.xml
===================================================================
--- spi/trunk/src/test/resources/smoke/tools/consume-test.xml (rev 0)
+++ spi/trunk/src/test/resources/smoke/tools/consume-test.xml 2007-08-03 10:12:48 UTC (rev 4148)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!--
+ An example build file that used to test the WSConsume Task
+ -->
+
+<project name="consume-test" basedir=".">
+
+ <property environment="env"/>
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath>
+ <pathelement location="${env.SPI_HOME}/output/lib/jbossws-spi.jar"/>
+ </classpath>
+ </taskdef>
+
+ <target name="plainInvocation">
+ <wsconsume wsdl="Service.wsdl" verbose="true"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: spi/trunk/src/test/resources/smoke/tools/consume-test.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
- 1
- 0