JBossWS SVN: r6274 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 08:45:43 -0400 (Tue, 08 Apr 2008)
New Revision: 6274
Modified:
stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Deploy stax with sar in AS42
Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-08 12:42:49 UTC (rev 6273)
+++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-08 12:45:43 UTC (rev 6274)
@@ -52,6 +52,8 @@
<patternset id="jbossws.lib.patternset">
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
<patternset id="jbossws.lib.endorsed.patternset">
@@ -204,6 +206,8 @@
<include name="**/jbossws-deploy.conf"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war">
16 years, 11 months
- 1
- 0
JBossWS SVN: r6273 - stack/cxf/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 08:42:49 -0400 (Tue, 08 Apr 2008)
New Revision: 6273
Modified:
stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
Log:
Deploy stax with sar in AS42
Modified: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-08 09:56:46 UTC (rev 6272)
+++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-08 12:42:49 UTC (rev 6273)
@@ -74,8 +74,6 @@
<include name="**/cxf-${cxf.version}.jar"/>
<include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
<include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="**/jbossws-cxf.jar"/>
@@ -193,6 +191,8 @@
<include name="**/jbossws-deploy.conf"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
</fileset>
</copy>
<unzip dest="@{targetdir}/jbossws-context.war">
16 years, 11 months
- 1
- 0
JBossWS SVN: r6272 - stack/cxf/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-08 05:56:46 -0400 (Tue, 08 Apr 2008)
New Revision: 6272
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2105] update tests excludes for cxf
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-08 09:55:35 UTC (rev 6271)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-08 09:56:46 UTC (rev 6272)
@@ -10,22 +10,6 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-08 09:55:35 UTC (rev 6271)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-08 09:56:46 UTC (rev 6272)
@@ -10,22 +10,6 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-08 09:55:35 UTC (rev 6271)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-08 09:56:46 UTC (rev 6272)
@@ -13,22 +13,6 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-08 09:55:35 UTC (rev 6271)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-08 09:56:46 UTC (rev 6272)
@@ -9,22 +9,6 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
16 years, 11 months
- 1
- 0
JBossWS SVN: r6271 - stack/metro/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-08 05:55:35 -0400 (Tue, 08 Apr 2008)
New Revision: 6271
Modified:
stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2105] update tests excludes for metro
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-08 07:18:46 UTC (rev 6270)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-08 09:55:35 UTC (rev 6271)
@@ -6,22 +6,6 @@
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-08 07:18:46 UTC (rev 6270)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-08 09:55:35 UTC (rev 6271)
@@ -6,22 +6,6 @@
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-08 07:18:46 UTC (rev 6270)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-08 09:55:35 UTC (rev 6271)
@@ -2,22 +2,6 @@
# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $
#
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-08 07:18:46 UTC (rev 6270)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-08 09:55:35 UTC (rev 6271)
@@ -2,22 +2,6 @@
# $Id$
#
-# [JBWS-2105] Remove dependency on native wsdl model
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/jbws1190/**
-org/jboss/test/ws/jaxws/jbws1505/**
-org/jboss/test/ws/jaxws/jbws1529/**
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/jbws1665/**
-org/jboss/test/ws/jaxws/jbws1809/**
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/jbws1909/**
-org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/jaxws/jbws860/**
-org/jboss/test/ws/jaxws/jbws944/**
-org/jboss/test/ws/jaxws/webfault/**
-
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
16 years, 11 months
- 1
- 0
JBossWS SVN: r6270 - in stack/native/trunk: ant-import-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 03:18:46 -0400 (Tue, 08 Apr 2008)
New Revision: 6270
Modified:
stack/native/trunk/ant-import-tests/build-testsuite.xml
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/src/main/distro/bin-dist-build.xml
Log:
Split the framework test build scripts
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-08 07:13:09 UTC (rev 6269)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-08 07:18:46 UTC (rev 6270)
@@ -86,7 +86,8 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${core.dir}/src/test-framework">
- <include name="ant-import/**"/>
+ <include name="ant-import/build-testsuite.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
<include name="etc/**"/>
<include name="java/**/jaxws/samples/**"/>
<include name="java/**/jaxws/smoke/**"/>
Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 07:13:09 UTC (rev 6269)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 07:18:46 UTC (rev 6270)
@@ -223,6 +223,7 @@
<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/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${core.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 07:13:09 UTC (rev 6269)
+++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 07:18:46 UTC (rev 6270)
@@ -162,7 +162,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
16 years, 11 months
- 1
- 0
JBossWS SVN: r6269 - in stack/cxf/trunk: ant-import-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 03:13:09 -0400 (Tue, 08 Apr 2008)
New Revision: 6269
Modified:
stack/cxf/trunk/ant-import-tests/build-testsuite.xml
stack/cxf/trunk/ant-import/build-bin-dist.xml
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
Log:
Split the framework test build scripts
Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-04-08 07:03:29 UTC (rev 6268)
+++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-04-08 07:13:09 UTC (rev 6269)
@@ -81,7 +81,8 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${cxf.dir}/src/test-framework">
- <include name="ant-import/**"/>
+ <include name="ant-import/build-testsuite.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
<include name="etc/**"/>
<include name="java/**/jaxws/samples/**"/>
<include name="java/**/jaxws/smoke/**"/>
Modified: stack/cxf/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 07:03:29 UTC (rev 6268)
+++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 07:13:09 UTC (rev 6269)
@@ -88,8 +88,9 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/>
<ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/>
+ <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 07:03:29 UTC (rev 6268)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 07:13:09 UTC (rev 6269)
@@ -163,7 +163,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
16 years, 11 months
- 1
- 0
JBossWS SVN: r6268 - in stack/metro/trunk: ant-import-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 03:03:29 -0400 (Tue, 08 Apr 2008)
New Revision: 6268
Modified:
stack/metro/trunk/ant-import-tests/build-testsuite.xml
stack/metro/trunk/ant-import/build-bin-dist.xml
stack/metro/trunk/src/main/distro/bin-dist-build.xml
Log:
Split the framework test build scripts
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-08 06:52:09 UTC (rev 6267)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-08 07:03:29 UTC (rev 6268)
@@ -81,7 +81,8 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${metro.dir}/src/test-framework">
- <include name="ant-import/**"/>
+ <include name="ant-import/build-testsuite.xml"/>
+ <include name="ant-import/build-samples-jaxws.xml"/>
<include name="etc/**"/>
<include name="java/**/jaxws/samples/**"/>
<include name="java/**/jaxws/smoke/**"/>
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 06:52:09 UTC (rev 6267)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-08 07:03:29 UTC (rev 6268)
@@ -99,7 +99,8 @@
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
<ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${metro.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 06:52:09 UTC (rev 6267)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-04-08 07:03:29 UTC (rev 6268)
@@ -169,7 +169,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
16 years, 11 months
- 1
- 0
JBossWS SVN: r6267 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-08 02:52:09 -0400 (Tue, 08 Apr 2008)
New Revision: 6267
Added:
framework/trunk/src/test/ant-import/build-samples-jaxws.xml
Modified:
framework/trunk/src/test/ant-import/build-jars-jaxws.xml
Log:
Split the framework test build scripts
Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-07 20:01:08 UTC (rev 6266)
+++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-08 06:52:09 UTC (rev 6267)
@@ -551,335 +551,6 @@
</webinf>
</war>
- <!-- 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"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
- </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/jaxb/WEB-INF">
- <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/message/WEB-INF">
- <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/payload/WEB-INF">
- <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/advanced/retail/**/*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/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-webfault -->
<war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -890,71 +561,6 @@
</classes>
</war>
- <!-- 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>
-
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Added: framework/trunk/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-samples-jaxws.xml (rev 0)
+++ framework/trunk/src/test/ant-import/build-samples-jaxws.xml 2008-04-08 06:52:09 UTC (rev 6267)
@@ -0,0 +1,418 @@
+<?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$ -->
+
+<project>
+
+ <description>JBossWS test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-samples-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"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/TestHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/>
+ </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/jaxb/WEB-INF">
+ <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/message/WEB-INF">
+ <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/payload/WEB-INF">
+ <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/advanced/retail/**/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/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-samples-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>
Property changes on: framework/trunk/src/test/ant-import/build-samples-jaxws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 11 months
- 1
- 0
JBossWS SVN: r6266 - in framework/trunk/src/test/java/org/jboss/test/ws/jaxws: jbws1904 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-07 16:01:08 -0400 (Mon, 07 Apr 2008)
New Revision: 6266
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java
Log:
[JBWS-2105] remove dependency on both native wsdl and schema models
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2008-04-07 17:52:35 UTC (rev 6265)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2008-04-07 20:01:08 UTC (rev 6266)
@@ -22,19 +22,15 @@
package org.jboss.test.ws.jaxws.jbws1809;
import junit.framework.Test;
+
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLTypes;
-import org.jboss.ws.metadata.wsdl.DOMTypes;
-import org.jboss.ws.metadata.wsdl.XSModelTypes;
+
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import java.net.URL;
-import java.net.MalformedURLException;
import java.util.Iterator;
/**
@@ -55,16 +51,11 @@
public void testWSDLAccess() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- assertNotNull("Unable to read WSDL definitions", wsdlDefinitions);
- XSModelTypes wsdlTypes = (XSModelTypes)wsdlDefinitions.getWsdlTypes();
-
- // convert XSModelTypes to dom representation
- // it's easier to consume...
-
- Element types = DOMUtils.parse(wsdlTypes.getSchemaModel().serialize());
+ Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString());
+ Element types = (Element)((Element)doc.getDocumentElement()
+ .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0))
+ .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema").item(0);
Iterator it = DOMUtils.getChildElements(types, "complexType");
boolean foundAttributeDeclaration = false;
@@ -87,6 +78,5 @@
}
assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration);
-
}
}
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-07 17:52:35 UTC (rev 6265)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2008-04-07 20:01:08 UTC (rev 6266)
@@ -22,16 +22,18 @@
package org.jboss.test.ws.jaxws.jbws1904;
import java.net.URL;
+import java.util.Iterator;
+import javax.xml.namespace.QName;
+
import junit.framework.Test;
-import org.apache.xerces.xs.XSTypeDefinition;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
/**
* [JBWS-1904] Explicitly set the namespace of a WebFault
@@ -51,14 +53,45 @@
public void testWSDLSchema() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1904?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- JBossXSModel xsModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
- XSTypeDefinition typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/exceptions");
- assertNotNull(typeDefinition);
- typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904");
- assertNull(typeDefinition);
- typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/faults");
- assertNull(typeDefinition);
+
+ Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString());
+ NodeList schemas = ((Element)doc.getDocumentElement()
+ .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0))
+ .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema");
+
+ boolean firstTypeFound = false;
+ boolean secondTypeFound = false;
+ for (int i = 0; i < schemas.getLength(); i++)
+ {
+ Element schema = (Element)schemas.item(i);
+ if (schema.getAttribute("targetNamespace").equals("http://org.jboss.ws/jbws1904/faults"))
+ {
+ Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
+ while (elements.hasNext())
+ {
+ Element e = (Element)elements.next();
+ boolean nameEquals = e.getAttribute("name").equals("TestExceptionFault");
+ boolean typeEquals = e.getAttribute("type").endsWith(":TestException");
+ if (nameEquals && typeEquals)
+ {
+ firstTypeFound = true;
+ }
+ }
+ }
+ if (schema.getAttribute("targetNamespace").equals("http://org.jboss.ws/jbws1904/exceptions"))
+ {
+ Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "complexType"));
+ while (elements.hasNext())
+ {
+ Element e = (Element)elements.next();
+ boolean nameEquals = e.getAttribute("name").equals("TestException");
+ if (nameEquals)
+ {
+ secondTypeFound = true;
+ }
+ }
+ }
+ }
+ assertTrue(firstTypeFound && secondTypeFound);
}
}
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-07 17:52:35 UTC (rev 6265)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/webfault/WebFaultTestCase.java 2008-04-07 20:01:08 UTC (rev 6266)
@@ -22,19 +22,19 @@
package org.jboss.test.ws.jaxws.webfault;
import java.net.URL;
+import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import junit.framework.Test;
-import org.apache.xerces.xs.XSElementDeclaration;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
-import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
/**
* Test the JSR-181 annotation: javax.jws.WebFault
@@ -61,25 +61,66 @@
*/
public void testWebFaultElement() throws Exception
{
- JBossXSModel xsModel = getSchemaModel();
- XSElementDeclaration myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", CUSTOM_FAULT_NS);
- assertNotNull(myCustomFaultElement);
- myCustomFaultElement = xsModel.getElementDeclaration("myCustomFault", TARGET_NS);
- assertNull(myCustomFaultElement);
- myCustomFaultElement = xsModel.getElementDeclaration("CustomException", CUSTOM_FAULT_NS);
- assertNull(myCustomFaultElement);
- XSElementDeclaration simpleExceptiontElement = xsModel.getElementDeclaration("SimpleException", TARGET_NS); //default to exception simple class name
- assertNotNull(simpleExceptiontElement);
+ Document doc = DOMUtils.getDocumentBuilder().parse(new URL(endpointURL + "?wsdl").toString());
+ NodeList schemas = ((Element)doc.getDocumentElement()
+ .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0))
+ .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema");
+
+ boolean firstElementFound = false;
+ boolean secondElementFound = false;
+ boolean firstTypeFound = false;
+ boolean secondTypeFound = false;
+ for (int i = 0; i < schemas.getLength(); i++)
+ {
+ Element schema = (Element)schemas.item(i);
+ if (schema.getAttribute("targetNamespace").equals("org.jboss.test.ws.jaxws.webfault.exceptions"))
+ {
+ Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
+ while (elements.hasNext())
+ {
+ Element e = (Element)elements.next();
+ boolean nameEquals = e.getAttribute("name").equals("myCustomFault");
+ boolean typeEquals = e.getAttribute("type").endsWith(":CustomException");
+ if (nameEquals && typeEquals)
+ {
+ firstElementFound = true;
+ }
+ }
+ }
+ if (schema.getAttribute("targetNamespace").equals("http://webfault.jaxws.ws.test.jboss.org/"))
+ {
+ Iterator elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "element"));
+ while (elements.hasNext())
+ {
+ Element e = (Element)elements.next();
+ boolean nameEquals = e.getAttribute("name").equals("SimpleException");
+ boolean typeEquals = e.getAttribute("type").endsWith(":SimpleException");
+ if (nameEquals && typeEquals)
+ {
+ secondElementFound = true;
+ }
+ }
+ elements = DOMUtils.getChildElements(schema, new QName("http://www.w3.org/2001/XMLSchema", "complexType"));
+ while (elements.hasNext())
+ {
+ Element e = (Element)elements.next();
+ boolean nameEquals = e.getAttribute("name").equals("CustomException");
+ if (nameEquals)
+ {
+ firstTypeFound = true;
+ }
+ nameEquals = e.getAttribute("name").equals("SimpleException");
+ if (nameEquals)
+ {
+ secondTypeFound = true;
+ }
+ }
+ }
+ }
+ assertTrue(firstElementFound && secondElementFound);
+ assertTrue(firstTypeFound && secondTypeFound);
}
- private JBossXSModel getSchemaModel() throws Exception
- {
- URL wsdlURL = new URL(endpointURL + "?wsdl");
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
- return WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
- }
-
public void testInvocation() throws Exception
{
URL wsdlURL = new URL(endpointURL + "?wsdl");
16 years, 11 months
- 1
- 0
JBossWS SVN: r6265 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 13:52:35 -0400 (Mon, 07 Apr 2008)
New Revision: 6265
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
Log:
FIXME: [CXF-1507] - CXF client handler cannot set mime header
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2008-04-07 17:20:48 UTC (rev 6264)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java 2008-04-07 17:52:35 UTC (rev 6265)
@@ -41,6 +41,8 @@
{
// Provide logging
private static Logger log = Logger.getLogger(ClientMimeHandler.class);
+
+ public static String inboundCookie;
protected boolean handleOutbound(MessageContext msgContext)
{
@@ -50,6 +52,8 @@
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
mimeHeaders.setHeader("Cookie", "client-cookie=true");
+ inboundCookie = null;
+
return true;
}
@@ -60,8 +64,8 @@
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
String[] cookies = mimeHeaders.getHeader("Set-Cookie");
- if (cookies == null || cookies.length != 1 || !cookies[0].equals("server-cookie=true"))
- throw new IllegalStateException("Unexpected cookie list: " + (cookies != null ? Arrays.asList(cookies) : null));
+ if (cookies != null && cookies.length == 1)
+ inboundCookie = cookies[0];
return true;
}
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-04-07 17:20:48 UTC (rev 6264)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-04-07 17:52:35 UTC (rev 6265)
@@ -63,18 +63,24 @@
handlerChain.add(new LogHandler());
handlerChain.add(new AuthorizationHandler());
handlerChain.add(new RoutingHandler());
+ handlerChain.add(new ClientMimeHandler());
+ bindingProvider.getBinding().setHandlerChain(handlerChain);
+
+ String resStr = port.echo("Kermit");
+ assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
+
if (isIntegrationNative())
{
- handlerChain.add(new ClientMimeHandler());
+ assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie);
}
- else
+ else if (isIntegrationMetro())
{
System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header");
}
- bindingProvider.getBinding().setHandlerChain(handlerChain);
-
- String resStr = port.echo("Kermit");
- assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header");
+ }
}
public void testHandlerChainOnServiceEndpointInterface() throws Exception
@@ -94,5 +100,18 @@
String resStr = port.echo("Kermit");
assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
}
+
+ if (isIntegrationNative())
+ {
+ assertEquals("server-cookie=true", ClientMimeHandler.inboundCookie);
+ }
+ else if (isIntegrationMetro())
+ {
+ System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header");
+ }
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header");
+ }
}
}
16 years, 11 months
- 1
- 0