June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3731 - branches/ropalka/jbossws-core/src/test/resources/jaxws.

by jbossws-commits＠lists.jboss.org

Author: richard_opalka Date: 2007-06-26 15:44:14 -0400 (Tue, 26 Jun 2007) New Revision: 3731 Removed: branches/ropalka/jbossws-core/src/test/resources/jaxws/wsrx/ Log: refactoring

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3730 - in branches/ropalka/testsuite/src/resources/jaxws/samples: wsrx and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard_opalka Date: 2007-06-26 15:43:10 -0400 (Tue, 26 Jun 2007) New Revision: 3730 Added: branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/ branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/ branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/ branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl Log: refactoring Added: branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl =================================================================== --- branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl (rev 0) +++ branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl 2007-06-26 19:43:10 UTC (rev 3730) @@ -0,0 +1,73 @@ +<?xml version='1.0' encoding='utf-8' ?> +<definitions name='RXService' targetNamespace='http://www.jboss.org/wsrx/inorder_exactlyonce/' + xmlns:tns='http://www.jboss.org/wsrx/inorder_exactlyonce/' + xmlns:xsd='http://www.w3.org/2001/XMLSchema' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns='http://schemas.xmlsoap.org/wsdl/'> + + <wsp:UsingPolicy required="true"/> + + <wsp:Policy wsu:Id="RMPolicy"> + <wsrmp:RMAssertion> + <wsp:Policy> + <wsrmp:DeliveryAssurance> + <wsp:Policy> + <wsrmp:ExactlyOnce/> + <wsrmp:InOrder/> + </wsp:Policy> + </wsrmp:DeliveryAssurance> + </wsp:Policy> + </wsrmp:RMAssertion> + </wsp:Policy> + + <message name='RXService_oneWay_Request_Soap'> + <part name='p0' type='xsd:string'/> + </message> + <message name='RXService_oneWay_Response_Soap'/> + <message name='RXService_reqResp_Request_Soap'> + <part name='p0' type='xsd:string'/> + </message> + <message name='RXService_reqResp_Response_Soap'> + <part name='response' type='xsd:string'/> + </message> + <portType name='RXService'> + <operation name='oneWay' parameterOrder='p0'> + <input message='tns:RXService_oneWay_Request_Soap'/> + <output message='tns:RXService_oneWay_Response_Soap'/> + </operation> + <operation name='reqResp' parameterOrder='p0'> + <input message='tns:RXService_reqResp_Request_Soap'/> + <output message='tns:RXService_reqResp_Response_Soap'/> + </operation> + </portType> + <binding name='RXService' type='tns:RXService'> + <wsp:PolicyReference URI="#RMPolicy"/> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='rpc'/> + <operation name='oneWay'> + <soap:operation soapAction='' style='rpc'/> + <input> + <soap:body parts='p0' use='literal' namespace='http://www.jboss.org/wsrx/inorder_exactlyonce/RXService#oneWay?KExqYXZhL2...'/> + </input> + <output> + <soap:body use='literal' namespace='http://www.jboss.org/wsrx/inorder_exactlyonce/RXService#oneWay?KExqYXZhL2...'/> + </output> + </operation> + <operation name='reqResp'> + <soap:operation soapAction='' style='rpc'/> + <input> + <soap:body parts='p0' use='literal' namespace='http://www.jboss.org/wsrx/inorder_exactlyonce/RXService#reqResp?KExqYXZhL...'/> + </input> + <output> + <soap:body parts='response' use='literal' namespace='http://www.jboss.org/wsrx/inorder_exactlyonce/RXService#reqResp?KExqYXZhL...'/> + </output> + </operation> + </binding> + <service name='RXService'> + <port name='RXService' binding='tns:RXService'> + <soap:address location='http://@jboss.bind.address@:8080/wsrx/inorder_exactlyonce'/> + </port> + </service> +</definitions> Property changes on: branches/ropalka/testsuite/src/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3729 - in branches/jbossws-2.0: integration/spi/src/main/java/org/jboss/wsf/spi/test and 168 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 15:38:00 -0400 (Tue, 26 Jun 2007) New Revision: 3729 Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Log: [JBWS-1178] Multiple virtual host and soap:address problem Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -511,7 +511,7 @@ ServerConfigFactory factory = ServerConfigFactory.getInstance(); ServerConfig config = factory.getServerConfig(); - if (!ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost())) + if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false) wsdlHost = config.getWebServiceHost(); log.debug("WSDL request, using host: " + wsdlHost); Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -61,7 +61,6 @@ super(name); } - /** Get the MBeanServerConnection from JNDI */ public MBeanServerConnection getServer() throws NamingException { return delegate.getServer(); Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -27,6 +27,9 @@ import java.util.List; import java.util.StringTokenizer; +import javax.management.MBeanServerConnection; +import javax.naming.NamingException; + import junit.extensions.TestSetup; import junit.framework.Test; import junit.framework.TestSuite; @@ -42,26 +45,21 @@ private JBossWSTestHelper delegate = new JBossWSTestHelper(); private String[] archives = new String[0]; - public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList) + public JBossWSTestSetup(Class testClass, String archiveList) { - return new JBossWSTestSetup(testClass, archiveList); + super(new TestSuite(testClass)); + getArchiveArray(archiveList); } - public static JBossWSTestSetup newTestSetup(Test test, String archiveList) + public JBossWSTestSetup(Test test, String archiveList) { - return new JBossWSTestSetup(test, archiveList); - } - - protected JBossWSTestSetup(Class testClass, String archiveList) - { - super(new TestSuite(testClass)); + super(test); getArchiveArray(archiveList); } - protected JBossWSTestSetup(Test test, String archiveList) + public JBossWSTestSetup(Test test) { super(test); - getArchiveArray(archiveList); } private void getArchiveArray(String archiveList) @@ -121,4 +119,9 @@ delegate.undeploy(archive); } } + + public MBeanServerConnection getServer() throws NamingException + { + return delegate.getServer(); + } } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); + return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar"); + return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); + return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); + return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war"); + return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(SOAPConnectionTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(SOAPConnectionTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); } public void testConnectString() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BaseDataTypesDocLitBTestCase.class, "jbossws-interop-BaseDataTypesDocLitB.war"); + return new JBossWSTestSetup(BaseDataTypesDocLitBTestCase.class, "jbossws-interop-BaseDataTypesDocLitB.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BaseDataTypesDocLitWTestCase.class, "jbossws-interop-BaseDataTypesDocLitW.war"); + return new JBossWSTestSetup(BaseDataTypesDocLitWTestCase.class, "jbossws-interop-BaseDataTypesDocLitW.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(BaseDataTypesRpcLitTestCase.class, "jbossws-interop-BaseDataTypesRpcLit.war"); + return new JBossWSTestSetup(BaseDataTypesRpcLitTestCase.class, "jbossws-interop-BaseDataTypesRpcLit.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -72,7 +72,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war"); + return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -35,7 +35,7 @@ public static Test suite() { prepareClientClasspath("jbossws-interop-wsse10Encrypt-client.jar"); - return JBossWSTestSetup.newTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war"); + return new JBossWSTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war"); } String getEndpointURL() { Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -34,7 +34,7 @@ public static Test suite() { prepareClientClasspath("jbossws-interop-wsse10Sign-client.jar"); - return JBossWSTestSetup.newTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war"); + return new JBossWSTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war"); } String getEndpointURL() { Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-client.jar"); + return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar"); + return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-client.jar"); + return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -131,7 +131,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-client.jar"); + return new JBossWSTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar"); + return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-client.jar"); + return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-client.jar"); + return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar"); + return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); + return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar"); + return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear"); + return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ { public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1124TestCase.class, "jaxrpc-jbws1124one.war, jaxrpc-jbws1124two.war"); + return new JBossWSTestSetup(JBWS1124TestCase.class, "jaxrpc-jbws1124one.war, jaxrpc-jbws1124two.war"); } public void testEnpointOne() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar"); + return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar"); + return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar"); + return new JBossWSTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war"); + return new JBossWSTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar"); + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar"); + return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar"); } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-client.jar"); + return new JBossWSTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS128TestCase.class, "jaxrpc-jbws128.ear"); + return new JBossWSTestSetup(JBWS128TestCase.class, "jaxrpc-jbws128.ear"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); + return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war"); + return new JBossWSTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war"); + return new JBossWSTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war"); + return new JBossWSTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war"); + return new JBossWSTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar"); + return new JBossWSTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-client.jar"); + return new JBossWSTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar"); + return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-client.jar"); + return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -38,7 +38,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); + return new JBossWSTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); } public String getMessage() Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -38,7 +38,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); + return new JBossWSTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); } public String getMessage() Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS165TestCase.class, "jaxrpc-jbws165.ear"); + return new JBossWSTestSetup(JBWS165TestCase.class, "jaxrpc-jbws165.ear"); } public void testNone() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ { public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar"); + return new JBossWSTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -56,7 +56,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS167TestCase.class, "jaxrpc-jbws167.war"); + return new JBossWSTestSetup(JBWS167TestCase.class, "jaxrpc-jbws167.war"); } public void testHttpHeaders() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-client.jar"); + return new JBossWSTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-client.jar"); } public void testEmptyProperty() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar"); + return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar"); + return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar"); + return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar"); + return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ { public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS331TestCase.class, "jaxrpc-jbws331.ear"); + return new JBossWSTestSetup(JBWS331TestCase.class, "jaxrpc-jbws331.ear"); } public void testEndpointAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar"); + return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar"); + return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar"); } public void testEndpointNotNull() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar"); + return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar"); + return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar"); + return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar"); } public void testClientAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar"); + return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar"); + return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar"); } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar"); + return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -59,7 +59,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar"); + return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar"); + return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar"); + return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar"); + return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar"); + return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar"); + return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear"); + return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar"); + return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-client.jar"); + return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -60,7 +60,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS64TestCase.class, "jaxrpc-jbws64.war"); + return new JBossWSTestSetup(JBWS64TestCase.class, "jaxrpc-jbws64.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar"); + return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar"); + return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar"); + return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar"); + return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar"); + return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -57,7 +57,7 @@ suite.addTest(new JBWS70TestCase("testSetVersion")); suite.addTest(new JBWS70TestCase("testGetVersion")); - return JBossWSTestSetup.newTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar"); + return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar"); + return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -58,7 +58,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar"); + return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar"); + return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar"); + return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar"); + return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); + return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); } public void testRoleSecuredWSDLAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar"); + return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -38,7 +38,7 @@ // public static Test suite() throws Exception // { -// return JBossWSTestSetup.newTestSetup(JBWS751TestCase.class, "jaxrpc-jbws751.war, jaxrpc-jbws751-client.jar"); +// return new JBossWSTestSetup(JBWS751TestCase.class, "jaxrpc-jbws751.war, jaxrpc-jbws751-client.jar"); // } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS772TestCase.class, "jaxrpc-jbws772.ear"); + return new JBossWSTestSetup(JBWS772TestCase.class, "jaxrpc-jbws772.ear"); } public void testEndpointAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar"); + return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar"); } public void testEndpointAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar"); + return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar"); } /** Test endpoint one Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -57,7 +57,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS801TestCase.class, "jaxrpc-jbws801.war"); + return new JBossWSTestSetup(JBWS801TestCase.class, "jaxrpc-jbws801.war"); } public void testLargeFile() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); + return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -67,7 +67,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar"); + return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar"); } /** Send the raw bytes via an HttpURLConnection Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar"); + return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar"); + return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar"); + return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar"); } /** Use the JBoss generated dynamic proxy send the SOAP message. Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS950TestCase.class, "jaxrpc-jbws950.war"); + return new JBossWSTestSetup(JBWS950TestCase.class, "jaxrpc-jbws950.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS956TestCase.class, "jaxrpc-jbws956.war"); + return new JBossWSTestSetup(JBWS956TestCase.class, "jaxrpc-jbws956.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-client.jar"); + return new JBossWSTestSetup(MarshallDocLitTestCase.class, "jaxrpc-marshall-doclit.war, jaxrpc-marshall-doclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-client.jar"); + return new JBossWSTestSetup(MarshallRpcLitTestCase.class, "jaxrpc-marshall-rpclit.war, jaxrpc-marshall-rpclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -71,7 +71,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(OutParamDIITestCase.class, "jaxrpc-outparam.war"); + return new JBossWSTestSetup(OutParamDIITestCase.class, "jaxrpc-outparam.war"); } public void testEchoBigDecimal() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-client.jar"); + return new JBossWSTestSetup(OverloadedTestCase.class, "jaxrpc-overloaded.war, jaxrpc-overloaded-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar"); + return new JBossWSTestSetup(TrivialServiceDocBareTestCase.class, "jaxrpc-samples-docstyle-bare.war, jaxrpc-samples-docstyle-bare-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar"); + return new JBossWSTestSetup(TrivialServiceDocWrappedTestCase.class, "jaxrpc-samples-docstyle-wrapped.war, jaxrpc-samples-docstyle-wrapped-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -55,7 +55,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(DynamicHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); + return new JBossWSTestSetup(StaticHandlerTestCase.class, "jaxrpc-samples-dynamichandler.war, jaxrpc-samples-dynamichandler-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -58,7 +58,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(ExceptionTestCase.class, "jaxrpc-samples-exception.war, jaxrpc-samples-exception-client.jar"); + return new JBossWSTestSetup(ExceptionTestCase.class, "jaxrpc-samples-exception.war, jaxrpc-samples-exception-client.jar"); } private ExceptionServiceInterface getPort() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar"); + return new JBossWSTestSetup(HeaderClientTestCase.class, "jaxrpc-samples-handler.war, jaxrpc-samples-handler-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ private static final String HEADER_NAMESPACE_URI = "http://org.jboss.ws/samples/handler/types"; public static Test suite() { - return JBossWSTestSetup.newTestSetup(HeaderDIITestCase.class, "jaxrpc-samples-handler.war"); + return new JBossWSTestSetup(HeaderDIITestCase.class, "jaxrpc-samples-handler.war"); } public void testBoundInHeader() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HeaderProxyTestCase.class, "jaxrpc-samples-handler.war"); + return new JBossWSTestSetup(HeaderProxyTestCase.class, "jaxrpc-samples-handler.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -70,7 +70,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war"); + return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war"); } public void testEchoBigDecimal() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -66,7 +66,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar"); + return new JBossWSTestSetup(HolderDIITestCase.class, "jaxrpc-samples-holder.war, jaxrpc-samples-holder-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -39,7 +39,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar"); + return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar"); + return new JBossWSTestSetup(DocEJBTestCase.class, "jaxrpc-samples-jsr109ejb-doc.jar, jaxrpc-samples-jsr109ejb-doc-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); + return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcDIIUnconfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); + return new JBossWSTestSetup(RpcDIIUnconfiguredCallTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); } public void testEchoString() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar"); + return new JBossWSTestSetup(RpcEJBTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar, jaxrpc-samples-jsr109ejb-rpc-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); + return new JBossWSTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109ejb-rpc.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar"); + return new JBossWSTestSetup(DocJSETestCase.class, "jaxrpc-samples-jsr109pojo-doc.war, jaxrpc-samples-jsr109pojo-doc-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(RpcDIIConfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcDIIUnconfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(RpcDIIUnconfiguredCallTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); } public void testEchoString() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar"); + return new JBossWSTestSetup(RpcJSETestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war, jaxrpc-samples-jsr109pojo-rpc-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); + return new JBossWSTestSetup(RpcProxyTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -65,7 +65,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(MessageTestCase.class, "jaxrpc-samples-message.war, jaxrpc-samples-message-client.jar"); + return new JBossWSTestSetup(MessageTestCase.class, "jaxrpc-samples-message.war, jaxrpc-samples-message-client.jar"); } /** Use the SAAJ API to send the SOAP message. Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar"); + return new JBossWSTestSetup(MTOMTestCase.class, "jaxrpc-samples-mtom.war, jaxrpc-samples-mtom-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar"); + return new JBossWSTestSetup(OneWayTestCase.class, "jaxrpc-samples-oneway.war, jaxrpc-samples-oneway-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -41,7 +41,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar"); + return new JBossWSTestSetup(TrivialServiceRpcTestCase.class, "jaxrpc-samples-rpcstyle.war, jaxrpc-samples-rpcstyle-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar"); + return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar"); } public void testRoleSecuredWSDLAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -60,7 +60,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(AttachmentDIITestCase.class, "jaxrpc-samples-swa.war"); + return new JBossWSTestSetup(AttachmentDIITestCase.class, "jaxrpc-samples-swa.war"); } /** Send a multipart message with a text/plain attachment part Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -53,7 +53,7 @@ /** Deploy the test ear */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar"); + return new JBossWSTestSetup(AttachmentProxyTestCase.class, "jaxrpc-samples-swa.war, jaxrpc-samples-swa-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -70,7 +70,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(AttachmentSAAJTestCase.class, "jaxrpc-samples-swa.war"); + return new JBossWSTestSetup(AttachmentSAAJTestCase.class, "jaxrpc-samples-swa.war"); } /** Send a multipart message with a text/plain attachment part Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - JBossWSTestSetup wsTestSetup = JBossWSTestSetup.newTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); + JBossWSTestSetup wsTestSetup = new JBossWSTestSetup(BpelHelloTestCase.class, "jaxrpc-samples-wsbpel-hello.war, jaxrpc-samples-wsbpel-hello-client.jar"); return new JbpmBpelTestSetup(wsTestSetup, new String[] { "libs/jaxrpc-samples-wsbpel-hello-process.zip" }); } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, jaxrpc-samples-wssecurity-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxrpc-samples-wssecurity-encrypt.war, jaxrpc-samples-wssecurity-encrypt-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, jaxrpc-samples-wssecurity-sign-client.jar"); + return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxrpc-samples-wssecurity-sign.war, jaxrpc-samples-wssecurity-sign-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); + return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar"); } Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); + return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -67,7 +67,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(UTF16TestCase.class, "jaxrpc-utf16.war, jaxrpc-utf16-client.jar"); + return new JBossWSTestSetup(UTF16TestCase.class, "jaxrpc-utf16.war, jaxrpc-utf16-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ { public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(WsdlPublishTestCase.class, "jaxrpc-wsdlpublish.war"); + return new JBossWSTestSetup(WsdlPublishTestCase.class, "jaxrpc-wsdlpublish.war"); } public void testClientProxy() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar"); + return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-client.jar"); + return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -39,6 +39,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-client.jar"); + return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-client.jar"); } } \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -40,6 +40,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-client.jar"); + return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-client.jar"); } } \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); + return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -40,7 +40,7 @@ { public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(WebClientTestCase.class, "jaxrpc-wsse-web-client.war"); + return new JBossWSTestSetup(WebClientTestCase.class, "jaxrpc-wsse-web-client.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -38,7 +38,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-client.jar"); + return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-client.jar"); } public void testEndpoint() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar"); + return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -40,7 +40,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar"); + return new JBossWSTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); + return new JBossWSTestSetup(AnonymousTestCase.class, "jaxws-anonymous.war"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(SOAPBindingTestCase.class, "jaxws-binding.war"); + return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-binding.war"); } public void testClientAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ComplexTestCase.class, "jaxws-complex.war"); + return new JBossWSTestSetup(ComplexTestCase.class, "jaxws-complex.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ { public static Test suite() { - return new TestSetup(JBossWSTestSetup.newTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")) { + return new TestSetup(new JBossWSTestSetup(EndpointTestCase.class, "jaxws-endpoint-servlet.war")) { private Boolean useJBossWebLoader; Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar"); + return new JBossWSTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(HandlerScopeTestCase.class, "jaxws-handlerscope.war"); + return new JBossWSTestSetup(HandlerScopeTestCase.class, "jaxws-handlerscope.war"); } public void testClientAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HolderTestCase.class, "jaxws-holder.war"); + return new JBossWSTestSetup(HolderTestCase.class, "jaxws-holder.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -30,6 +30,7 @@ import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; +import junit.extensions.TestSetup; import junit.framework.Test; import org.jboss.ws.core.jaxrpc.client.CallImpl; @@ -46,26 +47,32 @@ */ public class JBWS1178TestCase extends JBossWSTest { - private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); - String webServiceHost; - public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1178TestCase.class, "jaxws-jbws1178.war"); - } + TestSetup testSetup = new JBossWSTestSetup(JBWS1178TestCase.class, "jaxws-jbws1178.war") + { + private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + private String webServiceHost; + + public void setUp() throws Exception + { + // Setting the WebServiceHost to an empty string, causes the request host to be used. + // This must be done before deploy time. + webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); + getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); + super.setUp(); + } - public void setUp() throws Exception - { - webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); - // Setting the WebServiceHost to an empty string, causes the request host to be used - getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); + public void tearDown() throws Exception + { + super.tearDown(); + getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); + } + }; + return testSetup; } - public void tearDown() throws Exception - { - getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); - } public void testHostAddress() throws Exception { Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); + return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -58,7 +58,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar"); + return new JBossWSTestSetup(JBWS1283TestCase.class, "jaxws-jbws1283.jar"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war"); + return new JBossWSTestSetup(JBWS1357TestCase.class, "jaxws-jbws1357.war"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar"); + return new JBossWSTestSetup(JBWS1422TestCase.class, "jaxws-jbws1422.jar"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); + return new JBossWSTestSetup(JBWS1446TestCase.class, "jaxws-jbws1446.jar"); } public void setUp() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar"); + return new JBossWSTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); + return new JBossWSTestSetup(JBWS1529TestCase.class, "jaxws-jbws1529.war"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); + return new JBossWSTestSetup(JBWS1556EarTestCase.class, "jaxws-jbws1556.ear"); } public void setUp() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -22,7 +22,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar"); + return new JBossWSTestSetup(Jaxb20TestCase.class, "jaxws-jbws1566.jar"); } public void testWebService() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581.jar"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -42,7 +42,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581.war, jaxws-jbws1581.jar"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1611TestCase.class, "jaxws-jbws1611.war"); + return new JBossWSTestSetup(JBWS1611TestCase.class, "jaxws-jbws1611.war"); } public void testWebService() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war"); + return new JBossWSTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war"); } public void testPortAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war"); + return new JBossWSTestSetup(JBWS860TestCase.class, "jaxws-jbws860.war"); } public void testAccessInventoryServiceWsdl() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -54,7 +54,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS871TestCase.class, "jaxws-jbws871-rpc.war"); + return new JBossWSTestSetup(JBWS871TestCase.class, "jaxws-jbws871-rpc.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS944TestCase.class, "jaxws-jbws944.jar"); + return new JBossWSTestSetup(JBWS944TestCase.class, "jaxws-jbws944.jar"); } public void testRemoteAccess() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); + return new JBossWSTestSetup(JBWS981TestCase.class, "jaxws-jbws981.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(MultipleNamespacesTestCase.class, "jaxws-namespace.war"); + return new JBossWSTestSetup(MultipleNamespacesTestCase.class, "jaxws-namespace.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -39,7 +39,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-client.jar"); + return new JBossWSTestSetup(WebServiceRefClientTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-client.jar"); } public void testGeneratedService() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-samples-webserviceref.war"); + return new JBossWSTestSetup(WebServiceRefEJB3TestCase.class, "jaxws-samples-webserviceref.war"); } public void testDynamicProxy() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefServletTestCase.class, "jaxws-samples-webserviceref.war"); + return new JBossWSTestSetup(WebServiceRefServletTestCase.class, "jaxws-samples-webserviceref.war"); } public void testDynamicProxy() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war"); + return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -68,7 +68,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(SysmonTestCase.class, "jaxws-samples-wseventing.war"); + return new JBossWSTestSetup(SysmonTestCase.class, "jaxws-samples-wseventing.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); + return new JBossWSTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecuritypolicy-encrypt.war"); + return new JBossWSTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecuritypolicy-encrypt.war"); } /** Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-client.jar"); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-ejb-client.jar"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-servlet-client.war"); + return new JBossWSTestSetup(ServiceRefServletTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-servlet-client.war"); } public void testWSDLAccess() throws MalformedURLException Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AccessorTestCase.class, "jaxws-wrapped-accessor.war"); + return new JBossWSTestSetup(AccessorTestCase.class, "jaxws-wrapped-accessor.war"); } @Override Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -48,7 +48,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war"); + return new JBossWSTestSetup(AddressingActionTestCase.class, "jaxws-wsaddressing-action-rpc.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class, + return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxws-wsaddressing-initial.war,jaxws-wsaddressing-initial-client.jar," + "jaxws-wsaddressing-replyto.war,jaxws-wsaddressing-replyto-client.jar," + "jaxws-wsaddressing-faultto.war"); Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(TestDDOverrides.class, "jaxws-wsdd.war"); + return new JBossWSTestSetup(TestDDOverrides.class, "jaxws-wsdd.war"); } public void testHandlerChainOverride() throws Exception Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(EventingTestCase.class, "jaxws-wseventing.war"); + return new JBossWSTestSetup(EventingTestCase.class, "jaxws-wseventing.war"); } // ---------------------------------------------------------------------------- Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(NotificationTestCase.class, "jaxws-wseventing.war"); + return new JBossWSTestSetup(NotificationTestCase.class, "jaxws-wseventing.war"); } public void testNotification() throws Exception { Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -60,7 +60,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AsynchronousDispatchTestCase.class, "jaxws-samples-asynchronous.war"); + return new JBossWSTestSetup(AsynchronousDispatchTestCase.class, "jaxws-samples-asynchronous.war"); } public void testInvokeAsynch() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(AsynchronousProxyTestCase.class, "jaxws-samples-asynchronous.war"); + return new JBossWSTestSetup(AsynchronousProxyTestCase.class, "jaxws-samples-asynchronous.war"); } public void testInvokeSync() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar"); + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war"); + return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -49,7 +49,7 @@ public static Test suite() { String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear"); - return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); + return new JBossWSTestSetup(EarTestCase.class, earName); } public void testEJB3Endpoint() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -46,7 +46,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ExceptionTestCase.class, "jaxws-samples-exception.war"); + return new JBossWSTestSetup(ExceptionTestCase.class, "jaxws-samples-exception.war"); } @Override Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HandlerChainTestCase.class, "jaxws-samples-handlerchain.war"); + return new JBossWSTestSetup(HandlerChainTestCase.class, "jaxws-samples-handlerchain.war"); } public void testDynamicHandlerChain() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(HttpJAXBTestCase.class, "jaxws-samples-httpbinding-jaxb.war"); + return new JBossWSTestSetup(HttpJAXBTestCase.class, "jaxws-samples-httpbinding-jaxb.war"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -56,7 +56,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HttpPayloadTestCase.class, "jaxws-samples-httpbinding-payload.war"); + return new JBossWSTestSetup(HttpPayloadTestCase.class, "jaxws-samples-httpbinding-payload.war"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -44,7 +44,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(LogicalHandlerJAXBTestCase.class, "jaxws-samples-logicalhandler-jaxb.war"); + return new JBossWSTestSetup(LogicalHandlerJAXBTestCase.class, "jaxws-samples-logicalhandler-jaxb.war"); } public void testClientAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -43,7 +43,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(LogicalHandlerSourceTestCase.class, "jaxws-samples-logicalhandler-source.war"); + return new JBossWSTestSetup(LogicalHandlerSourceTestCase.class, "jaxws-samples-logicalhandler-source.war"); } public void testSourceDoc() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -51,7 +51,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(OneWayTestCase.class, "jaxws-samples-oneway.war"); + return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-samples-oneway.war"); } public void testWebService() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -59,7 +59,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(ProviderJAXBTestCase.class, "jaxws-samples-provider-jaxb.war"); + return new JBossWSTestSetup(ProviderJAXBTestCase.class, "jaxws-samples-provider-jaxb.war"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -66,7 +66,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ProviderMessageTestCase.class, "jaxws-samples-provider-message.war"); + return new JBossWSTestSetup(ProviderMessageTestCase.class, "jaxws-samples-provider-message.war"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -66,7 +66,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ProviderPayloadTestCase.class, "jaxws-samples-provider-payload.war"); + return new JBossWSTestSetup(ProviderPayloadTestCase.class, "jaxws-samples-provider-payload.war"); } public void testWSDLAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -45,7 +45,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(RetailSampleTestCase.class, "jaxws-samples-retail.jar"); + return new JBossWSTestSetup(RetailSampleTestCase.class, "jaxws-samples-retail.jar"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -53,7 +53,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(SOAPBindingTestCase.class, "jaxws-samples-soapbinding.war"); + return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-samples-soapbinding.war"); } public void testExampleService() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -50,7 +50,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar"); + return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar"); } public void testBeanAnnotationWithBare() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -57,7 +57,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebMethodTestCase.class, "jaxws-samples-webmethod.war"); + return new JBossWSTestSetup(WebMethodTestCase.class, "jaxws-samples-webmethod.war"); } public void testLegalAccess() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war"); + return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war"); + return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war"); } public void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -36,7 +36,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceEJB3TestCase.class, ""); + return new JBossWSTestSetup(WebServiceEJB3TestCase.class, ""); } public void testWebServiceTest() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -36,7 +36,7 @@ { public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceJSETestCase.class, ""); + return new JBossWSTestSetup(WebServiceJSETestCase.class, ""); } public void testWebServiceTest() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPBareTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPBareTestCase.class, "jaxws-samples-xop-doclit.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -57,7 +57,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxws-samples-xop-doclit.war"); } protected void setUp() throws Exception Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-06-26 13:19:44 UTC (rev 3728) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-06-26 19:38:00 UTC (rev 3729) @@ -52,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPWrappedTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPWrappedTestCase.class, "jaxws-samples-xop-doclit.war"); } protected void setUp() throws Exception

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3728 - in branches/jbossws-2.0/jbossws-core/src: test/java/org/jboss/test/ws/jaxrpc/jbws1653 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 09:19:44 -0400 (Tue, 26 Jun 2007) New Revision: 3728 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java Log: [JBWS-1653] Post-handler-chain not invoked for Standard Client configuration Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 13:10:04 UTC (rev 3727) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 13:19:44 UTC (rev 3728) @@ -415,6 +415,7 @@ ClassLoader cl = epMetaData.getClassLoader(); Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, Stub.class, StubExt.class }, handler); + // Setup the handler chain setupHandlerChain(epMetaData); return proxy; Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 13:10:04 UTC (rev 3727) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 13:19:44 UTC (rev 3728) @@ -68,21 +68,6 @@ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) { - public URL findResource(String resName) - { - URL resURL = super.findResource(resName); - try - { - if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) - resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); - } - catch (MalformedURLException ex) - { - // ignore - } - return resURL; - } - public URL getResource(String resName) { URL resURL = super.getResource(resName); @@ -100,9 +85,6 @@ }; Thread.currentThread().setContextClassLoader(urlLoader); - URL configURL = urlLoader.findResource("META-INF/standard-jaxrpc-client-config.xml"); - assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0); - InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3727 - in branches/jbossws-2.0/jbossws-core: src/main/java/org/jboss/ws/core and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 09:10:04 -0400 (Tue, 26 Jun 2007) New Revision: 3727 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml Removed: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl Log: [JBWS-1653] Post-handler-chain not invoked for Standard Client configuration Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-26 11:36:04 UTC (rev 3726) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -2522,6 +2522,32 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1653-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jbws1653/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> +  <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 11:36:04 UTC (rev 3726) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -104,6 +104,9 @@ { this.epMetaData = serviceMetaData.getEndpoints().get(0); } + + // Initialize the binding provider + this.bindingProvider = getCommonBindingProvider(); } /** Create a call for a known WSDL endpoint. @@ -111,6 +114,9 @@ protected CommonClient(EndpointMetaData epMetaData) { this.epMetaData = epMetaData; + + // Initialize the binding provider + this.bindingProvider = getCommonBindingProvider(); } /** Create a call for a known WSDL endpoint. @@ -137,6 +143,9 @@ { setOperationName(opName); } + + // Initialize the binding provider + this.bindingProvider = getCommonBindingProvider(); } /** Gets the address of a target service endpoint. @@ -472,14 +481,7 @@ protected abstract CommonMessageContext processPivot(CommonMessageContext requestContext); - protected CommonBindingProvider getCommonBindingProvider() - { - if (bindingProvider == null) - { - bindingProvider = new CommonBindingProvider(getEndpointMetaData()); - } - return bindingProvider; - } + protected abstract CommonBindingProvider getCommonBindingProvider(); protected abstract Map<String, Object> getRequestContext(); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-06-26 11:36:04 UTC (rev 3726) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -47,6 +47,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; +import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.RoleSource; @@ -478,6 +479,15 @@ else return null; } + protected CommonBindingProvider getCommonBindingProvider() + { + if (bindingProvider == null) + { + bindingProvider = new CommonBindingProvider(getEndpointMetaData()); + } + return bindingProvider; + } + @Override protected void setInboundContextProperties() { Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-06-26 11:36:04 UTC (rev 3726) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -24,7 +24,9 @@ // $Id$ import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -113,8 +115,15 @@ handler.setEndpointMetaData(epMetaData); handler.setHandlerClassName(info.getHandlerClass().getName()); handler.setSoapRoles(roles); - if(log.isDebugEnabled()) log.debug("Add handler to: " + portName + handler); + + Set<QName> headers = new HashSet<QName>(); + for (QName header : info.getHeaders()) + headers.add(header); + + handler.setSoapHeaders(headers); + epMetaData.addHandler(handler); + log.debug("Add handler to: " + portName + handler); } } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 11:36:04 UTC (rev 3726) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -415,6 +415,8 @@ ClassLoader cl = epMetaData.getClassLoader(); Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, Stub.class, StubExt.class }, handler); + setupHandlerChain(epMetaData); + return proxy; } @@ -490,35 +492,39 @@ void setupHandlerChain(EndpointMetaData epMetaData) { - QName portName = epMetaData.getPortName(); - Set<String> handlerRoles = new HashSet<String>(); - ArrayList handlerInfos = new ArrayList(); - for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL)) + if (epMetaData.isHandlersInitialized() == false) { - HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData; - handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); - - HashMap hConfig = new HashMap(); - for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams()) + QName portName = epMetaData.getPortName(); + Set<String> handlerRoles = new HashSet<String>(); + List<HandlerInfo> handlerInfos = new ArrayList<HandlerInfo>(); + for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL)) { - hConfig.put(param.getParamName(), param.getParamValue()); - } + HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData; + handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); - Set<QName> headers = jaxrpcMetaData.getSoapHeaders(); - QName[] headerArr = new QName[headers.size()]; - headers.toArray(headerArr); + HashMap hConfig = new HashMap(); + for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams()) + { + hConfig.put(param.getParamName(), param.getParamValue()); + } - Class hClass = jaxrpcMetaData.getHandlerClass(); - hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); - HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); + Set<QName> headers = jaxrpcMetaData.getSoapHeaders(); + QName[] headerArr = new QName[headers.size()]; + headers.toArray(headerArr); - if (log.isDebugEnabled()) + Class hClass = jaxrpcMetaData.getHandlerClass(); + hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); + HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); + log.debug("Adding client side handler to endpoint '" + portName + "': " + info); - handlerInfos.add(info); + handlerInfos.add(info); - // register the handlers with the client engine - if (handlerInfos.size() > 0) - registerHandlerChain(portName, handlerInfos, handlerRoles); + // register the handlers with the client engine + if (handlerInfos.size() > 0) + registerHandlerChain(portName, handlerInfos, handlerRoles); + } + + epMetaData.setHandlersInitialized(true); } } } Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1653; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; + +/** + * A simple client side handler + * + * @author thomas.diesler(a)jboss.org + */ +public class ClientHandler extends GenericHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(ClientHandler.class); + + public static String message; + + public QName[] getHeaders() + { + return new QName[0]; + } + + public boolean handleResponse(MessageContext msgContext) + { + log.info("handleResponse"); + + try + { + SOAPMessageContext soapContext = (SOAPMessageContext)msgContext; + SOAPMessage soapMessage = soapContext.getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + message = soapElement.getValue(); + } + catch (Exception e) + { + log.error("Handler processing error", e); + } + + return true; + } +} Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1653; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * [JBWS-1653] Post-handler-chain not invoked for "Standard Client" configuration + * + * @author Thomas.Diesler(a)jboss.com + * @since 26-Jun-2007 + */ +public class JBWS1653TestCase extends JBossWSTest +{ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar"); + } + + public void setUp() throws Exception + { + ClientHandler.message = null; + } + + public void testStandardConfig() throws Exception + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String retStr = port.echoString("kermit"); + assertEquals("kermit", retStr); + assertNull(ClientHandler.message); + } + + public void testCustomConfig() throws Exception + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader) + { + public URL findResource(String resName) + { + URL resURL = super.findResource(resName); + try + { + if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) + resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + } + catch (MalformedURLException ex) + { + // ignore + } + return resURL; + } + + public URL getResource(String resName) + { + URL resURL = super.getResource(resName); + try + { + if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml")) + resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL(); + } + catch (MalformedURLException ex) + { + // ignore + } + return resURL; + } + }; + Thread.currentThread().setContextClassLoader(urlLoader); + + URL configURL = urlLoader.findResource("META-INF/standard-jaxrpc-client-config.xml"); + assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0); + + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + try + { + String retStr = port.echoString("kermit"); + assertEquals("kermit", retStr); + assertEquals("kermit", ClientHandler.message); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } +} Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1653; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface TestEndpoint extends Remote +{ + + public String echoString(final String message) throws RemoteException; + +} Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java 2007-06-26 13:10:04 UTC (rev 3727) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1653; + +import java.rmi.RemoteException; + +import org.jboss.logging.Logger; + +public class TestEndpointImpl implements TestEndpoint +{ + private Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echoString(String message) throws RemoteException + { + log.info("echoString: " + message); + return message; + } +} Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653 (from rev 3720, branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619) Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -13,12 +13,8 @@ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface> </port-component-ref> - <handler> - <handler-name>ClientHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1619.ClientHandler</handler-class> - </handler> </service-ref> </application-client> Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override> + <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1653/TestEndpoint?wsdl</wsdl-override> </service-ref> </jboss-client> Added: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <post-handler-chain> + <handler-chain-name>Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>ClientHandler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.test.ws.jaxrpc.jbws1653.ClientHandler</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + +</jaxrpc-config> \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -1,20 +1,20 @@ <?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1619</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1619/types</namespaceURI> + <package-type>org.jboss.test.ws.jaxrpc.jbws1653</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1653/types</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1619'>serviceNS:TestService</wsdl-service-name> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1653'>serviceNS:TestService</wsdl-service-name> <port-mapping> <port-name>TestEndpointPort</port-name> <java-port-name>TestEndpointPort</java-port-name> </port-mapping> </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1619'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1619'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1653'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1653'>bindingNS:TestEndpointBinding</wsdl-binding> <service-endpoint-method-mapping> <java-method-name>echoString</java-method-name> <wsdl-operation>echoString</wsdl-operation> @@ -22,14 +22,14 @@ <param-position>0</param-position> <param-type>java.lang.String</param-type> <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1653'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> <wsdl-message-part-name>String_1</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1653'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -1,4 +1,4 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1619' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1653' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> <webservice-description> <webservice-description-name>TestService</webservice-description-name> <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> @@ -6,7 +6,7 @@ <port-component> <port-component-name>TestEndpointPort</port-component-name> <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface> <service-impl-bean> <servlet-link>TestEndpoint</servlet-link> </service-impl-bean> Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl 2007-06-26 13:10:04 UTC (rev 3727) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1619' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1619' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1653' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1653' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types/> <message name='TestEndpoint_echoString'> <part name='String_1' type='xsd:string'/> @@ -18,16 +18,16 @@ <operation name='echoString'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1653' use='literal'/> </input> <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1653' use='literal'/> </output> </operation> </binding> <service name='TestService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080//jaxrpc-jbws1619/TestEndpoint?wsdl'/> + <soap:address location='http://localhost:8080//jaxrpc-jbws1653/TestEndpoint?wsdl'/> </port> </service> </definitions> \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/wstools-config.xml 2007-06-26 06:04:26 UTC (rev 3720) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml 2007-06-26 13:10:04 UTC (rev 3727) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1619" type-namespace="http://org.jboss.test.ws/jbws1619/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3726 - in branches/jbossws-1.2.0.GA_JBWS-1610: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-06-26 07:36:04 -0400 (Tue, 26 Jun 2007) New Revision: 3726 Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java Log: JBWS-1610 - Merge final comment and text node preservation code and rollback handler changes as too many regressions introduced. Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -256,13 +256,6 @@ // Bind the request message SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, unboundHeaders); - - List ll = this.epMetaData.getHandlerMetaData(HandlerType.POST); - log.debug("NumberOfHandlers ofType POST fromConfigFiles= "+ll.size()); - - // FIX: Update the HandlerRegistry - log.debug("Updating the HandlerRegistry..."); - this.setConfigName(this.getConfigName()); // Add possible attachment parts addAttachmentParts(reqMessage); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -34,7 +34,6 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; import javax.xml.soap.Name; -import javax.xml.soap.Node; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPElement; @@ -63,7 +62,6 @@ import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPHeaderElementImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; @@ -131,7 +129,8 @@ /** On the client side, generate the payload from IN parameters. */ public Object bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { - if(log.isDebugEnabled()) log.debug("bindRequestMessage: " + opMetaData.getQName()); + if (log.isDebugEnabled()) + log.debug("bindRequestMessage: " + opMetaData.getQName()); try { @@ -142,8 +141,7 @@ // Disable MTOM for rpc/encoded if (opMetaData.isRPCEncoded()) XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled( isMTOMEnabled() ); + else XOPContext.setMTOMEnabled(isMTOMEnabled()); // Associate current message with message context SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData); @@ -163,7 +161,8 @@ QName opQName = opMetaData.getQName(); Name opName = new NameImpl(namespaceRegistry.registerQName(opQName)); - if(log.isDebugEnabled()) log.debug("Create RPC body element: " + opName); + if (log.isDebugEnabled()) + log.debug("Create RPC body element: " + opName); soapBodyElement = new SOAPBodyElementRpc(opName); soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement); } @@ -233,7 +232,8 @@ /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object payload) throws BindingException { - if(log.isDebugEnabled()) log.debug("unbindRequestMessage: " + opMetaData.getQName()); + if (log.isDebugEnabled()) + log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { @@ -263,25 +263,25 @@ if (opMetaData.isMessageEndpoint() == false) { Style style = opMetaData.getStyle(); - SOAPElement soapBodyElement = soapBody; + SOAPElement payloadParent = soapBody; if (style == Style.RPC) { - soapBodyElement = null; - + payloadParent = null; Iterator it = soapBody.getChildElements(); - while (soapBodyElement == null && it.hasNext()) + while (payloadParent == null && it.hasNext()) { - Object current = it.next(); - if (current instanceof SOAPElement) + Object childNode = it.next(); + if (childNode instanceof SOAPElement) { - soapBodyElement = (SOAPElement)current; + payloadParent = (SOAPElement)childNode; } } - Name elName = soapBodyElement.getElementName(); + if (payloadParent == null) + throw new SOAPException("Cannot find RPC element in"); - QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix()); - elQName = namespaceRegistry.registerQName(elQName); + QName elName = payloadParent.getElementQName(); + elName = namespaceRegistry.registerQName(elName); } for (ParameterMetaData paramMetaData : opMetaData.getParameters()) @@ -300,7 +300,7 @@ } else { - SOAPElement element = paramMetaData.isInHeader() ? soapHeader : soapBodyElement; + SOAPElement element = paramMetaData.isInHeader() ? soapHeader : payloadParent; Object value = getParameterFromMessage(paramMetaData, element, false); epInv.setRequestParamValue(xmlName, value); } @@ -332,7 +332,8 @@ /** On the server side, generate the payload from OUT parameters. */ public Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException { - if(log.isDebugEnabled()) log.debug("bindResponseMessage: " + opMetaData.getQName()); + if (log.isDebugEnabled()) + log.debug("bindResponseMessage: " + opMetaData.getQName()); try { @@ -343,8 +344,7 @@ // Disable MTOM for rpc/encoded if (opMetaData.isRPCEncoded()) XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled( isMTOMEnabled() ); + else XOPContext.setMTOMEnabled(isMTOMEnabled()); // Associate current message with message context SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData); @@ -433,9 +433,10 @@ /** On the client side, extract the OUT parameters from the payload and return them to the client. */ public void unbindResponseMessage(OperationMetaData opMetaData, Object payload, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) - throws BindingException + throws BindingException { - if(log.isDebugEnabled()) log.debug("unbindResponseMessage: " + opMetaData.getQName()); + if (log.isDebugEnabled()) + log.debug("unbindResponseMessage: " + opMetaData.getQName()); try { @@ -555,7 +556,7 @@ handleException(e); } } - + public Object bindFaultMessage(Exception ex) { SOAPMessage faultMessage = createFaultMessageFromException(ex); @@ -721,50 +722,49 @@ Iterator childElements = soapElement.getChildElements(); while (childElements.hasNext()) { - Object child = childElements.next(); - if (child instanceof TextImpl) + Object childNode = childElements.next(); + if (childNode instanceof SOAPElement) { - continue; - } - SOAPElementImpl childElement = (SOAPElementImpl)child; + SOAPElementImpl childElement = (SOAPElementImpl)childNode; - // If this message was manipulated by a handler the child may not be a content element - if (!(childElement instanceof SOAPContentElement)) - childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); + // If this message was manipulated by a handler the child may not be a content element + if (!(childElement instanceof SOAPContentElement)) + childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); - // The parameters are expected to be lazy - SOAPContentElement aux = (SOAPContentElement)childElement; - Name elName = aux.getElementName(); + // The parameters are expected to be lazy + SOAPContentElement aux = (SOAPContentElement)childElement; + Name elName = aux.getElementName(); - if (xmlName.equals(elName)) - { - soapContentElement = aux; - soapContentElement.setParamMetaData(paramMetaData); - break; - } + if (xmlName.equals(elName)) + { + soapContentElement = aux; + soapContentElement.setParamMetaData(paramMetaData); + break; + } - if (SOAP_ARRAY_NAME.equals(elName)) - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - msgContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); - try + if (SOAP_ARRAY_NAME.equals(elName)) { - QName compXMLName = paramMetaData.getXmlName(); - Element compElement = DOMUtils.getFirstChildElement(aux); - // NPE when the soap encoded array size is 0 on the return path - // http://jira.jboss.org/jira/browse/JBWS-1285 - if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart())) + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + msgContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); + try { - soapContentElement = aux; - soapContentElement.setParamMetaData(paramMetaData); - break; + QName compXMLName = paramMetaData.getXmlName(); + Element compElement = DOMUtils.getFirstChildElement(aux); + // NPE when the soap encoded array size is 0 on the return path + // http://jira.jboss.org/jira/browse/JBWS-1285 + if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart())) + { + soapContentElement = aux; + soapContentElement.setParamMetaData(paramMetaData); + break; + } } + finally + { + msgContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); + } } - finally - { - msgContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - } } } @@ -808,7 +808,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -28,11 +28,14 @@ import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerException; +import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.jboss.util.NotImplementedException; +import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver; import org.jboss.ws.WSException; +import org.w3c.dom.Node; import java.io.ByteArrayOutputStream; @@ -56,19 +59,40 @@ protected static String sourceToString(Source source) { String xmlFragment = null; - - try { - TransformerFactory tf = TransformerFactory.newInstance(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); - StreamResult streamResult = new StreamResult(baos); - tf.newTransformer().transform(source, streamResult); - xmlFragment = new String(baos.toByteArray()); - if (xmlFragment.startsWith("<?xml")) + try + { + if (source instanceof DOMSource) { - int index = xmlFragment.indexOf(">"); - xmlFragment = xmlFragment.substring(index + 1); + Node node = ((DOMSource)source).getNode(); + xmlFragment = DOMWriter.printNode(node, false); } - } catch (TransformerException e) { + else + { + // Note, this code will not handler namespaces correctly that + // are defined on a parent of the DOMSource + // + // <env:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + // <env:Body> + // <myMethod> + // <param xsi:type='xsd:string'>Hello World!</param> + // </myMethod> + // </env:Body> + // </env:Envelope> + // + TransformerFactory tf = TransformerFactory.newInstance(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + StreamResult streamResult = new StreamResult(baos); + tf.newTransformer().transform(source, streamResult); + xmlFragment = new String(baos.toByteArray()); + if (xmlFragment.startsWith("<?xml")) + { + int index = xmlFragment.indexOf(">"); + xmlFragment = xmlFragment.substring(index + 1); + } + } + } + catch (TransformerException e) + { WSException.rethrow(e); } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -207,7 +207,6 @@ /** * Sets SOAP Actor roles for this HandlerChain. This specifies the set of roles in which this HandlerChain is to act * for the SOAP message processing at this SOAP node. These roles assumed by a HandlerChain must be invariant during - * the processing of an individual SOAP message through the HandlerChain. * <p/> * A HandlerChain always acts in the role of the special SOAP actor next. Refer to the SOAP specification for the @@ -245,9 +244,6 @@ { boolean doNext = true; - if(type==HandlerType.POST) - log.debug("Requested Handlertype POST, for execution"); - if (handlers.size() > 0) { if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); @@ -266,10 +262,6 @@ for (; doNext && handlerIndex < handlers.size(); handlerIndex++) { HandlerEntry handlerEntry = (HandlerEntry)handlers.get(handlerIndex); - - if(type==HandlerType.POST && handlerEntry.getType()==HandlerType.POST) - log.debug("FoundTheHandler with HandlerType=POST."); - if (type == HandlerType.ALL || type == handlerEntry.getType()) { currHandler = handlerEntry.getHandler(); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -150,14 +150,20 @@ msgContext.setOperationMetaData(opMetaData); oneway = opMetaData.isOneWay(); - // We no longer call unbindRequestMessage here, per case 15726 + // Unbind the request message + epInv = binding.unbindRequestMessage(opMetaData, reqMessage); } handlersPass = handlersPass && callRequestHandlerChain(seInfo, HandlerType.ENDPOINT); handlersPass = handlersPass && callRequestHandlerChain(seInfo, HandlerType.POST); - // Unbind the request message - epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + // Check if protocol handlers modified the payload + if (msgContext.isModified() == true) + { + if (log.isDebugEnabled()) + log.debug("Handler modified body payload, unbind message again"); + epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + } if (handlersPass) { @@ -178,8 +184,8 @@ if (epMetaData.getType() == EndpointMetaData.Type.JAXWS) msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); - if(binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); + if (binding instanceof CommonSOAPBinding) + XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); // Bind the response message SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); @@ -223,7 +229,8 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - if(log.isDebugEnabled()) log.debug("Begin response processing"); + if (log.isDebugEnabled()) + log.debug("Begin response processing"); // TODO: implement return requestContext; } @@ -238,11 +245,14 @@ { String faultString; SOAPBody soapBody = reqMessage.getSOAPBody(); + Iterator bodyChildren = soapBody.getChildElements(); SOAPBodyElement soapBodyElement = null; while (bodyChildren.hasNext() && soapBodyElement == null) + { + Object next = bodyChildren.next(); if (next instanceof SOAPBodyElement) { @@ -252,6 +262,7 @@ if (soapBodyElement != null) { + Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } @@ -264,8 +275,10 @@ // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated. if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext()) { + QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND; throw new SOAPFaultException(faultCode, faultString, null, null); + } else { Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -149,14 +149,6 @@ log.warn("Ignore envelope chile element: " + elName); } } - else if (childType == Node.COMMENT_NODE) - { - appendCommentNode(soapEnv, child); - } - else if (childType == Node.TEXT_NODE) - { - appendTextNode(soapEnv, child); - } else { log.warn("Ignore child type: " + childType); @@ -191,14 +183,6 @@ DOMUtils.copyAttributes(destElement, srcElement); destElement.setXMLFragment(xmlFragment); } - else if (childType == Node.COMMENT_NODE) - { - appendCommentNode(soapHeader, child); - } - else if (childType == Node.TEXT_NODE) - { - appendTextNode(soapHeader, child); - } else { log.warn("Ignore child type: " + childType); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -824,14 +824,7 @@ } else if (node instanceof TextImpl) { - boolean comment = node.getNodeType() == Node.COMMENT_NODE; - if (comment) - out.write(""); + ((TextImpl)node).writeNode(out); } else { Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -68,8 +68,7 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - if (log.isDebugEnabled()) - log.debug("Use wsa:Action dispatch: " + wsaAction); + log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -109,8 +108,7 @@ { if (opAux.getParameters().size() == 0) { - if (log.isDebugEnabled()) - log.debug("Dispatching empty SOAP body"); + log.debug("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -140,16 +138,14 @@ { if (opAux.isMessageEndpoint()) { - if (log.isDebugEnabled()) - log.debug("Use generic message style dispatch"); + log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - if (log.isDebugEnabled()) - log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/TextImpl.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -1,26 +1,29 @@ /* -* 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. -*/ + * 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.ws.core.soap; +import java.io.IOException; +import java.io.Writer; + import org.w3c.dom.DOMException; import org.w3c.dom.Text; @@ -55,6 +58,14 @@ setNodeValue(value); } + public void writeNode(Writer out) throws IOException + { + String nodeValue = getNodeValue(); + if (isComment() && !nodeValue.startsWith(""); + else out.write(nodeValue); + } + /** * Breaks this node into two nodes at the specified <code>offset</code>, keeping both in the tree as siblings. * <p/> @@ -87,8 +98,7 @@ org.w3c.dom.Node sibling = getNextSibling(); if (sibling == null) parent.appendChild(txtNode); - else - parent.insertBefore(txtNode, sibling); + else parent.insertBefore(txtNode, sibling); } return txtNode; @@ -240,7 +250,7 @@ { setNodeValue(data); } - + // Stubbed out org.w3c.dom.Text methods ************************** /** @@ -317,8 +327,7 @@ * nodes being replaced is readonly. * @since DOM Level 3 */ - public Text replaceWholeText(String content) - throws DOMException + public Text replaceWholeText(String content) throws DOMException { return null; } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -189,21 +189,20 @@ public void testPreserveComments() throws Exception { String expMsg = - "<soapenv:Envelope xmlns:ns1='http://somens.org' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + - " " + - " <soapenv:Header>" + - " " + - " <header>kermit</header>" + - " </soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:ns1='http://somens.org'>" + + " <env:Header>" + + " <ns1:header>kermit</ns1:header>" + + " </env:Header>" + + " <env:Body>" + + " " + " <Hello>" + - " " + + " " + " <argument>kermit</argument>" + + " " + " </Hello>" + - " </soapenv:Body>" + - "</soapenv:Envelope>"; + " " + + " </env:Body>" + + "</env:Envelope>"; // Verify that DOM parse/write do not modify the message Element expEnv = DOMUtils.parse(expMsg); @@ -224,24 +223,30 @@ SOAPEnvelope wasEnv = soapMsg.getSOAPPart().getEnvelope(); String wasXML = DOMWriter.printNode(wasEnv, false); - assertEquals(expXML, wasXML); + String wasBody = wasXML.substring(wasXML.indexOf("<env:Body>")); + wasBody = wasBody.substring(0, wasBody.indexOf("</env:Body>") + 11); + + String expBody = expXML.substring(expXML.indexOf("<env:Body>")); + expBody = expBody.substring(0, expBody.indexOf("</env:Body>") + 11); + + assertEquals(expBody, wasBody); } public void testWriteToPreserveFormatting() throws Exception { String expMessage = "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + - " <soapenv:Header></soapenv:Header>" + - " <soapenv:Body>" + - " " + - " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + - " " + - " <firstName>Joe</firstName>" + - " <surname>Bloggs</surname>" + - " " + - " </typ:lookup>" + - " " + - " </soapenv:Body>" + + "<soapenv:Header></soapenv:Header>" + + "<soapenv:Body>" + + " " + + " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " " + + " <firstName>Joe</firstName>" + + " <surname>Bloggs</surname>" + + " " + + " </typ:lookup>" + + "" + + "</soapenv:Body>" + "</soapenv:Envelope>"; MessageFactoryImpl factory = new MessageFactoryImpl(); @@ -251,12 +256,8 @@ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); soapMsg.writeTo(outputStream); - String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); + String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); - //System.out.println("A - " + expMessage); - //System.out.println("B - " + DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), false)); - //System.out.println("C - " + actualMessage); - assertEquals(expMessage, actualMessage); } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -21,15 +21,15 @@ */ package org.jboss.test.ws.jaxrpc.jbws1647; -import java.io.ByteArrayOutputStream; - import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.MessageContext; import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.DOMWriter; /** * @@ -38,49 +38,39 @@ */ public abstract class AbstractHandler extends GenericHandler { - private static final Logger log = Logger.getLogger(AbstractHandler.class); - public abstract String getExpectedMessage(); + public abstract String getMessageBody(); public boolean handleRequest(MessageContext msgContext) { log.info("handleRequest"); - - boolean valid = false; SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; - SOAPMessage soapMessage = messageContext.getMessage(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - String receivedMessage = ""; try { - soapMessage.writeTo(baos); - receivedMessage = baos.toString(); + SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); + String wasEnv = DOMWriter.printNode(soapEnv, false); + String wasBody = wasEnv.substring(wasEnv.indexOf("<env:Body>")); + wasBody = wasBody.substring(0, wasBody.indexOf("</env:Envelope>")); + if (wasBody.equals(getMessageBody()) == false) + { + log.error("Exp Body: " + getMessageBody()); + log.error("Was Body: " + wasBody); + throw new RuntimeException("Received message does not contain expected soap body."); + } } catch (Exception e) { throw new RuntimeException("Unable to process SOAPMessage", e); } - - valid = getExpectedMessage().equals(receivedMessage); - if (valid == false) - { - log.error("Received message does not equal expected message."); - log.info("EXP - " + getExpectedMessage()); - log.info("ACT - " + receivedMessage); - - throw new RuntimeException("Received message does not equal expected message."); - } - - return valid; + return true; } public QName[] getHeaders() { return null; } - } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -29,26 +29,20 @@ public class DocumentHandler extends AbstractHandler { - public static final String MESSAGE = - "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </typ:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; + public static final String MESSAGE_BODY = + "<env:Body>" + + " " + + " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </typ:echoMessage>" + + " " + + "</env:Body>"; - public String getExpectedMessage() + public String getMessageBody() { - return MESSAGE; + return MESSAGE_BODY; } } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -21,16 +21,19 @@ */ package org.jboss.test.ws.jaxrpc.jbws1647; +import org.jboss.test.ws.JBossWSTestSetup; + import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; - /** + * Text Node Preservation For Messages Sent Across The Wire * + * http://jira.jboss.org/jira/browse/JBWS-1647 + * * @author darran.lofthouse(a)jboss.com * @since 15 May 2007 */ -public class JBWS1647DocumentTestCase extends TestCaseBase +public class JBWS1647DocumentTestCase extends JBWS1647TestBase { public static Test suite() throws Exception @@ -40,10 +43,10 @@ public String getMessage() { - return DocumentHandler.MESSAGE; + return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + DocumentHandler.MESSAGE_BODY + "</env:Envelope>"; } - public String getToUrl() + public String getEndpointAddress() { return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -21,16 +21,19 @@ */ package org.jboss.test.ws.jaxrpc.jbws1647; +import org.jboss.test.ws.JBossWSTestSetup; + import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; - /** + * Text Node Preservation For Messages Sent Across The Wire * + * http://jira.jboss.org/jira/browse/JBWS-1647 + * * @author darran.lofthouse(a)jboss.com * @since 14 May 2007 */ -public class JBWS1647RPCTestCase extends TestCaseBase +public class JBWS1647RPCTestCase extends JBWS1647TestBase { public static Test suite() throws Exception @@ -40,10 +43,10 @@ public String getMessage() { - return RpcHandler.MESSAGE; + return "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + RpcHandler.MESSAGE_BODY + "</env:Envelope>"; } - public String getToUrl() + public String getEndpointAddress() { return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; } Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1647; + +import java.io.ByteArrayInputStream; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class JBWS1647TestBase extends JBossWSTest +{ + public abstract String getMessage(); + + public abstract String getEndpointAddress(); + + public void testCall() throws Exception + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); + + SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + SOAPConnection con = conFactory.createConnection(); + SOAPMessage resMessage = con.call(soapMessage, getEndpointAddress()); + + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); + } + +} Property changes on: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647TestBase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -29,26 +29,20 @@ public class RpcHandler extends AbstractHandler { - public static final String MESSAGE = - "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </jbw:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; + public static final String MESSAGE_BODY = + "<env:Body>" + + " " + + " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </jbw:echoMessage>" + + " " + + "</env:Body>"; - public String getExpectedMessage() + public String getMessageBody() { - return MESSAGE; + return MESSAGE_BODY; } } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2007-06-26 10:47:02 UTC (rev 3725) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2007-06-26 11:36:04 UTC (rev 3726) @@ -1,24 +1,24 @@ /* - * 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. - */ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxrpc.samples.handler; import javax.xml.namespace.QName; @@ -59,11 +59,14 @@ log.info("handleRequest"); QName[] headers = getHeaders(); - if (headers == null || headers.length != 3) - throw new IllegalStateException("Invalid number of headers"); - + if (headers == null) + throw new IllegalStateException("Unable to retrieve headers"); + + if (headers.length != 3) + throw new IllegalStateException("Invalid number of headers expected=3, actual=" + headers.length); + try - { + { SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); SOAPHeader soapHeader = soapMessage.getSOAPHeader(); @@ -102,7 +105,7 @@ } catch (SOAPException e) { - throw new JAXRPCException(e); + throw new JAXRPCException(e); } return true;

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3725 - in branches/jbossws-2.0/jbossws-core: src/test/java/org/jboss/test/ws/jaxws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 06:47:02 -0400 (Tue, 26 Jun 2007) New Revision: 3725 Removed: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/ Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml Log: [JBWS-1665] incorrect wsdl generation. Cannot Reproduce Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-26 10:43:09 UTC (rev 3724) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-26 10:47:02 UTC (rev 3725) @@ -295,18 +295,6 @@ </classes> </war> -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/> - </fileset> - </jar> -  <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes">

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3724 - in branches/jbossws-2.0: jbossws-core/src/main/java/org/jboss/ws/core/server and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 06:43:09 -0400 (Tue, 26 Jun 2007) New Revision: 3724 Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java Log: [JBWS-1609] Address in WSDL - Port value is -1 Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-26 07:55:31 UTC (rev 3723) +++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-26 10:43:09 UTC (rev 3724) @@ -505,14 +505,15 @@ String resPath = (String)req.getParameter("resource"); URL reqURL = new URL(req.getRequestURL().toString()); - String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort(); + String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost(); + if (reqURL.getPort() != -1) + wsdlHost += ":" + reqURL.getPort(); ServerConfigFactory factory = ServerConfigFactory.getInstance(); ServerConfig config = factory.getServerConfig(); - if (config.getWebServiceHost().equals(ServerConfig.UNDEFINED_HOSTNAME) == false) - { + if (!ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost())) wsdlHost = config.getWebServiceHost(); - } + log.debug("WSDL request, using host: " + wsdlHost); WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-06-26 07:55:31 UTC (rev 3723) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-06-26 10:43:09 UTC (rev 3724) @@ -30,6 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -71,12 +72,12 @@ public Document getDocumentForPath(URL reqURL, String wsdlHost, String resPath) throws IOException { Document wsdlDoc; - + // The WSDLFilePublisher should set the location to an URL URL wsdlLocation = epMetaData.getServiceMetaData().getWsdlLocation(); if (wsdlLocation == null) throw new IllegalStateException("Cannot obtain wsdl location"); - + // get the root wsdl if (resPath == null) { @@ -134,17 +135,17 @@ String reqPath = reqURL.getPath(); String completeHost = wsdlHost; - if (! (wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://")) ) + if (!(wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://"))) { - String reqProtocol = reqURL.getProtocol(); - int reqPort = reqURL.getPort(); - String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : ""); - completeHost = reqProtocol + "://" + hostAndPort; + String reqProtocol = reqURL.getProtocol(); + int reqPort = reqURL.getPort(); + String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : ""); + completeHost = reqProtocol + "://" + hostAndPort; } String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath; locationAttr.setNodeValue(newLocation); - + log.trace("Mapping import from '" + orgLocation + "' to '" + newLocation + "'"); } } @@ -157,23 +158,26 @@ if (locationAttr != null) { String orgLocation = locationAttr.getNodeValue(); - - URL locURL = new URL(orgLocation); - String locProtocol = locURL.getProtocol(); - String locPath = locURL.getPath(); - if (reqURL.getProtocol().equals(locProtocol) && reqURL.getPath().equals(locPath)) + URL orgURL = new URL(orgLocation); + String orgProtocol = orgURL.getProtocol(); + String orgHost = orgURL.getHost(); + int orgPort = orgURL.getPort(); + String orgPath = orgURL.getPath(); + + if (ServerConfig.UNDEFINED_HOSTNAME.equals(orgHost)) { - String completeHost = wsdlHost; - if (! (completeHost.startsWith("http://") || completeHost.startsWith("https://")) ) - { - int locPort = locURL.getPort(); - String hostAndPort = wsdlHost + (locPort > 0 ? ":" + locPort : ""); - - completeHost = locProtocol + "://" + hostAndPort; - } - - String newLocation = completeHost + locPath; + URL newURL = new URL(wsdlHost); + String newHost = newURL.getHost(); + int newPort = newURL.getPort(); + + String newLocation = orgProtocol + "://" + newHost; + if (orgPort != -1) + newLocation += ":" + orgPort; + else if (newPort != -1) + newLocation += ":" + newPort; + + newLocation += orgPath; locationAttr.setNodeValue(newLocation); log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'"); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-26 07:55:31 UTC (rev 3723) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-26 10:43:09 UTC (rev 3724) @@ -303,8 +303,7 @@ if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0) { - if (log.isDebugEnabled()) - log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'"); + log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'"); wsdlEndpoint.setAddress(serviceEndpointURL); sepMetaData.setEndpointAddress(serviceEndpointURL); @@ -314,8 +313,7 @@ } else { - if (log.isDebugEnabled()) - log.debug("Don't replace service endpoint address '" + orgAddress + "'"); + log.debug("Don't replace service endpoint address '" + orgAddress + "'"); try { sepMetaData.setEndpointAddress(new URL(orgAddress).toExternalForm());

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3723 - branches/jbossws-2.0/integration/spi/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 03:55:31 -0400 (Tue, 26 Jun 2007) New Revision: 3723 Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml Log: Add SAAJ API to classpath Modified: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-26 07:25:00 UTC (rev 3722) +++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-26 07:55:31 UTC (rev 3723) @@ -92,6 +92,7 @@ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> </path> </target>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3722 - in branches/jbossws-2.0/integration: spi/src/main/java/org/jboss/wsf/spi/transport/jms and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-26 03:25:00 -0400 (Tue, 26 Jun 2007) New Revision: 3722 Removed: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/jms/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSMessageDispatcher.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/MessageDispatcher.java Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java Log: Restore JMS transport Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSMessageDispatcher.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSMessageDispatcher.java 2007-06-26 07:24:47 UTC (rev 3721) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSMessageDispatcher.java 2007-06-26 07:25:00 UTC (rev 3722) @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.transport.jms; - -// $Id:JMSMessageDispatcher.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -import java.io.InputStream; -import java.rmi.RemoteException; - -import javax.management.ObjectName; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.BasicInvocationContext; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; - -/** - * A dispatcher for SOAPMessages - * - * @author Thomas.Diesler(a)jboss.org - */ -public class JMSMessageDispatcher implements MessageDispatcher -{ - // logging support - protected Logger log = Logger.getLogger(JMSMessageDispatcher.class); - - /** Dispatch the message to the underlying SOAP engine - */ - public SOAPMessage dipatchMessage(String fromName, Object targetBean, InputStream inputStream) throws RemoteException - { - EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); - - if (endpoint == null) - throw new IllegalStateException("Cannot find endpoint for: " + fromName); - - log.debug("dipatchMessage: " + endpoint.getName()); - - RequestHandler reqHandler = endpoint.getRequestHandler(); - - try - { - BasicInvocationContext invContext = new BasicInvocationContext(); - invContext.setTargetBean(targetBean); - - reqHandler.handleRequest(endpoint, inputStream, null, invContext); - SOAPMessage resMessage = getResponseMessage(invContext); - return resMessage; - } - catch (Exception ex) - { - throw new RemoteException("Cannot process SOAP request", ex); - } - } - - private SOAPMessage getResponseMessage(InvocationContext context) - { - SOAPMessage resMessage = null; - if (context.getAttachment(javax.xml.rpc.handler.MessageContext.class) != null) - { - javax.xml.rpc.handler.MessageContext msgContext = context.getAttachment(javax.xml.rpc.handler.MessageContext.class); - SOAPMessageContext soapContext = (SOAPMessageContext)msgContext; - resMessage = soapContext.getMessage(); - } - return resMessage; - } - - /** Dispatch the message to the underlying SOAP engine - */ - public SOAPMessage delegateMessage(String serviceID, InputStream soapMessage) throws RemoteException - { - throw new NotImplementedException(); - } - - // The destination jndiName is encoded in the service object name under key 'jms' - private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName) - { - Endpoint endpoint = null; - for (ObjectName oname : epRegistry.getEndpoints()) - { - Endpoint aux = epRegistry.getEndpoint(oname); - String jmsProp = aux.getName().getKeyProperty("jms"); - if (jmsProp != null && jmsProp.equals(fromName)) - { - endpoint = aux; - break; - } - } - return endpoint; - } -} Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java 2007-06-26 07:24:47 UTC (rev 3721) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java 2007-06-26 07:25:00 UTC (rev 3722) @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.rmi.RemoteException; import javax.ejb.EJBException; @@ -45,12 +46,17 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import javax.management.ObjectName; import javax.naming.InitialContext; import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; import org.jboss.util.NestedRuntimeException; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.BasicInvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; /** * The abstract base class for MDBs that want to act as web service endpoints. @@ -98,16 +104,14 @@ fromName = "topic/" + ((Topic)destination).getTopicName(); InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes()); - SOAPMessage resMessage = processSOAPMessage(fromName, inputStream); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024); + processSOAPMessage(fromName, inputStream, outputStream); - if (resMessage != null) + msgStr = new String(outputStream.toByteArray()); + log.debug("Outgoing SOAP message: " + msgStr); + + if (msgStr.length() > 0) { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - resMessage.writeTo(outputStream); - - msgStr = new String(outputStream.toByteArray()); - log.debug("Outgoing SOAP message: " + msgStr); - Queue replyQueue = getReplyQueue(message); if (replyQueue != null) { @@ -133,13 +137,48 @@ } } - protected SOAPMessage processSOAPMessage(String fromName, InputStream inputStream) throws SOAPException, IOException, RemoteException + protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException { - MessageDispatcher msgDispatcher = new JMSMessageDispatcher(); - SOAPMessage resMessage = msgDispatcher.dipatchMessage(fromName, this, inputStream); - return resMessage; + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); + + if (endpoint == null) + throw new IllegalStateException("Cannot find endpoint for: " + fromName); + + log.debug("dipatchMessage: " + endpoint.getName()); + + RequestHandler reqHandler = endpoint.getRequestHandler(); + + try + { + BasicInvocationContext invContext = new BasicInvocationContext(); + invContext.setTargetBean(this); + + reqHandler.handleRequest(endpoint, inputStream, outStream, invContext); + } + catch (Exception ex) + { + throw new RemoteException("Cannot process SOAP request", ex); + } } - + + // The destination jndiName is encoded in the service object name under key 'jms' + private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName) + { + Endpoint endpoint = null; + for (ObjectName oname : epRegistry.getEndpoints()) + { + Endpoint aux = epRegistry.getEndpoint(oname); + String jmsProp = aux.getName().getKeyProperty("jms"); + if (jmsProp != null && jmsProp.equals(fromName)) + { + endpoint = aux; + break; + } + } + return endpoint; + } + private String getMessageStr(BytesMessage message) throws Exception { byte[] buffer = new byte[8 * 1024]; Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/MessageDispatcher.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/MessageDispatcher.java 2007-06-26 07:24:47 UTC (rev 3721) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/MessageDispatcher.java 2007-06-26 07:25:00 UTC (rev 3722) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.transport.jms; - -// $Id:MessageDispatcher.java 898 2006-09-05 08:23:03Z thomas.diesler(a)jboss.com $ - -import java.io.InputStream; -import java.rmi.RemoteException; - -import javax.management.ObjectName; -import javax.xml.soap.SOAPMessage; - -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * A dispatcher for SOAPMessages - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-Feb-2006 - */ -public interface MessageDispatcher -{ - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=JMSTransportSupport"); - - /** Dispatch the message to the underlying SOAP engine - */ - SOAPMessage dipatchMessage(String fromName, Object targetImplBean, InputStream reqMessage) throws RemoteException; - - /** Dispatch the message to the underlying SOAP engine - */ - SOAPMessage delegateMessage(String serviceID, InputStream reqMessage) throws RemoteException; -} \ No newline at end of file

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007