Author: thomas.diesler(a)jboss.com Date: 2007-05-31 12:06:53 -0400 (Thu, 31 May 2007) New Revision: 3341 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Log: Move test helpers to spi Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,289 @@ +/* + * 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.test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Hashtable; +import java.util.Iterator; + +import javax.management.MBeanServerConnection; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import junit.framework.TestCase; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.utils.DOMWriter; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Base class for JBossWS test cases + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Oct-2004 + */ +public abstract class JBossWSTest extends TestCase +{ + // provide logging + protected Logger log = Logger.getLogger(getClass().getName()); + + private JBossWSTestHelper delegate = new JBossWSTestHelper(); + + public JBossWSTest() + { + } + + public JBossWSTest(String name) + { + super(name); + } + + /** Get the MBeanServerConnection from JNDI */ + public MBeanServerConnection getServer() throws NamingException + { + return delegate.getServer(); + } + + public boolean isTargetJBoss50() + { + return delegate.isTargetJBoss50(); + } + + public boolean isTargetJBoss42() + { + return delegate.isTargetJBoss42(); + } + + public boolean isIntegrationNative() + { + return delegate.isIntegrationNative(); + + } + + public boolean isIntegrationSunRI() + { + return delegate.isIntegrationSunRI(); + } + + public boolean isIntegrationXFire() + { + return delegate.isIntegrationXFire(); + } + + /** Deploy the given archive + */ + public void deploy(String archive) throws Exception + { + delegate.deploy(archive); + } + + /** Undeploy the given archive + */ + public void undeploy(String archive) throws Exception + { + delegate.undeploy(archive); + } + + public String getServerHost() + { + return delegate.getServerHost(); + } + + /** Get the client's env context for a given name. + */ + protected InitialContext getInitialContext(String clientName) throws NamingException + { + InitialContext iniCtx = new InitialContext(); + Hashtable env = iniCtx.getEnvironment(); + env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); + env.put("j2ee.clientName", clientName); + return new InitialContext(env); + } + + /** Get the client's env context + */ + protected InitialContext getInitialContext() throws NamingException + { + return getInitialContext("jbossws-client"); + } + + public boolean hasJDK15() + { + try + { + Class.forName("java.lang.Enum"); + return true; + } + catch (ClassNotFoundException ex) + { + return false; + } + } + + public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace) + { + normalizeWhitspace(expElement, ignoreWhitespace); + normalizeWhitspace(wasElement, ignoreWhitespace); + String expStr = DOMWriter.printNode(expElement, false); + String wasStr = DOMWriter.printNode(wasElement, false); + if (expStr.equals(wasStr) == false) + { + System.out.println("\nExp: " + expStr + "\nWas: " + wasStr); + Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr); + } + assertEquals(expStr, wasStr); + } + + public static void assertEquals(Element expElement, Element wasElement) + { + assertEquals(expElement, wasElement, false); + } + + public static void assertEquals(Object exp, Object was) + { + if (exp instanceof Object[] && was instanceof Object[]) + assertEqualsArray((Object[])exp, (Object[])was); + else if (exp instanceof byte[] && was instanceof byte[]) + assertEqualsArray((byte[])exp, (byte[])was); + else if (exp instanceof boolean[] && was instanceof boolean[]) + assertEqualsArray((boolean[])exp, (boolean[])was); + else if (exp instanceof short[] && was instanceof short[]) + assertEqualsArray((short[])exp, (short[])was); + else if (exp instanceof int[] && was instanceof int[]) + assertEqualsArray((int[])exp, (int[])was); + else if (exp instanceof long[] && was instanceof long[]) + assertEqualsArray((long[])exp, (long[])was); + else if (exp instanceof float[] && was instanceof float[]) + assertEqualsArray((float[])exp, (float[])was); + else if (exp instanceof double[] && was instanceof double[]) + assertEqualsArray((double[])exp, (double[])was); + else TestCase.assertEquals(exp, was); + } + + private static void assertEqualsArray(Object[] exp, Object[] was) + { + if (exp == null && was == null) + return; + + if (exp != null && was != null) + { + if (exp.length != was.length) + { + fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">"); + } + else + { + for (int i = 0; i < exp.length; i++) + { + + Object compExp = exp[i]; + Object compWas = was[i]; + assertEquals(compExp, compWas); + } + } + } + else if (exp == null) + { + fail("Expected a null array, but was: " + Arrays.asList(was)); + } + else if (was == null) + { + fail("Expected " + Arrays.asList(exp) + ", but was: null"); + } + } + + private static void assertEqualsArray(byte[] exp, byte[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(boolean[] exp, boolean[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(short[] exp, short[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(int[] exp, int[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(long[] exp, long[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(float[] exp, float[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + private static void assertEqualsArray(double[] exp, double[] was) + { + assertTrue("Arrays don't match", Arrays.equals(exp, was)); + } + + /** Removes whitespace text nodes if they have an element sibling. + */ + private static void normalizeWhitspace(Element element, boolean ignoreWhitespace) + { + boolean hasChildElement = false; + ArrayList toDetach = new ArrayList(); + + String nodeName = element.getNodeName(); + NodeList childNodes = element.getChildNodes(); + for (int i = 0; i < childNodes.getLength(); i++) + { + Node node = childNodes.item(i); + if (node.getNodeType() == Node.TEXT_NODE) + { + String nodeValue = node.getNodeValue(); + if (nodeValue.trim().length() == 0) + toDetach.add(node); + } + if (node.getNodeType() == Node.ELEMENT_NODE) + { + normalizeWhitspace((Element)node, ignoreWhitespace); + hasChildElement = true; + } + } + + // remove whitespace nodes + if (hasChildElement || ignoreWhitespace) + { + Iterator it = toDetach.iterator(); + while (it.hasNext()) + { + Node node = (Node)it.next(); + element.removeChild(node); + } + } + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,201 @@ +/* + * 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.test; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.wsf.spi.utils.ObjectNameFactory; + +/** + * A JBossWS test helper that deals with test deployment/undeployment, etc. + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Oct-2004 + */ +public class JBossWSTestHelper +{ + // provide logging + private static Logger log = Logger.getLogger(JBossWSTestHelper.class); + + private static MBeanServerConnection server; + private static String integrationTarget; + + /** Deploy the given archive + */ + public void deploy(String archive) throws Exception + { + URL url = getArchiveURL(archive); + getDeployer().deploy(url); + } + + /** Undeploy the given archive + */ + public void undeploy(String archive) throws Exception + { + URL url = getArchiveURL(archive); + getDeployer().undeploy(url); + } + + /** True, if -Djbossws.integration.target=jboss50 */ + public static boolean isTargetJBoss50() + { + String target = getIntegrationTarget(); + return "jboss50".equals(target); + } + + /** True, if -Djbossws.integration.target=jboss42 */ + public static boolean isTargetJBoss42() + { + String target = getIntegrationTarget(); + return "jboss42".equals(target); + } + + public boolean isIntegrationNative() + { + String vendor = Service.class.getPackage().getImplementationVendor(); + return vendor.startsWith("JBoss"); + } + + public boolean isIntegrationSunRI() + { + String vendor = Service.class.getPackage().getImplementationVendor(); + return vendor.startsWith("Sun Microsystems"); + } + + public boolean isIntegrationXFire() + { + throw new NotImplementedException(); + } + + /** + * Get the JBoss server host from system property "jboss.bind.address" + * This defaults to "localhost" + */ + public static String getServerHost() + { + String hostName = System.getProperty("jboss.bind.address", "localhost"); + return hostName; + } + + public static MBeanServerConnection getServer() + { + if (server == null) + { + Hashtable jndiEnv = null; + try + { + InitialContext iniCtx = new InitialContext(); + jndiEnv = iniCtx.getEnvironment(); + server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); + } + catch (NamingException ex) + { + throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex); + } + } + return server; + } + + private TestDeployer getDeployer() + { + return new TestDeployerJBoss(getServer()); + } + + private static String getIntegrationTarget() + { + if (integrationTarget == null) + { + integrationTarget = System.getProperty("jbossws.integration.target"); + + if (integrationTarget == null) + throw new IllegalStateException("Cannot obtain jbossws.integration.target"); + + // Read the JBoss SpecificationVersion + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); + if (jbossVersion.startsWith("5.0")) + jbossVersion = "jboss50"; + else if (jbossVersion.startsWith("4.2")) + jbossVersion = "jboss42"; + else throw new RuntimeException("Unsupported jboss version: " + jbossVersion); + + if (jbossVersion.equals(integrationTarget) == false) + { + throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion); + //integrationTarget = jbossVersion; + } + } + catch (Throwable th) + { + // ignore, we are not running on jboss-4.2 or greater + } + } + return integrationTarget; + } + + /** Try to discover the URL for the deployment archive */ + public URL getArchiveURL(String archive) throws MalformedURLException + { + URL url = null; + try + { + url = new URL(archive); + } + catch (MalformedURLException ignore) + { + // ignore + } + + if (url == null) + { + File file = new File(archive); + if (file.exists()) + url = file.toURL(); + } + + if (url == null) + { + File file = new File("libs/" + archive); + if (file.exists()) + url = file.toURL(); + } + + if (url == null) + throw new IllegalArgumentException("Cannot obtain URL for: " + archive); + + return url; + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,124 @@ +/* + * 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.test; + +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * A test setup that deploys/undeploys archives + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Oct-2004 + */ +public class JBossWSTestSetup extends TestSetup +{ + private JBossWSTestHelper delegate = new JBossWSTestHelper(); + private String[] archives = new String[0]; + + public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList) + { + return new JBossWSTestSetup(testClass, archiveList); + } + + public static JBossWSTestSetup newTestSetup(Test test, String archiveList) + { + return new JBossWSTestSetup(test, archiveList); + } + + protected JBossWSTestSetup(Class testClass, String archiveList) + { + super(new TestSuite(testClass)); + getArchiveArray(archiveList); + } + + protected JBossWSTestSetup(Test test, String archiveList) + { + super(test); + getArchiveArray(archiveList); + } + + private void getArchiveArray(String archiveList) + { + if (archiveList != null) + { + StringTokenizer st = new StringTokenizer(archiveList, ", "); + archives = new String[st.countTokens()]; + + for (int i = 0; i < archives.length; i++) + archives[i] = st.nextToken(); + } + } + + protected void setUp() throws Exception + { + List clientJars = new ArrayList(); + for (int i = 0; i < archives.length; i++) + { + String archive = archives[i]; + try + { + delegate.deploy(archive); + } + catch (Exception ex) + { + ex.printStackTrace(); + delegate.undeploy(archive); + } + + if (archive.endsWith("-client.jar")) + { + URL archiveURL = delegate.getArchiveURL(archive); + clientJars.add(archiveURL); + } + } + + // add the client jars to the classloader + if (!clientJars.isEmpty()) + { + ClassLoader parent = Thread.currentThread().getContextClassLoader(); + URL[] urls = new URL[clientJars.size()]; + for (int i = 0; i < clientJars.size(); i++) + { + urls[i] = (URL)clientJars.get(i); + } + URLClassLoader cl = new URLClassLoader(urls, parent); + Thread.currentThread().setContextClassLoader(cl); + } + } + + protected void tearDown() throws Exception + { + for (int i = 0; i < archives.length; i++) + { + String archive = archives[archives.length - i - 1]; + delegate.undeploy(archive); + } + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,41 @@ +/* + * 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.test; + +import java.net.URL; + +/** + * WS test deployer + * + * @author Thomas.Diesler(a)jboss.org + * @since 16-May-2006 + */ +public interface TestDeployer +{ + /** Deploy the given archive + */ + void deploy(URL archive) throws Exception; + + /** Undeploy the given archive + */ + void undeploy(URL archive) throws Exception; +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,55 @@ +/* + * 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.test; + +import java.net.URL; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; + +/** + * A JBossWS test helper that deals with test deployment/undeployment, etc. + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Oct-2004 + */ +public class TestDeployerJBoss implements TestDeployer +{ + private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; + + private MBeanServerConnection server; + + public TestDeployerJBoss(MBeanServerConnection server) + { + this.server = server; + } + + public void deploy(URL url) throws Exception + { + server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); + } + + public void undeploy(URL url) throws Exception + { + server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/TestDeployerJBoss.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -0,0 +1,106 @@ +/* + * 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.test; + +// $Id$ + +import java.awt.Image; +import java.awt.Toolkit; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.xml.transform.stream.StreamSource; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since 22-Sep-2006 + */ +public class XOPTestSupport +{ + + public static byte[] getBytesFromFile(File file) throws IOException + { + InputStream is = new FileInputStream(file); + + long length = file.length(); + byte[] bytes = new byte[(int)length]; + + int offset = 0; + int numRead = 0; + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { + offset += numRead; + } + + is.close(); + return bytes; + } + + public static Image createTestImage(File imgFile) + { + Image image = null; + try + { + URL url = imgFile.toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler(File imgFile) + { + try + { + URL url = imgFile.toURL(); + return new DataHandler(url); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/XOPTestSupport.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,297 +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.test.ws; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.management.MBeanServerConnection; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.xml.transform.Source; - -import junit.framework.TestCase; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * Base class for JBossWS test cases - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public abstract class JBossWSTest extends TestCase -{ - // provide logging - protected Logger log = Logger.getLogger(getClass().getName()); - - private JBossWSTestHelper delegate = new JBossWSTestHelper(); - - public JBossWSTest() - { - } - - public JBossWSTest(String name) - { - super(name); - } - - /** Get the MBeanServerConnection from JNDI */ - public MBeanServerConnection getServer() throws NamingException - { - return JBossWSTestHelper.getServer(); - } - - /** True, if -Djbossws.integration.target=jboss?? */ - public boolean isTargetJBoss() - { - return JBossWSTestHelper.isTargetJBoss(); - } - - /** True, if -Djbossws.integration.target=tomcat */ - public boolean isTargetTomcat() - { - return JBossWSTestHelper.isTargetTomcat(); - } - - public boolean isTargetJBoss50() - { - return JBossWSTestHelper.isTargetJBoss50(); - } - - public boolean isTargetJBoss42() - { - return JBossWSTestHelper.isTargetJBoss42(); - } - - public boolean isTargetJBoss40() - { - return JBossWSTestHelper.isTargetJBoss40(); - } - - /** Deploy the given archive - */ - public void deploy(String archive) throws Exception - { - delegate.deploy(archive); - } - - /** Undeploy the given archive - */ - public void undeploy(String archive) throws Exception - { - delegate.undeploy(archive); - } - - /** Get the client's env context for a given name. - */ - protected InitialContext getInitialContext(String clientName) throws NamingException - { - InitialContext iniCtx = new InitialContext(); - Hashtable env = iniCtx.getEnvironment(); - env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); - env.put("j2ee.clientName", clientName); - return new InitialContext(env); - } - - /** Get the client's env context - */ - protected InitialContext getInitialContext() throws NamingException - { - return getInitialContext("jbossws-client"); - } - - public boolean hasJDK15() - { - try - { - Class.forName("java.lang.Enum"); - return true; - } - catch (ClassNotFoundException ex) - { - return false; - } - } - - public String getServerHost() - { - return JBossWSTestHelper.getServerHost(); - } - - public Element getElementFromSource(Source retObj) throws Exception - { - return DOMUtils.sourceToElement(retObj); - } - - public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace) - { - normalizeWhitspace(expElement, ignoreWhitespace); - normalizeWhitspace(wasElement, ignoreWhitespace); - String expStr = DOMWriter.printNode(expElement, false); - String wasStr = DOMWriter.printNode(wasElement, false); - if (expStr.equals(wasStr) == false) - { - System.out.println("\nExp: " + expStr + "\nWas: " + wasStr); - Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr); - } - assertEquals(expStr, wasStr); - } - - public static void assertEquals(Element expElement, Element wasElement) - { - assertEquals(expElement, wasElement, false); - } - - public static void assertEquals(Object exp, Object was) - { - if (exp instanceof Object[] && was instanceof Object[]) - assertEqualsArray((Object[])exp, (Object[])was); - else if (exp instanceof byte[] && was instanceof byte[]) - assertEqualsArray((byte[])exp, (byte[])was); - else if (exp instanceof boolean[] && was instanceof boolean[]) - assertEqualsArray((boolean[])exp, (boolean[])was); - else if (exp instanceof short[] && was instanceof short[]) - assertEqualsArray((short[])exp, (short[])was); - else if (exp instanceof int[] && was instanceof int[]) - assertEqualsArray((int[])exp, (int[])was); - else if (exp instanceof long[] && was instanceof long[]) - assertEqualsArray((long[])exp, (long[])was); - else if (exp instanceof float[] && was instanceof float[]) - assertEqualsArray((float[])exp, (float[])was); - else if (exp instanceof double[] && was instanceof double[]) - assertEqualsArray((double[])exp, (double[])was); - else TestCase.assertEquals(exp, was); - } - - private static void assertEqualsArray(Object[] exp, Object[] was) - { - if (exp == null && was == null) - return; - - if (exp != null && was != null) - { - if (exp.length != was.length) - { - fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">"); - } - else - { - for (int i = 0; i < exp.length; i++) - { - - Object compExp = exp[i]; - Object compWas = was[i]; - assertEquals(compExp, compWas); - } - } - } - else if (exp == null) - { - fail("Expected a null array, but was: " + Arrays.asList(was)); - } - else if (was == null) - { - fail("Expected " + Arrays.asList(exp) + ", but was: null"); - } - } - - private static void assertEqualsArray(byte[] exp, byte[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(boolean[] exp, boolean[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(short[] exp, short[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(int[] exp, int[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(long[] exp, long[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(float[] exp, float[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(double[] exp, double[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - /** Removes whitespace text nodes if they have an element sibling. - */ - private static void normalizeWhitspace(Element element, boolean ignoreWhitespace) - { - boolean hasChildElement = false; - ArrayList toDetach = new ArrayList(); - - String nodeName = element.getNodeName(); - NodeList childNodes = element.getChildNodes(); - for (int i = 0; i < childNodes.getLength(); i++) - { - Node node = childNodes.item(i); - if (node.getNodeType() == Node.TEXT_NODE) - { - String nodeValue = node.getNodeValue(); - if (nodeValue.trim().length() == 0) - toDetach.add(node); - } - if (node.getNodeType() == Node.ELEMENT_NODE) - { - normalizeWhitspace((Element)node, ignoreWhitespace); - hasChildElement = true; - } - } - - // remove whitespace nodes - if (hasChildElement || ignoreWhitespace) - { - Iterator it = toDetach.iterator(); - while (it.hasNext()) - { - Node node = (Node)it.next(); - element.removeChild(node); - } - } - } -} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,204 +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.test.ws; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * A JBossWS test helper that deals with test deployment/undeployment, etc. - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JBossWSTestHelper -{ - // provide logging - private static Logger log = Logger.getLogger(JBossWSTestHelper.class); - - private static MBeanServerConnection server; - private static String integrationTarget; - - /** Deploy the given archive - */ - public void deploy(String archive) throws Exception - { - URL url = getArchiveURL(archive); - getDeployer().deploy(url); - } - - /** Undeploy the given archive - */ - public void undeploy(String archive) throws Exception - { - URL url = getArchiveURL(archive); - getDeployer().undeploy(url); - } - - /** True, if -Djbossws.integration.target=tomcat */ - public static boolean isTargetTomcat() - { - String target = getIntegrationTarget(); - return "tomcat".equals(target); - } - - /** True, if -Djbossws.integration.target=jboss?? */ - public static boolean isTargetJBoss() - { - String target = getIntegrationTarget(); - return target != null && target.startsWith("jboss"); - } - - /** True, if -Djbossws.integration.target=jboss50 */ - public static boolean isTargetJBoss50() - { - String target = getIntegrationTarget(); - return "jboss50".equals(target); - } - - /** True, if -Djbossws.integration.target=jboss42 */ - public static boolean isTargetJBoss42() - { - String target = getIntegrationTarget(); - return "jboss42".equals(target); - } - - /** True, if -Djbossws.integration.target=jboss40 */ - public static boolean isTargetJBoss40() - { - String target = getIntegrationTarget(); - return "jboss40".equals(target); - } - - /** - * Get the JBoss server host from system property "jboss.bind.address" - * This defaults to "localhost" - */ - public static String getServerHost() - { - String hostName = System.getProperty("jboss.bind.address", "localhost"); - return hostName; - } - - public static MBeanServerConnection getServer() - { - if (server == null) - { - try - { - InitialContext iniCtx = new InitialContext(); - server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - } - catch (NamingException ex) - { - throw new RuntimeException("Cannot obtain MBeanServerConnection", ex); - } - } - return server; - } - - private TestDeployer getDeployer() - { - return new TestDeployerJBoss(getServer()); - } - - private static String getIntegrationTarget() - { - if (integrationTarget == null) - { - integrationTarget = System.getProperty("jbossws.integration.target"); - - // Read the JBoss SpecificationVersion - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); - if (jbossVersion.startsWith("5.0")) - jbossVersion = "jboss50"; - else if (jbossVersion.startsWith("4.2")) - jbossVersion = "jboss42"; - else if (jbossVersion.startsWith("4.0")) - jbossVersion = "jboss40"; - else throw new RuntimeException("Unsupported jboss version: " + jbossVersion); - - if (jbossVersion.equals(integrationTarget) == false) - { - log.warn("Integration target mismatch, using: " + jbossVersion); - integrationTarget = jbossVersion; - } - } - catch (Throwable th) - { - // ignore, we are not running on jboss-4.2 or greater - } - - if (integrationTarget == null) - { - log.warn("Cannot obtain jbossws.integration.target, using default: tomcat"); - integrationTarget = "tomcat"; - } - } - return integrationTarget; - } - - /** Try to discover the URL for the deployment archive */ - public URL getArchiveURL(String archive) throws MalformedURLException - { - URL url = null; - try - { - url = new URL(archive); - } - catch (MalformedURLException ignore) - { - // ignore - } - - if (url == null) - { - File file = new File(archive); - if (file.exists()) - url = file.toURL(); - } - - if (url == null) - { - File file = new File("libs/" + archive); - if (file.exists()) - url = file.toURL(); - } - - if (url == null) - throw new IllegalArgumentException("Cannot obtain URL for: " + archive); - - return url; - } -} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,132 +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.test.ws; - -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * A test setup that deploys/undeploys archives - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JBossWSTestSetup extends TestSetup -{ - private JBossWSTestHelper delegate = new JBossWSTestHelper(); - private String[] archives = new String[0]; - - public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList) - { - return new JBossWSTestSetup(testClass, archiveList); - } - - public static JBossWSTestSetup newTestSetup(Test test, String archiveList) - { - return new JBossWSTestSetup(test, archiveList); - } - - protected JBossWSTestSetup(Class testClass, String archiveList) - { - super(new TestSuite(testClass)); - getArchiveArray(archiveList); - } - - protected JBossWSTestSetup(Test test, String archiveList) - { - super(test); - getArchiveArray(archiveList); - } - - private void getArchiveArray(String archiveList) - { - if (archiveList != null) - { - StringTokenizer st = new StringTokenizer(archiveList, ", "); - archives = new String[st.countTokens()]; - - for (int i = 0; i < archives.length; i++) - archives[i] = st.nextToken(); - } - } - - protected void setUp() throws Exception - { - List clientJars = new ArrayList(); - for (int i = 0; i < archives.length; i++) - { - String archive = archives[i]; - boolean isJ2EEClient = archive.endsWith("-client.jar"); - if (delegate.isTargetJBoss() || isJ2EEClient == false) - { - try - { - delegate.deploy(archive); - } - catch (Exception ex) - { - ex.printStackTrace(); - delegate.undeploy(archive); - } - } - - if (isJ2EEClient) - { - URL archiveURL = delegate.getArchiveURL(archive); - clientJars.add(archiveURL); - } - } - - // add the client jars to the classloader - if( !clientJars.isEmpty() ) - { - ClassLoader parent = Thread.currentThread().getContextClassLoader(); - URL[] urls = new URL[clientJars.size()]; - for(int i=0; i<clientJars.size(); i++) - { - urls[i] = (URL)clientJars.get(i); - } - URLClassLoader cl = new URLClassLoader(urls, parent); - Thread.currentThread().setContextClassLoader(cl); - } - } - - protected void tearDown() throws Exception - { - for (int i = 0; i < archives.length; i++) - { - String archive = archives[archives.length - i - 1]; - boolean isJ2EEClient = archive.endsWith("-client.jar"); - if (delegate.isTargetJBoss() || isJ2EEClient == false) - { - delegate.undeploy(archive); - } - } - } -} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,41 +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.test.ws; - -import java.net.URL; - -/** - * WS test deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-May-2006 - */ -public interface TestDeployer -{ - /** Deploy the given archive - */ - void deploy(URL archive) throws Exception; - - /** Undeploy the given archive - */ - void undeploy(URL archive) throws Exception; -} \ No newline at end of file Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,55 +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.test.ws; - -import java.net.URL; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - -/** - * A JBossWS test helper that deals with test deployment/undeployment, etc. - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class TestDeployerJBoss implements TestDeployer -{ - private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; - - private MBeanServerConnection server; - - public TestDeployerJBoss(MBeanServerConnection server) - { - this.server = server; - } - - public void deploy(URL url) throws Exception - { - server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); - } - - public void undeploy(URL url) throws Exception - { - server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); - } -} Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.benchmark.jaxrpc; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.benchmark.jaxrpc; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.rpc.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.benchmark.jaxrpc; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.benchmark.jaxrpc; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.naming.InitialContext; import javax.xml.rpc.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,12 +21,12 @@ */ package org.jboss.test.ws.benchmark.jaxws; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.benchmark.jaxws.doclit.BenchmarkService; import junit.framework.Test; import org.jboss.test.ws.benchmark.jaxws.doclit.*; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import javax.xml.ws.Service; import javax.xml.ws.BindingProvider; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,7 +34,6 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; @@ -50,6 +49,7 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,7 +23,6 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; @@ -33,6 +32,7 @@ import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test parsing of the JBossWS config Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,7 +34,6 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; @@ -45,6 +44,7 @@ import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase; import org.jboss.ws.core.jaxrpc.binding.SerializerSupport; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.xb.binding.NamespaceRegistry; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -36,10 +36,10 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -36,9 +36,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.soap.SOAPBodyElementRpc; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test call on a SOAPConnection * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,10 +32,10 @@ import javax.xml.soap.SOAPMessage; import javax.xml.soap.Text; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.XMLFragment; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the SOAPContentElement Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,7 +32,7 @@ import javax.xml.soap.SOAPFactory; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the SOAPElement Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPEnvelopeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,9 +30,9 @@ import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFactoryTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,7 +26,7 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPFactory; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the SOAPFactory Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,9 +35,9 @@ import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,9 +31,9 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,10 +32,10 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,7 +39,6 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; @@ -53,6 +52,7 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; +import org.jboss.wsf.spi.test.JBossWSTest; /** * TODO Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,7 +34,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/utils/JavaUtilsTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,8 +21,8 @@ */ package org.jboss.test.ws.common.utils; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.jbws_161.custom.HelloObj; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.JavaUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,11 +23,11 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Tests WSDL11Reader ability to parse WSDL Files Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/MultiSchemaTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,11 +23,11 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the XSModel, and how it handles multiple schemas Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/SimpleFileImportTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import javax.xml.rpc.ServiceFactory; import org.jboss.net.protocol.URLStreamHandlerFactory; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test a wsdl import functionality. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,7 +27,6 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.Constants; import org.jboss.ws.extensions.eventing.EventingConstants; @@ -46,6 +45,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.ws.tools.wsdl.WSDLWriter; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/wsdl11/WSDLTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,11 +24,11 @@ import java.io.File; import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * The WSDL may contain or import XSD schema definitions. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/BaseDataTypesSupport.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,9 +21,9 @@ */ package org.jboss.test.ws.interop.soapwsdl; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.interop.ClientScenario; import org.jboss.test.ws.interop.InteropConfigFactory; +import org.jboss.wsf.spi.test.JBossWSTest; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,7 +24,8 @@ import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import junit.framework.Test; import javax.xml.ws.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,7 +24,8 @@ import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import junit.framework.Test; import javax.xml.ws.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,10 +21,11 @@ */ package org.jboss.test.ws.interop.soapwsdl.baserpclit; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSupport; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesSEI; import org.jboss.test.ws.interop.soapwsdl.BaseDataTypesProxy; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import junit.framework.Test; import javax.xml.ws.BindingProvider; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,10 +22,10 @@ package org.jboss.test.ws.interop.wsa; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/AbstractWSSEBase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,9 +21,9 @@ */ package org.jboss.test.ws.interop.wsse; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestHelper; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestHelper; import javax.xml.namespace.QName; import javax.xml.ws.Service; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,8 +22,9 @@ package org.jboss.test.ws.interop.wsse; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id: EncryptTestCase.java 2064 2007-01-24 11:30:23Z heiko.braun(a)jboss.com $ Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,8 +22,9 @@ package org.jboss.test.ws.interop.wsse; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 07-Mar-2006 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test anonymous types Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test soap encoded href Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,8 +34,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test soap encoded marshalling Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -54,8 +54,6 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfBookHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfQNameHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.ArrayOfbooleanHolder; @@ -79,6 +77,8 @@ import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumLongHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumShortHolder; import org.jboss.test.ws.jaxrpc.encoded.parametermode.holders.EnumStringHolder; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test soap encoded parameters Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test env entry access Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test env entry access Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,7 +29,7 @@ import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test case to test that a deployment containg a stateless session bean exposed Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1068/JBWS1068TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,9 +23,9 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Cannot handle xsd:import of xml schema Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,20 +22,17 @@ package org.jboss.test.ws.jaxrpc.jbws1093; import java.io.BufferedReader; -import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints @@ -60,21 +57,9 @@ super.setUp(); if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,18 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.jbws1107; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test case to test that an endpoint can be accessed if there is whitespace @@ -56,25 +51,12 @@ super.setUp(); if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1107/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1107/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1107", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); } } - public void testAccessEnpoint() throws Exception { assertEquals("Hello", port.echoString("Hello")); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,7 +25,7 @@ import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.ObjectNameFactory; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Client security configuration not loaded when client deployed with issolated classloader Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,9 +29,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Scoped class loading domains for WS endpoints Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,8 +35,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Support empty soap body elements Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Anonymous Simple Type causes NullPointerException Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Each web services invocation causes a new HTTP session to be created. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,9 +35,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * The prefix "xsi" for attribute "xsi:nil" is not bound Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * WS Client does not clean up temporary xsd files Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test that we can deploy an already modified web.xml * This also allows for redeployment of an expanded *.war Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,8 +27,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test to load client wsdl from war inside an ear * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Unmarshall issue with xsi:type specified bean property Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,9 +31,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * NPE in replaceAddressLocation with SOAP1.2 WSDL Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Attachment parts with doclit message Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,9 +31,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * [JBWS-1386] - ComplexType with base64Binary property Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,11 +31,11 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,12 +31,12 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService; import org.jboss.test.ws.jaxrpc.jbws1427.services.Message; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test nested xsd imports * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,18 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.jbws1619; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * ServletEndpointContext.getHttpSession has an incorrect implementation @@ -57,21 +52,9 @@ super.setUp(); if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1619", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test IN, INOUT, OUT of unsignedLong, etc. * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,8 +27,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,8 +39,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * soap response does not respect minOccurs=0 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Test mapping of primitive types in jaxrpc-mapping.xml * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Handle Simple Types with Enumerated Values Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,7 +26,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Document/Literal parameter wrapping with null values Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * JBoss creates SOAP messages that don't conform WS-I Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * JBoss ignores metadata supplied in a JAX-RPC Mapping DD Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,8 +31,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * JBoss ignores metadata supplied in a JAX-RPC Mapping DD Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * No serializer found exception for method returning an array of objects Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * JBoss ignores metadata supplied in a JAX-RPC Mapping DD Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -38,8 +38,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * No serializer found exception for method returning an array of objects Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,8 +25,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Axis-1.2RC2 client may send messages like this Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,10 +26,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder; import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Multiple bindings are not supported Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,10 +26,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.jbws663.holders.ResponseInfoHolder; import org.jboss.test.ws.jaxrpc.jbws663.holders.SubscriptionInfoHolder; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Multiple bindings are not supported Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * The type associated with a message part references a complex schema type and not a schema element that uses the schema type. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,8 +27,8 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * rpc-literal binding MUST namespace qualify the descendents of part accessor elements Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,8 +35,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Cannot find custom datatypes in WEB-INF/lib Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Document/Literal webservices that are oneway Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Handling of xml:lang and any namespace="##other" Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,11 +31,11 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Protect access to WSDL Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Empty unwrapped arrays incorrectly unmarshalled as a null value Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,7 +24,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,8 +33,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMWriter; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,8 +27,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Cannot deploy a ws containing more than one service per wsdl Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -45,8 +45,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; public class JBWS801TestCase extends JBossWSTest { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * A handler's handleFault() method is never called Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,8 +39,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Access to /context/services/Foo is denied Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Access to /context/services/Foo is denied Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,8 +39,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.w3c.dom.Document; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,9 +30,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Attributes of type xsd:QName incorrectly serialized Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws955/JBWS955TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,7 +31,7 @@ import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,9 +30,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Deserialization of complex bean containing an array of complex beans Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws958/JBWS958TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,9 +24,9 @@ import java.io.File; import java.net.URL; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * XML entity usage in wsdl contained schema Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import javax.xml.rpc.Service; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test standard JAX-RPC types. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,10 +32,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on the Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,8 +31,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test standard JAX-RPC types. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,9 +29,9 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean2; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.JavaUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -54,9 +54,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test DII with Holders Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * A test that tests overloaded methods. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,39 +1,33 @@ /* - * 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.docstyle.bare; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE test case for an document/literal/bare style service. @@ -56,22 +50,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); - port = (TrivialService)service.getPort(TrivialService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/docstyle/bare/WEB-INF/wsdl/SampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/docstyle/bare/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/docstyle/bare", "SampleService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TrivialService)service.getPort(TrivialService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-bare"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); + port = (TrivialService)service.getPort(TrivialService.class); } } @@ -81,6 +62,6 @@ String product = "Ferrari"; TrivialOrder req = new TrivialOrder(person, product); TrivialOrderResponse res = port.purchase(req); - assertEquals("ok" + person +product, res.getResult()); + assertEquals("ok" + person + product, res.getResult()); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,39 +1,33 @@ /* - * 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.docstyle.wrapped; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE test case for an document/literal/wrapped style service. @@ -56,22 +50,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); - port = (TrivialService)service.getPort(TrivialService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/wsdl/SampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/docstyle/wrapped", "SampleService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TrivialService)service.getPort(TrivialService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-docstyle-wrapped"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); + port = (TrivialService)service.getPort(TrivialService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,10 +33,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceExt; import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.ObjectNameFactory; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test static handlers Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,8 +22,6 @@ package org.jboss.test.ws.jaxrpc.samples.exception; import java.io.ByteArrayInputStream; -import java.io.File; -import java.net.URL; import java.rmi.RemoteException; import javax.naming.InitialContext; @@ -31,7 +29,6 @@ import javax.xml.rpc.Call; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceFactory; -import javax.xml.rpc.Stub; import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.Detail; import javax.xml.soap.MessageFactory; @@ -46,9 +43,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test user exception propagation. @@ -67,24 +63,10 @@ private ExceptionServiceInterface getPort() throws Exception { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - ExceptionService service = (ExceptionService)iniCtx.lookup("java:comp/env/service/ExceptionService"); - ExceptionServiceInterface port = service.getPort(); - return port; - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/exception/WEB-INF/wsdl/ExceptionService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/exception/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/exception", "ExceptionService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - ExceptionServiceInterface port = (ExceptionServiceInterface)service.getPort(ExceptionServiceInterface.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-exception"); - return port; - } + InitialContext iniCtx = getInitialContext(); + ExceptionService service = (ExceptionService)iniCtx.lookup("java:comp/env/service/ExceptionService"); + ExceptionServiceInterface port = service.getPort(); + return port; } /** Test creation of a SOAPFault */ Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,23 +21,18 @@ */ package org.jboss.test.ws.jaxrpc.samples.handler; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import javax.xml.rpc.holders.StringHolder; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test bound and unbound headers @@ -62,22 +57,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (HeaderTestService)service.getPort(HeaderTestService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/handler/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/handler/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/handler", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (HeaderTestService)service.getPort(HeaderTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-handler"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (HeaderTestService)service.getPort(HeaderTestService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,10 +32,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.client.CallImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on the Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,12 +30,12 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test bound and unbound headers Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -53,9 +53,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test DII with Holders Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,16 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.holder; -import java.io.File; import java.math.BigDecimal; import java.math.BigInteger; -import java.net.URL; import java.util.GregorianCalendar; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import javax.xml.rpc.holders.BigDecimalHolder; import javax.xml.rpc.holders.BigIntegerHolder; import javax.xml.rpc.holders.BooleanHolder; @@ -54,9 +51,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test Holders @@ -79,22 +75,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (HolderTestService)service.getPort(HolderTestService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/holder/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/holder/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/holder", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (HolderTestService)service.getPort(HolderTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-holder"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (HolderTestService)service.getPort(HolderTestService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test EJB endpoint for a document style service. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on a Call that is preconfigured from WSDL Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on the Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test EJB Service Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,10 +28,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the DynamicProxy Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,19 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.jsr109pojo; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE endpoint for a document style service. @@ -56,22 +50,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); - port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/jsr109pojo", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-jsr109pojo-doc"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); + port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on a Call that is preconfigured from WSDL Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the Dynamic Invocation Interface (DII) on the Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,9 +31,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE test case for an rpc style service. @@ -56,7 +56,7 @@ if (port == null) { - if (isTargetJBoss42() || isTargetJBoss40()) + if (isTargetJBoss42()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,10 +28,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the DynamicProxy Call Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxrpc.samples.message; import java.io.ByteArrayInputStream; -import java.io.File; import java.net.URL; import javax.naming.InitialContext; @@ -31,7 +30,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConnection; @@ -48,9 +46,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -132,24 +129,10 @@ private MessageTestService getPort() throws Exception { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); - MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class); - return port; - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/message/WEB-INF/wsdl/MessageService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/message/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/message", "MessageService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-message"); - return port; - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/MessageService"); + MessageTestService port = (MessageTestService)service.getPort(MessageTestService.class); + return port; } private SOAPElement convertToSOAPElement(Element reqElement) throws TransformerException, SOAPException Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,23 +23,19 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; -import java.io.File; import java.io.InputStreamReader; -import java.net.URL; import javax.activation.DataHandler; import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.Stub; import javax.xml.transform.stream.StreamSource; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP with XOP through the JAXRPC dynamic proxy layer. @@ -64,23 +60,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService"); - port = (EmployeeRecords)service.getPort(EmployeeRecords.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/wsdl/EmployeeService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/mtom/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/mtom", "EmployeeService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (EmployeeRecords)service.getPort(EmployeeRecords.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-mtom"); - } - + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestService"); + port = (EmployeeRecords)service.getPort(EmployeeRecords.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,19 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.oneway; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE test case for onway operations. @@ -56,22 +50,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (OneWayTestService)service.getPort(OneWayTestService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/oneway/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/oneway/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/oneway", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (OneWayTestService)service.getPort(OneWayTestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-oneway"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (OneWayTestService)service.getPort(OneWayTestService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,39 +1,33 @@ /* - * 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.rpcstyle; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JSE test case for an rpc style service. @@ -56,23 +50,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); - port = (TrivialService)service.getPort(TrivialService.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/rpcstyle/WEB-INF/wsdl/SampleService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/rpcstyle/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/rpcstyle", "SampleService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TrivialService)service.getPort(TrivialService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-rpcstyle"); - - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TrivialService"); + port = (TrivialService)service.getPort(TrivialService.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * A web service client that connects to a secured SLSB endpoint using. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -40,9 +40,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP with Attachements (SwA) through the JAXRPC DII layer. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,16 +31,13 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMultipart; import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import javax.xml.transform.stream.StreamSource; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP with Attachements (SwA) through the JAXRPC dynamic proxy layer. @@ -65,22 +62,9 @@ if (port == null) { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService"); - port = (Attachment)service.getPort(Attachment.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/swa/WEB-INF/wsdl/Attachment.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/swa/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/samples/swa", "Attachment"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (Attachment)service.getPort(Attachment.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-swa"); - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/AttachmentService"); + port = (Attachment)service.getPort(Attachment.class); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -47,9 +47,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.soap.SOAPBodyElementRpc; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP with Attachements (SwA) through the SAAJ layer. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/JbpmBpelTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; import org.jboss.logging.Logger; -import org.jboss.test.ws.JBossWSTestHelper; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestHelper; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.ObjectNameFactory; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,9 +27,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.samples.wsbpel.JbpmBpelTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test business process behavior based on web services. @@ -49,15 +49,8 @@ protected void setUp() throws Exception { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - } - else - { - throw new IllegalStateException("Unsupported target server"); - } + InitialContext iniCtx = getInitialContext(); + helloService = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); } public void testSayHelloProxy() throws Exception Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,21 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.wssecurity; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal @@ -68,29 +60,9 @@ private Hello getPort() throws Exception { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL(); - URL securityURL = new File("resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); - - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL); - - Hello port = (Hello)service.getPort(Hello.class); - - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-encrypt"); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - - return port; - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -21,21 +21,13 @@ */ package org.jboss.test.ws.jaxrpc.samples.wssecurity; -import java.io.File; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.namespace.QName; import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal @@ -68,29 +60,9 @@ private Hello getPort() throws Exception { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello port = (Hello)service.getPort(Hello.class); - return port; - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL(); - URL securityURL = new File("resources/jaxrpc/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); - - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL); - - Hello port = (Hello)service.getPort(Hello.class); - - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-wssecurity-sign"); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - - return port; - } + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Hello port = (Hello)service.getPort(Hello.class); + return port; } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,11 +29,11 @@ import javax.xml.rpc.Stub; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.core.jaxrpc.client.ServiceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * This test simulates the usage of a jboss-ws-security keystore and truststore use cases @@ -56,7 +56,7 @@ { if (port == null) { - if (isTargetJBoss42() || isTargetJBoss40()) + if (isTargetJBoss42()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,11 +32,11 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXRPC <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,11 +31,11 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXRPC <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,11 +32,11 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXRPC <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,8 +39,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,9 +29,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test <wsdl-publish-location> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wspolicy/PolicyParserTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,7 +29,7 @@ import org.apache.ws.policy.util.PolicyFactory; import org.apache.ws.policy.util.PolicyReader; import org.apache.ws.policy.util.PolicyWriter; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the WS-Policy parser Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,12 +31,12 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.SecurityDecoder; import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security service handling of a non signed/encrypted client Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,7 +32,6 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.EncryptionOperation; @@ -49,6 +48,7 @@ import org.jboss.ws.extensions.security.TimestampOperation; import org.jboss.ws.extensions.security.Util; import org.jboss.ws.extensions.security.WsuIdTarget; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,7 +25,7 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Add support for fault signing and encryption Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,7 +25,7 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Add support for fault signing and encryption Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,8 +29,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,12 +30,12 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.SecurityDecoder; import org.jboss.ws.extensions.security.SecurityStore; import org.jboss.ws.extensions.security.Util; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test UsernameToken Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,8 +27,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal from a web client. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,8 +29,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; public class AccountSignupTestCase extends JBossWSTest { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,7 +28,6 @@ import javax.xml.rpc.Stub; import javax.xml.transform.Source; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; @@ -39,6 +38,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.IOUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test MTOM functionality with jaxrpc-handlers in place.<br> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test MTOM functionaly without any jaxrpc handlers in place. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,7 +29,6 @@ import javax.xml.rpc.Stub; import javax.xml.transform.Source; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; @@ -40,6 +39,7 @@ import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.IOUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test anonymous bare types. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,9 +34,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.Constants; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP12 binding type Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -36,8 +36,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * A complex JAX-WS test Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -38,11 +38,11 @@ import junit.extensions.TestSetup; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestHelper; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestHelper; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS Endpoint deployment Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -36,8 +36,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS handler lifecycle Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test SOAP12 binding type Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,8 +31,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * A JAX-WS holder test case Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,9 +32,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.CallImpl; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.ObjectNameFactory; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,8 +29,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * JAXWSDeployerJSE is not handling jsp servlet defs correctly Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,10 +29,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * wsdlReader fails with faults defined on jaxws SEI Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,10 +25,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * EJB vehicle using loader repository not sufficiently isolated Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,10 +25,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * EJB vehicle using loader repository not sufficiently isolated Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,10 +30,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Investigate "Is Not A Servlet" error with multiple servlets in the web.xml Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -37,8 +37,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Arrays with JSR181 endpoints Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * EJB3 jmx name is incorrectly derrived Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * [JBWS-981] Virtual host configuration for EJB endpoints Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAX-WS metadata builder. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,8 +24,8 @@ import junit.framework.Test; import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test @WebServiceRef overrides in jboss-client.xml Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceRef Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,8 +29,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,9 +32,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test stateful endpoint using ws-addressing Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,8 +34,6 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.eventing.EventingConstants; @@ -47,6 +45,8 @@ import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the eventing example service. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.client.ServiceExt; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.client.ServiceExt; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,8 +31,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.client.ServiceExt; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test WS-Security with RPC/Literal Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,10 +33,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXWS <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,10 +31,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JAXRPC <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,10 +34,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the jaxws <service-ref> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test different JAXB accesor types. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,8 +23,8 @@ //$Id$ -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -34,8 +34,8 @@ import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; -import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test the SOAPAddressingProperties Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,8 +25,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test endpoint using ws-addressing. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,8 +33,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test endpoint using ws-addressing Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.jaxws.wsdd; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.BindingProvider; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,7 +35,6 @@ import javax.xml.ws.addressing.EndpointReference; import javax.xml.ws.addressing.JAXWSAConstants; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.extensions.addressing.AddressingClientUtil; @@ -50,6 +49,7 @@ import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Eventing test case support. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,7 +30,6 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.jaxws.DeliveryType; @@ -41,6 +40,7 @@ import org.jboss.ws.extensions.eventing.jaxws.Subscribe; import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the eventing endpoints. Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,10 +27,10 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,7 +28,6 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; @@ -36,6 +35,7 @@ import org.jboss.ws.extensions.eventing.mgmt.Filter; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,11 +30,11 @@ import org.apache.ws.policy.Policy; import org.apache.ws.policy.PrimitiveAssertion; import org.apache.ws.policy.XorCompositeAssertion; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.WSException; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; +import org.jboss.wsf.spi.test.JBossWSTest; /** * @author Alessio Soldano, <mailto:alessio.soldano@javalinux.it> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,7 +30,6 @@ import javax.xml.namespace.QName; import org.apache.ws.policy.Policy; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.extensions.policy.PolicyScopeLevel; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; @@ -43,6 +42,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; /** * @author Alessio Soldano, <mailto:alessio.soldano@javalinux.it> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,7 +24,6 @@ import java.io.File; import java.io.Writer; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.common.jbossxb.complex.ComplexTypes; import org.jboss.test.ws.tools.sei.ArrayInterface; import org.jboss.test.ws.tools.sei.CustomInterface; @@ -40,6 +39,7 @@ import org.jboss.ws.tools.JavaToWSDL; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.wsdl.WSDLWriter; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/WSToolsTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,7 +33,6 @@ import javax.xml.rpc.encoding.TypeMapping; import org.apache.xerces.xs.XSModel; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.WSDL11Validator; import org.jboss.test.ws.tools.validation.WSDLValidator; @@ -47,6 +46,7 @@ import org.jboss.ws.tools.client.ServiceCreator; import org.jboss.ws.tools.exceptions.JBossWSToolsException; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.JavaUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.WSDLToJava; import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; +import org.jboss.wsf.spi.test.JBossWSTest; /** Testcase that tests WSDL 2.0 Assertions for the JBossWS Tools project * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,13 +24,13 @@ import java.io.IOException; import java.util.List; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.Configuration; import org.jboss.ws.tools.WSTools; import org.jboss.ws.tools.Configuration.JavaToWSDLConfig; import org.jboss.ws.tools.Configuration.OperationConfig; import org.jboss.ws.tools.Configuration.WSDLToJavaConfig; import org.jboss.ws.tools.config.ToolsSchemaConfigReader; +import org.jboss.wsf.spi.test.JBossWSTest; /** * TestCase that tests the parsing of the xml configuration file Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,8 +23,8 @@ import java.io.FileInputStream; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,12 +27,12 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.common.jbossxb.complex.Derived; import org.jboss.test.ws.common.jbossxb.simple.SimpleUserType; import org.jboss.ws.Constants; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.JavaToXSD; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaTypesCreatorTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,12 +26,12 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.jbws_161.customexceptions.UserException; import org.jboss.test.ws.tools.sei.Derived; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; import org.jboss.ws.tools.schema.SchemaTypeCreator; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,8 +28,8 @@ import java.net.URL; import java.net.URLClassLoader; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.tools.WSContractProvider; import org.jboss.wsf.spi.utils.JavaUtils; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,8 +23,8 @@ import java.io.IOException; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,9 +25,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; -import org.jboss.test.ws.JBossWSTest; import org.jboss.util.xml.DOMUtils; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.IOUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -25,8 +25,8 @@ import java.io.FileInputStream; import java.io.FileReader; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * JBWS-1184 - Test the use of wrapper jave type for generated source Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test for a port name which ends 'PortType' Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,10 +24,10 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,11 +24,11 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.WSException; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * [JBWS-1260] - Test case to test various scenarios unwrapping parameters Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,10 +24,10 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,10 +24,10 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test case to test WSDL to Java where the element names in the Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,10 +24,10 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test case for http://jira.jboss.com/jira/browse/JBWS-1607 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,10 +24,10 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test case for http://jira.jboss.com/jira/browse/JBWS-1627 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,11 +29,11 @@ import org.apache.ws.policy.util.DOMPolicyReader; import org.apache.ws.policy.util.PolicyFactory; import org.apache.ws.policy.util.PolicyReader; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.sei.StandardJavaTypes; import org.jboss.test.ws.tools.validation.WSDLValidator; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.IOUtils; import org.jboss.ws.extensions.policy.PolicyScopeLevel; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,10 +23,10 @@ import java.io.File; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,8 +23,8 @@ import java.io.FileInputStream; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/AnonTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,10 +26,10 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.jbws_204.wscompile.anontypes.Items; import org.jboss.ws.Constants; import org.jboss.ws.tools.JavaToXSD; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_204/NillableTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -28,12 +28,12 @@ import javax.xml.namespace.QName; import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.jbws_204.wscompile.nillabletypes.NillableType; import org.jboss.ws.Constants; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.tools.JavaToXSD; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/JavaWsdlMappingMetaDataTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,7 +26,6 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.MethodParamPartsMapping; @@ -37,6 +36,7 @@ import org.jboss.ws.metadata.jaxrpcmapping.ServiceInterfaceMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.metadata.jaxrpcmapping.WsdlReturnValueMapping; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/metadata/WebServicesMetaDataTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -27,11 +27,11 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/JBossSourceCompTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,8 +24,8 @@ import java.io.File; import org.jboss.logging.Logger; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.wsf.spi.test.JBossWSTest; /** Checks the fixture for Java Source Code Comparison * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/sourcecomp/XMLCompareTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,7 +23,7 @@ import org.custommonkey.xmlunit.XMLAssert; import org.custommonkey.xmlunit.XMLUnit; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test case that uses XMLUnit to compare two xml files Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/WSDLTypesTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -26,7 +26,6 @@ import javax.xml.namespace.QName; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.jaxrpc.LiteralTypeMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLTypes; @@ -34,6 +33,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.tools.WSDLToJava; import org.jboss.ws.tools.interfaces.WSDLToJavaIntf; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Test case that tests the WSDLTypes Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -46,7 +46,6 @@ import org.apache.xerces.xs.XSTerm; import org.apache.xerces.xs.XSTypeDefinition; import org.apache.xerces.xs.XSWildcard; -import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.utils.JBossWSEntityResolver; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSComplexTypeDefinition; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSElementDeclaration; @@ -55,6 +54,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSParticle; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.JavaToXSD; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.xb.binding.sunday.unmarshalling.LSInputAdaptor; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver; Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,293 +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.test.ws; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.management.MBeanServerConnection; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.ws.Service; - -import junit.framework.TestCase; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.utils.DOMUtils; -import org.jboss.wsf.spi.utils.DOMWriter; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * Base class for JBossWS test cases - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public abstract class JBossWSTest extends TestCase -{ - // provide logging - protected Logger log = Logger.getLogger(getClass().getName()); - - private JBossWSTestHelper delegate = new JBossWSTestHelper(); - - public JBossWSTest() - { - } - - public JBossWSTest(String name) - { - super(name); - } - - /** Get the MBeanServerConnection from JNDI */ - public MBeanServerConnection getServer() throws NamingException - { - return JBossWSTestHelper.getServer(); - } - - public boolean isTargetJBoss50() - { - return JBossWSTestHelper.isTargetJBoss50(); - } - - public boolean isTargetJBoss42() - { - return JBossWSTestHelper.isTargetJBoss42(); - } - - public boolean isIntegrationNative() - { - return delegate.isIntegrationNative(); - - } - - public boolean isIntegrationSunRI() - { - return delegate.isIntegrationSunRI(); - } - - public boolean isIntegrationXFire() - { - return delegate.isIntegrationXFire(); - } - - /** Deploy the given archive - */ - public void deploy(String archive) throws Exception - { - delegate.deploy(archive); - } - - /** Undeploy the given archive - */ - public void undeploy(String archive) throws Exception - { - delegate.undeploy(archive); - } - - /** Get the client's env context for a given name. - */ - protected InitialContext getInitialContext(String clientName) throws NamingException - { - InitialContext iniCtx = new InitialContext(); - Hashtable env = iniCtx.getEnvironment(); - env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); - env.put("j2ee.clientName", clientName); - return new InitialContext(env); - } - - /** Get the client's env context - */ - protected InitialContext getInitialContext() throws NamingException - { - return getInitialContext("jbossws-client"); - } - - public boolean hasJDK15() - { - try - { - Class.forName("java.lang.Enum"); - return true; - } - catch (ClassNotFoundException ex) - { - return false; - } - } - - public String getServerHost() - { - return JBossWSTestHelper.getServerHost(); - } - - public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace) - { - normalizeWhitspace(expElement, ignoreWhitespace); - normalizeWhitspace(wasElement, ignoreWhitespace); - String expStr = DOMWriter.printNode(expElement, false); - String wasStr = DOMWriter.printNode(wasElement, false); - if (expStr.equals(wasStr) == false) - { - System.out.println("\nExp: " + expStr + "\nWas: " + wasStr); - Logger.getLogger(JBossWSTest.class).error("\nExp: " + expStr + "\nWas: " + wasStr); - } - assertEquals(expStr, wasStr); - } - - public static void assertEquals(Element expElement, Element wasElement) - { - assertEquals(expElement, wasElement, false); - } - - public static void assertEquals(Object exp, Object was) - { - if (exp instanceof Object[] && was instanceof Object[]) - assertEqualsArray((Object[])exp, (Object[])was); - else if (exp instanceof byte[] && was instanceof byte[]) - assertEqualsArray((byte[])exp, (byte[])was); - else if (exp instanceof boolean[] && was instanceof boolean[]) - assertEqualsArray((boolean[])exp, (boolean[])was); - else if (exp instanceof short[] && was instanceof short[]) - assertEqualsArray((short[])exp, (short[])was); - else if (exp instanceof int[] && was instanceof int[]) - assertEqualsArray((int[])exp, (int[])was); - else if (exp instanceof long[] && was instanceof long[]) - assertEqualsArray((long[])exp, (long[])was); - else if (exp instanceof float[] && was instanceof float[]) - assertEqualsArray((float[])exp, (float[])was); - else if (exp instanceof double[] && was instanceof double[]) - assertEqualsArray((double[])exp, (double[])was); - else TestCase.assertEquals(exp, was); - } - - private static void assertEqualsArray(Object[] exp, Object[] was) - { - if (exp == null && was == null) - return; - - if (exp != null && was != null) - { - if (exp.length != was.length) - { - fail("Expected <" + exp.length + "> array items, but was <" + was.length + ">"); - } - else - { - for (int i = 0; i < exp.length; i++) - { - - Object compExp = exp[i]; - Object compWas = was[i]; - assertEquals(compExp, compWas); - } - } - } - else if (exp == null) - { - fail("Expected a null array, but was: " + Arrays.asList(was)); - } - else if (was == null) - { - fail("Expected " + Arrays.asList(exp) + ", but was: null"); - } - } - - private static void assertEqualsArray(byte[] exp, byte[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(boolean[] exp, boolean[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(short[] exp, short[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(int[] exp, int[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(long[] exp, long[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(float[] exp, float[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - private static void assertEqualsArray(double[] exp, double[] was) - { - assertTrue("Arrays don't match", Arrays.equals(exp, was)); - } - - /** Removes whitespace text nodes if they have an element sibling. - */ - private static void normalizeWhitspace(Element element, boolean ignoreWhitespace) - { - boolean hasChildElement = false; - ArrayList toDetach = new ArrayList(); - - String nodeName = element.getNodeName(); - NodeList childNodes = element.getChildNodes(); - for (int i = 0; i < childNodes.getLength(); i++) - { - Node node = childNodes.item(i); - if (node.getNodeType() == Node.TEXT_NODE) - { - String nodeValue = node.getNodeValue(); - if (nodeValue.trim().length() == 0) - toDetach.add(node); - } - if (node.getNodeType() == Node.ELEMENT_NODE) - { - normalizeWhitspace((Element)node, ignoreWhitespace); - hasChildElement = true; - } - } - - // remove whitespace nodes - if (hasChildElement || ignoreWhitespace) - { - Iterator it = toDetach.iterator(); - while (it.hasNext()) - { - Node node = (Node)it.next(); - element.removeChild(node); - } - } - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,201 +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.test.ws; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Hashtable; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * A JBossWS test helper that deals with test deployment/undeployment, etc. - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JBossWSTestHelper -{ - // provide logging - private static Logger log = Logger.getLogger(JBossWSTestHelper.class); - - private static MBeanServerConnection server; - private static String integrationTarget; - - /** Deploy the given archive - */ - public void deploy(String archive) throws Exception - { - URL url = getArchiveURL(archive); - getDeployer().deploy(url); - } - - /** Undeploy the given archive - */ - public void undeploy(String archive) throws Exception - { - URL url = getArchiveURL(archive); - getDeployer().undeploy(url); - } - - /** True, if -Djbossws.integration.target=jboss50 */ - public static boolean isTargetJBoss50() - { - String target = getIntegrationTarget(); - return "jboss50".equals(target); - } - - /** True, if -Djbossws.integration.target=jboss42 */ - public static boolean isTargetJBoss42() - { - String target = getIntegrationTarget(); - return "jboss42".equals(target); - } - - public boolean isIntegrationNative() - { - String vendor = Service.class.getPackage().getImplementationVendor(); - return vendor.startsWith("JBoss"); - } - - public boolean isIntegrationSunRI() - { - String vendor = Service.class.getPackage().getImplementationVendor(); - return vendor.startsWith("Sun Microsystems"); - } - - public boolean isIntegrationXFire() - { - throw new NotImplementedException(); - } - - /** - * Get the JBoss server host from system property "jboss.bind.address" - * This defaults to "localhost" - */ - public static String getServerHost() - { - String hostName = System.getProperty("jboss.bind.address", "localhost"); - return hostName; - } - - public static MBeanServerConnection getServer() - { - if (server == null) - { - Hashtable jndiEnv = null; - try - { - InitialContext iniCtx = new InitialContext(); - jndiEnv = iniCtx.getEnvironment(); - server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - } - catch (NamingException ex) - { - throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex); - } - } - return server; - } - - private TestDeployer getDeployer() - { - return new TestDeployerJBoss(getServer()); - } - - private static String getIntegrationTarget() - { - if (integrationTarget == null) - { - integrationTarget = System.getProperty("jbossws.integration.target"); - - if (integrationTarget == null) - throw new IllegalStateException("Cannot obtain jbossws.integration.target"); - - // Read the JBoss SpecificationVersion - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); - if (jbossVersion.startsWith("5.0")) - jbossVersion = "jboss50"; - else if (jbossVersion.startsWith("4.2")) - jbossVersion = "jboss42"; - else throw new RuntimeException("Unsupported jboss version: " + jbossVersion); - - if (jbossVersion.equals(integrationTarget) == false) - { - throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion); - //integrationTarget = jbossVersion; - } - } - catch (Throwable th) - { - // ignore, we are not running on jboss-4.2 or greater - } - } - return integrationTarget; - } - - /** Try to discover the URL for the deployment archive */ - public URL getArchiveURL(String archive) throws MalformedURLException - { - URL url = null; - try - { - url = new URL(archive); - } - catch (MalformedURLException ignore) - { - // ignore - } - - if (url == null) - { - File file = new File(archive); - if (file.exists()) - url = file.toURL(); - } - - if (url == null) - { - File file = new File("libs/" + archive); - if (file.exists()) - url = file.toURL(); - } - - if (url == null) - throw new IllegalArgumentException("Cannot obtain URL for: " + archive); - - return url; - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestSetup.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,124 +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.test.ws; - -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * A test setup that deploys/undeploys archives - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class JBossWSTestSetup extends TestSetup -{ - private JBossWSTestHelper delegate = new JBossWSTestHelper(); - private String[] archives = new String[0]; - - public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList) - { - return new JBossWSTestSetup(testClass, archiveList); - } - - public static JBossWSTestSetup newTestSetup(Test test, String archiveList) - { - return new JBossWSTestSetup(test, archiveList); - } - - protected JBossWSTestSetup(Class testClass, String archiveList) - { - super(new TestSuite(testClass)); - getArchiveArray(archiveList); - } - - protected JBossWSTestSetup(Test test, String archiveList) - { - super(test); - getArchiveArray(archiveList); - } - - private void getArchiveArray(String archiveList) - { - if (archiveList != null) - { - StringTokenizer st = new StringTokenizer(archiveList, ", "); - archives = new String[st.countTokens()]; - - for (int i = 0; i < archives.length; i++) - archives[i] = st.nextToken(); - } - } - - protected void setUp() throws Exception - { - List clientJars = new ArrayList(); - for (int i = 0; i < archives.length; i++) - { - String archive = archives[i]; - try - { - delegate.deploy(archive); - } - catch (Exception ex) - { - ex.printStackTrace(); - delegate.undeploy(archive); - } - - if (archive.endsWith("-client.jar")) - { - URL archiveURL = delegate.getArchiveURL(archive); - clientJars.add(archiveURL); - } - } - - // add the client jars to the classloader - if (!clientJars.isEmpty()) - { - ClassLoader parent = Thread.currentThread().getContextClassLoader(); - URL[] urls = new URL[clientJars.size()]; - for (int i = 0; i < clientJars.size(); i++) - { - urls[i] = (URL)clientJars.get(i); - } - URLClassLoader cl = new URLClassLoader(urls, parent); - Thread.currentThread().setContextClassLoader(cl); - } - } - - protected void tearDown() throws Exception - { - for (int i = 0; i < archives.length; i++) - { - String archive = archives[archives.length - i - 1]; - delegate.undeploy(archive); - } - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/TestDeployer.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,41 +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.test.ws; - -import java.net.URL; - -/** - * WS test deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-May-2006 - */ -public interface TestDeployer -{ - /** Deploy the given archive - */ - void deploy(URL archive) throws Exception; - - /** Undeploy the given archive - */ - void undeploy(URL archive) throws Exception; -} \ No newline at end of file Deleted: trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerJBoss.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,55 +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.test.ws; - -import java.net.URL; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - -/** - * A JBossWS test helper that deals with test deployment/undeployment, etc. - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Oct-2004 - */ -public class TestDeployerJBoss implements TestDeployer -{ - private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; - - private MBeanServerConnection server; - - public TestDeployerJBoss(MBeanServerConnection server) - { - this.server = server; - } - - public void deploy(URL url) throws Exception - { - server.invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" }); - } - - public void undeploy(URL url) throws Exception - { - server.invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" }); - } -} Deleted: trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/XOPTestSupport.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,106 +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.test.ws; - -// $Id$ - -import java.awt.Image; -import java.awt.Toolkit; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.xml.transform.stream.StreamSource; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since 22-Sep-2006 - */ -public class XOPTestSupport -{ - - public static byte[] getBytesFromFile(File file) throws IOException - { - InputStream is = new FileInputStream(file); - - long length = file.length(); - byte[] bytes = new byte[(int)length]; - - int offset = 0; - int numRead = 0; - while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) - { - offset += numRead; - } - - is.close(); - return bytes; - } - - public static Image createTestImage(File imgFile) - { - Image image = null; - try - { - URL url = imgFile.toURL(); - - image = null; - try - { - image = Toolkit.getDefaultToolkit().createImage(url); - } - catch (Throwable th) - { - //log.warn("Cannot create Image: " + th); - } - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - - return image; - } - - public static StreamSource createTestSource() - { - return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); - } - - public static DataHandler createDataHandler(File imgFile) - { - try - { - URL url = imgFile.toURL(); - return new DataHandler(url); - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - } -} Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -39,8 +39,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.xml.sax.InputSource; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,8 +35,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS asynchrous proxy Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS WebServiceContext Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS WebServiceContext Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,9 +29,9 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestHelper; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestHelper; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test ear deployment Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -29,8 +29,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.w3c.dom.Element; /** Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,8 +32,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.HandlerChain Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -36,8 +36,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -37,8 +37,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -56,7 +56,7 @@ import javax.xml.registry.infomodel.TelephoneNumber; import javax.xml.registry.infomodel.User; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.utils.ObjectNameFactory; /** Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -31,8 +31,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS logical handlers Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test JAXWS logical handlers Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -33,8 +33,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -43,8 +43,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -43,8 +43,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -44,8 +44,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -37,8 +37,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.SOAPBinding Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -1,9 +1,10 @@ package org.jboss.test.ws.jaxws.samples.swaref; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.xml.ws.Service; import javax.xml.namespace.QName; import javax.activation.DataHandler; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -40,8 +40,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.WebParam Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -35,8 +35,8 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.webresult Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; /** * Base testing class for @WebService Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,7 +23,7 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -23,7 +23,7 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test the JSR-181 annotation: javax.jws.WebService Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -30,8 +30,8 @@ import javax.xml.transform.Source; import javax.xml.ws.soap.SOAPBinding; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.jaxws.samples.xop.XOPTestSupport; +import org.jboss.wsf.spi.test.JBossWSTest; /** * User: hbraun Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -24,8 +24,9 @@ // $Revision: $ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -32,7 +32,7 @@ import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.wsf.spi.test.JBossWSTestSetup; /** * Test service endpoint capability to process inlined and optimized Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-31 14:57:14 UTC (rev 3340) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2007-05-31 16:06:53 UTC (rev 3341) @@ -22,9 +22,10 @@ package org.jboss.test.ws.jaxws.samples.xop.doclit; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.test.ws.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.BindingProvider;