Author: asoldano Date: 2014-06-20 13:34:46 -0400 (Fri, 20 Jun 2014) New Revision: 18754 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Log: [JBWS-3711] ShrinkWrap conversion WIP, samples shared tests... Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -412,6 +412,11 @@ archive.as(ZipExporter.class).exportTo(file, true); return archive; } + + public String getName() + { + return archive.getName(); + } private File assertArchiveDirExists(String testArchiveDir) { Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-06-20 17:34:46 UTC (rev 18754) @@ -50,284 +50,6 @@ </fileset> </jar> - <!-- jaxws-samples-addressing --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/addressing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/addressing/jaxws-handlers.xml"/> - </classes> - </war> - - <!-- jaxws-samples-asynchronous --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/EndpointBean.class"/> - </classes> - </war> - - <!-- jaxws-samples-context --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-context-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/context/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF" - prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common"/> - </manifest> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/context/META-INF"> - <include name="jboss.xml"/> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common"/> - </manifest> - </jar> - - <!-- jaxws-samples-eardeployment --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.common"/> - </manifest> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-ejb3.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-samples-eardeployment-ejb3.jar"/> - <include name="jaxws-samples-eardeployment-pojo.war"/> - </fileset> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/META-INF" - prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - </jar> - - <!-- jaxws-samples-exception --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/SOAP12EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/SOAP12ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/exception/META-INF" - prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-exception.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/SOAP12EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpointEJB3Impl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/SOAP12ExceptionEndpointEJB3Impl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/UserException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/exception/META-INF"> - <include name="permissions.xml"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-exception-client.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/client/**"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionHelper.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/SOAP12ExceptionHelper.class"/> - <include name="org/jboss/test/helper/ClientHelper.class"/> - <include name="org/jboss/test/helper/TestServlet.class"/> - </classes> - </war> - - <!-- jaxws-samples-handlerchain --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> - </classes> - </war> - - <!-- jaxws-samples-httpbinding --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/jaxb/META-INF" prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - - <!-- jaxws-samples-jaxbintros --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-jaxbintros.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/jaxbintros/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jaxbintros/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jaxbintros/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jaxbintros/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - - <!-- jaxws-samples-logicalhandler --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> - </classes> - <manifest> - <attribute name="Dependencies" value="com.sun.xml.bind export services"/> - </manifest> - </war> - - <!-- jaxws-samples-oneway --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-provider --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/WEB-INF"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/provider/jaxb/META-INF" - prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/message/WEB-INF"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/provider/payload/WEB-INF"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - - <!-- jaxws-samples-retail --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/advanced/retail/META-INF"> - <include name="wsdl/*"/> - <include name="permissions.xml"/> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> - - <!-- jaxws-samples-securityDomain --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.class"/> - </fileset> - </jar> - - <!-- jaxws-samples-securityDomain-permitall --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-securityDomain-permitall.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllSecureEndpoint*Impl.class"/> - </fileset> - </jar> - <!-- jaxws-samples-serviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -384,61 +106,6 @@ </metainf> </jar> - <!-- jaxws-samples-soapbinding --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - </classes> - </war> - - <!-- jaxws-samples-swaref --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-swaref.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/swaref/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/swaref/DocumentPayload*.class"/> - </fileset> - </jar> - - <!-- jaxws-samples-webmethod --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/EndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-webparam --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> - </classes> - </war> - - <!-- jaxws-samples-webresult --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> - </classes> - </war> - <!-- jaxws-samples-webservice --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/webservice/WEB-INF01/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -560,16 +227,6 @@ </webinf> </war> - <!-- jaxws-samples-xop-doclit --> - <war jarfile="${tests.output.dir}/test-libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> - <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> - </classes> - </war> - <!-- management-recording-as7.jar --> <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.addressing; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -31,6 +34,8 @@ import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -45,9 +50,24 @@ private static AddressingPort port1; private static AddressingPort port2; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsaddressing.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.addressing.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.addressing.StatefulEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.addressing.StatefulEndpointImpl.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/addressing/jaxws-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/addressing/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(AddressingStatefulTestCase.class, "jaxws-samples-wsaddressing.war", new CleanupOperation() { + return new JBossWSTestSetup(AddressingStatefulTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { port1 = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,14 +21,20 @@ */ package org.jboss.test.ws.jaxws.samples.advanced.retail; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -37,22 +43,49 @@ */ public class RetailSampleTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-retail.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.Customer.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.Order.OrderState.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.Order.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderAdmin.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderItem.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderLineRequest.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderLineResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderMgmt.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderMgmtBean.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.OrderStatus.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.RetailSampleTestCase.class) + .addPackage("org.jboss.test.ws.jaxws.samples.advanced.retail.cc") + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.handler.SOAPMessageTrace.class) + .addClass(org.jboss.test.ws.jaxws.samples.advanced.retail.handler.Timer.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml") + .addPackage("org.jboss.test.ws.jaxws.samples.advanced.retail.profile") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/advanced/retail/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl"), "wsdl/CCVerificationService.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl"), "wsdl/OrderMgmtService.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl"), "wsdl/ProfileMgmtService.wsdl"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } - private OrderMgmt orderMgmtWS; - public static Test suite() { - return new JBossWSTestSetup(RetailSampleTestCase.class, "jaxws-samples-retail.jar"); + return new JBossWSTestSetup(RetailSampleTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } - protected void setUp() throws Exception + protected OrderMgmt getPort() throws Exception { QName serviceName = new QName("http://retail.advanced.samples.jaxws.ws.test.jboss.org/";, "OrderMgmtService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS+"?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean?wsdl"); Service service = Service.create(wsdlURL, serviceName); - orderMgmtWS = (OrderMgmt)service.getPort(OrderMgmt.class); + return (OrderMgmt)service.getPort(OrderMgmt.class); } public void testWebService() throws Exception @@ -66,7 +99,7 @@ order.setOrderNum(12345); order.getItems().add( new OrderItem("Introduction to Web Services", 39.99) ); - OrderStatus result = orderMgmtWS.prepareOrder(order); + OrderStatus result = getPort().prepareOrder(order); assertNotNull("Result was null", result); assertEquals("Prepared", result.getStatus()); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -59,7 +59,7 @@ public static Test suite() { - return new JBossWSTestSetup(AsynchronousDispatchTestCase.class, "jaxws-samples-asynchronous.war"); + return new JBossWSTestSetup(AsynchronousDispatchTestCase.class, DeploymentArchive.NAME); } public void testInvokeAsynch() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -50,7 +50,7 @@ public static Test suite() { - return new JBossWSTestSetup(AsynchronousProxyTestCase.class, "jaxws-samples-asynchronous.war"); + return new JBossWSTestSetup(AsynchronousProxyTestCase.class, DeploymentArchive.NAME); } public void testInvokeSync() throws Exception Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.asynchronous; + +import java.io.File; + +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchive +{ + public static final String NAME = getName(); + + private static String getName() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-asynchronous.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.asynchronous.EndpointBean.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/asynchronous/WEB-INF/web.xml")); + } + }); + } + + private DeploymentArchive() { + //NO OP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/asynchronous/DeploymentArchive.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.context; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -29,8 +32,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -43,9 +49,22 @@ { private static Endpoint port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-context.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.samples.context.EndpointEJB.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/context/META-INF/jboss.xml"), "jboss.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", true, new CleanupOperation() { + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true, new CleanupOperation() { @Override public void cleanUp() { port = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.context; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -29,8 +32,11 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -43,9 +49,24 @@ { private static Endpoint port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-context-jse.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.samples.context.EndpointJSE.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/context/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/context/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/context/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context-jse.war", true, new CleanupOperation() { + return new JBossWSTestSetup(WebServiceContextJSETestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true, new CleanupOperation() { @Override public void cleanUp() { port = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.eardeployment; +import java.io.File; import java.net.URL; import javax.wsdl.Definition; @@ -32,7 +33,9 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -45,9 +48,48 @@ */ public class EarTestCase extends JBossWSTest { + public static final class EarTestCaseDeploymentArchive { + public static final String NAME = getName(); + + private static String getName() { + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-eardeployment-ejb3.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging\n")) + .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.EJB3Bean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd"); + } + }); + JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-eardeployment-pojo.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.logging,org.jboss.ws.common\n")) + .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean.class) + .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/web.xml")); + } + }); + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-eardeployment.ear") { { + archive + .addManifest() + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-ejb3.jar")) + .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-pojo.war")); + } + }); + } + + private EarTestCaseDeploymentArchive() { + //NO OP + } + } + public static Test suite() { - return new JBossWSTestSetup(EarTestCase.class, "jaxws-samples-eardeployment.ear"); + return new JBossWSTestSetup(EarTestCase.class, EarTestCaseDeploymentArchive.NAME); } public void testEJB3Endpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -31,6 +31,7 @@ import junit.framework.Test; +import org.jboss.test.ws.jaxws.samples.eardeployment.EarTestCase.EarTestCaseDeploymentArchive; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -49,7 +50,7 @@ public static Test suite() { testStart = System.currentTimeMillis(); - return new JBossWSTestSetup(WSDLPublishTestCase.class, "jaxws-samples-eardeployment.ear"); + return new JBossWSTestSetup(WSDLPublishTestCase.class, EarTestCaseDeploymentArchive.NAME); } public void testEJB3Endpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,14 @@ */ package org.jboss.test.ws.jaxws.samples.exception; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + import junit.framework.Test; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -33,9 +39,35 @@ */ public class ExceptionEJB3TestCase extends ExceptionTestCase { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-exception.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12ExceptionEndpointEJB3Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.UserException.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml") + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ExceptionEJB3TestCase.class, "jaxws-samples-exception.jar"); + return new JBossWSTestSetup(ExceptionEJB3TestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } protected ExceptionHelper getHelper() Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,19 +21,61 @@ */ package org.jboss.test.ws.jaxws.samples.exception; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; public class ExceptionServletTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.helper.ClientHelper.class) + .addClass(org.jboss.test.helper.TestServlet.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.ExceptionHelper.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.SOAP12ExceptionHelper.class) + .addPackage("org.jboss.test.ws.jaxws.samples.exception.client"); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-jse.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.UserException.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml") + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ExceptionServletTestCase.class, "jaxws-samples-exception-jse.war, jaxws-samples-exception-client.war"); + return new JBossWSTestSetup(ExceptionServletTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testRuntimeException() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,11 +22,16 @@ package org.jboss.test.ws.jaxws.samples.exception; import java.io.ByteArrayOutputStream; +import java.io.File; import java.io.PrintStream; +import java.util.LinkedList; +import java.util.List; import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -36,9 +41,36 @@ */ public class ExceptionTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-exception-jse-plain.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.SOAP12ExceptionEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.ServerHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.UserException.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/exception/server/jaxws-handlers-server.xml") + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowApplicationExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowRuntimeExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultException.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.ThrowSoapFaultExceptionResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.exception.server.jaxws.UserExceptionBean.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/META-INF/permissions.xml"), "permissions.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ExceptionTestCase.class, "jaxws-samples-exception-jse.war"); + return new JBossWSTestSetup(ExceptionTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testRuntimeException() throws Exception @@ -123,11 +155,11 @@ protected ExceptionHelper getHelper() { - return new ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse/ExceptionEndpointService"); + return new ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse-plain/ExceptionEndpointService"); } protected SOAP12ExceptionHelper getSOAP12Helper() { - return new SOAP12ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse/SOAP12ExceptionEndpointService"); + return new SOAP12ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse-plain/SOAP12ExceptionEndpointService"); } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.handlerchain; +import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -33,6 +35,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -46,9 +50,28 @@ { private static final String targetNS = "http://handlerchain.samples.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-handlerchain.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.AuthorizationHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.ClientMimeHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.EndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.LogHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.RoutingHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.handlerchain.ServerMimeHandler.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/handlerchain/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HandlerChainTestCase.class, "jaxws-samples-handlerchain.war"); + return new JBossWSTestSetup(HandlerChainTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testDynamicHandlerChain() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.httpbinding; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -34,9 +37,11 @@ import junit.framework.Test; +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.ws.common.DOMUtils; import org.w3c.dom.Element; /** @@ -47,9 +52,25 @@ */ public class HttpJAXBTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-httpbinding-jaxb.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.httpbinding.ProviderBeanJAXB.class) + .addClass(org.jboss.test.ws.jaxws.samples.httpbinding.UserType.class) + .addClass(org.jboss.test.ws.jaxws.samples.httpbinding.WebServiceEndpoint.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/httpbinding/jaxb/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl"), "wsdl/HttpBinding.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HttpJAXBTestCase.class, "jaxws-samples-httpbinding-jaxb.war"); + return new JBossWSTestSetup(HttpJAXBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.httpbinding; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; @@ -35,9 +38,11 @@ import junit.framework.Test; +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.ws.common.DOMUtils; import org.w3c.dom.Element; /** @@ -50,9 +55,24 @@ { private String reqString = "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/httpbinding'>Hello</ns1:somePayload>"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-httpbinding-payload.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.httpbinding.LogicalSourceHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.httpbinding.ProviderBeanPayload.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/httpbinding/shared/wsdl/HttpBinding.wsdl"), "wsdl/HttpBinding.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/httpbinding/payload/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(HttpPayloadTestCase.class, "jaxws-samples-httpbinding-payload.war"); + return new JBossWSTestSetup(HttpPayloadTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.jaxbintros; +import java.io.File; import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -31,6 +34,8 @@ import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -44,12 +49,25 @@ */ public class JAXBIntroTestCase extends JBossWSTest { - private final String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-samples-jaxbintros/EndpointService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-jaxbintros.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.jaxbintros.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.jaxbintros.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.samples.jaxbintros.UserType.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/jaxbintros/META-INF/jaxb-intros.xml"), "jaxb-intros.xml"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-samples-jaxbintros.jar"); + return new JBossWSTestSetup(JAXBIntroTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.logicalhandler; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -29,7 +32,10 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -41,9 +47,30 @@ */ public class LogicalHandlerJAXBTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-logicalhandler-jaxb.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: com.sun.xml.bind export services\n")) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.Echo.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.EchoResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.ObjectFactory.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.SOAPEndpointJAXB.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.SOAPEndpointJAXBImpl.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(LogicalHandlerJAXBTestCase.class, "jaxws-samples-logicalhandler-jaxb.war"); + return new JBossWSTestSetup(LogicalHandlerJAXBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testClientAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.logicalhandler; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -29,6 +32,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -39,9 +44,28 @@ */ public class LogicalHandlerSourceTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-logicalhandler-source.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.Echo.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.EchoResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.PortHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.SOAPEndpointSourceDocImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.logicalhandler.SOAPEndpointSourceRpcImpl.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/logicalhandler/WEB-INF/web-source.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(LogicalHandlerSourceTestCase.class, "jaxws-samples-logicalhandler-source.war"); + return new JBossWSTestSetup(LogicalHandlerSourceTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testSourceDoc() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.oneway; +import java.io.File; import java.io.StringReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.transform.Source; @@ -36,6 +39,8 @@ import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.DOMWriter; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -49,9 +54,21 @@ { private static final String targetNS = "http://oneway.samples.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-oneway.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.oneway.PingEndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/oneway/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-samples-oneway.war"); + return new JBossWSTestSetup(OneWayTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWebService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.provider; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -36,6 +39,8 @@ import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; @@ -48,9 +53,24 @@ */ public class ProviderJAXBTestCase extends JBossWSTest { + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-provider-jaxb.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.provider.ProviderBeanJAXB.class) + .addClass(org.jboss.test.ws.jaxws.samples.provider.UserType.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/jaxb/META-INF/permissions.xml"), "permissions.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl"), "wsdl/Provider.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/jaxb/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ProviderJAXBTestCase.class, "jaxws-samples-provider-jaxb.war"); + return new JBossWSTestSetup(ProviderJAXBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,9 +22,12 @@ package org.jboss.test.ws.jaxws.samples.provider; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; @@ -44,9 +47,11 @@ import junit.framework.Test; +import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.ws.common.DOMUtils; import org.w3c.dom.Element; /** @@ -74,9 +79,22 @@ " </soap:Body>" + "</soap:Envelope>"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-provider-message.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.provider.ProviderBeanMessage.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl"), "wsdl/Provider.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/message/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(ProviderMessageTestCase.class, "jaxws-samples-provider-message.war"); + return new JBossWSTestSetup(ProviderMessageTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,9 +22,12 @@ package org.jboss.test.ws.jaxws.samples.provider; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; @@ -46,6 +49,8 @@ import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -61,12 +66,24 @@ private final String reqString = "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello</ns1:somePayload>"; -// private String resString = -// "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:Inbound:LogicalSourceHandler:Outbound:LogicalSourceHandler</ns1:somePayload>"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-provider-payload.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.provider.LogicalSourceHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.provider.ProviderBeanPayload.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl"), "wsdl/Provider.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/provider/payload/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSTestSetup(ProviderPayloadTestCase.class, "jaxws-samples-provider-payload.war"); + return new JBossWSTestSetup(ProviderPayloadTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testWSDLAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -23,6 +23,8 @@ import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -32,6 +34,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -54,9 +58,21 @@ public final String TARGET_ENDPOINT_ADDRESS_1 = "http://" + getServerHost() + ":8080/jaxws-securityDomain-permitall/one"; public final String TARGET_ENDPOINT_ADDRESS_2 = "http://" + getServerHost() + ":8080/jaxws-securityDomain-permitall/two"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-securityDomain-permitall.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.securityDomain.PermitAllSecureEndpoint1Impl.class) + .addClass(org.jboss.test.ws.jaxws.samples.securityDomain.PermitAllSecureEndpoint2Impl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - JBossWSTestSetup testSetup = new JBossWSTestSetup(PermitAllTestCase.class, "jaxws-samples-securityDomain-permitall.jar"); + JBossWSTestSetup testSetup = new JBossWSTestSetup(PermitAllTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/samples/securityDomain/jbossws-users.properties").getAbsolutePath()); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -23,6 +23,8 @@ import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -32,6 +34,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -51,11 +55,20 @@ */ public class SecurityDomainTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-securityDomain/authz"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-securityDomain.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.securityDomain.SecureEndpointImpl.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - JBossWSTestSetup testSetup = new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar"); + JBossWSTestSetup testSetup = new JBossWSTestSetup(SecurityDomainTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/samples/securityDomain/jbossws-users.properties").getAbsolutePath()); @@ -67,7 +80,7 @@ private SecureEndpoint getAuthzPort() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-securityDomain/authz?wsdl"); QName serviceName = new QName("http://org.jboss.ws/securityDomain", "SecureEndpointService"); return Service.create(wsdlURL, serviceName).getPort(SecureEndpoint.class); } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.samples.soapbinding; import java.io.ByteArrayInputStream; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; @@ -38,6 +41,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -51,9 +56,32 @@ { private final String targetNS = "http://soapbinding.samples.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-soapbinding.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBare.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocBareServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.DocWrappedServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleSEI.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.ExampleServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareRequest.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.SubmitBareResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPO.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitNamespacedPOResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPO.class) + .addClass(org.jboss.test.ws.jaxws.samples.soapbinding.jaxws.SubmitPOResponse.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/soapbinding/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(SOAPBindingTestCase.class, "jaxws-samples-soapbinding.war"); + return new JBossWSTestSetup(SOAPBindingTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testExampleService() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,17 +21,22 @@ */ package org.jboss.test.ws.jaxws.samples.swaref; +import java.net.URL; +import java.util.LinkedList; +import java.util.List; + +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import junit.framework.Test; import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; -import javax.xml.ws.Service; -import javax.xml.namespace.QName; -import javax.activation.DataHandler; -import java.net.URL; - /** * Test SwARef with different binding styles and @XmlAttachmentRef locations. * @@ -49,9 +54,32 @@ private static DataHandler data; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-swaref.jar") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.swaref.BareEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.BareEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.DocumentPayload.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.DocumentPayloadWithList.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.DocumentPayloadWithoutRef.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.RpcLitEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.RpcLitEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.WrappedEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.WrappedEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.jaxws.BeanAnnotation.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.jaxws.BeanAnnotationResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.jaxws.ParameterAnnotation.class) + .addClass(org.jboss.test.ws.jaxws.samples.swaref.jaxws.ParameterAnnotationResponse.class); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar", new CleanupOperation() { + return new JBossWSTestSetup(SWARefTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { data = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,8 +22,11 @@ package org.jboss.test.ws.jaxws.samples.webmethod; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.StringReader; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; @@ -42,6 +45,8 @@ import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -55,9 +60,22 @@ private final String endpointURL = "http://" + getServerHost() + ":8080/jaxws-samples-webmethod/TestService"; private final String targetNS = "http://webmethod.samples.jaxws.ws.test.jboss.org/"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-webmethod.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webmethod.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webmethod.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webmethod/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebMethodTestCase.class, "jaxws-samples-webmethod.war"); + return new JBossWSTestSetup(WebMethodTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void testLegalAccess() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.webparam; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Holder; @@ -31,6 +34,8 @@ import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -45,9 +50,23 @@ private static PingService port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-webparam.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingDocument.class) + .addClass(org.jboss.test.ws.jaxws.samples.webparam.PingServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.webparam.SecurityHeader.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webparam/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebParamTestCase.class, "jaxws-samples-webparam.war", new CleanupOperation() { + return new JBossWSTestSetup(WebParamTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { port = null; Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -22,7 +22,10 @@ package org.jboss.test.ws.jaxws.samples.webresult; import java.io.ByteArrayInputStream; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; @@ -36,6 +39,8 @@ import org.jboss.wsf.test.CleanupOperation; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** @@ -50,9 +55,23 @@ private static CustomerService port; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-webresult.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webresult.CustomerRecord.class) + .addClass(org.jboss.test.ws.jaxws.samples.webresult.CustomerServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.webresult.USAddress.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webresult/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSTestSetup(WebResultTestCase.class, "jaxws-samples-webresult.war", new CleanupOperation() { + return new JBossWSTestSetup(WebResultTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), new CleanupOperation() { @Override public void cleanUp() { port = null; Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.xop.doclit; + +import java.io.File; + +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchive +{ + public static final String NAME = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-xop-doclit.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHRequest.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.DHResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.FakeInputStream.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.GeneratorDataSource.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageRequest.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.ImageResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMCheckClientHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMProtocolHandler.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceRequest.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.SourceResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.WrappedEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.XOPBase.class) + .addAsResource("org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml") + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotation.class) + .addClass(org.jboss.test.ws.jaxws.samples.xop.doclit.jaxws.ParameterAnnotationResponse.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/xop/doclit/WEB-INF/web.xml")); + } + }); + + private DeploymentArchive() { + //NOOP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DeploymentArchive.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -50,17 +50,13 @@ */ public class MTOMFeatureTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare"; - - protected MTOMEndpoint port; - public static Test suite() { - return new JBossWSTestSetup(MTOMFeatureTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(MTOMFeatureTestCase.class, DeploymentArchive.NAME); } private MTOMEndpoint getPort(boolean mtomEnabled) throws Exception { QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/";, "MTOMService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/bare?wsdl"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(MTOMEndpoint.class, new MTOMFeature(mtomEnabled)); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSTestSetup(XOPBareTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPBareTestCase.class, DeploymentArchive.NAME); } protected void setUp() throws Exception Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -56,7 +56,7 @@ public static Test suite() { - return new JBossWSTestSetup(XOPHandlerTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPHandlerTestCase.class, DeploymentArchive.NAME); } @Override Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2014-06-20 13:36:01 UTC (rev 18753) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2014-06-20 17:34:46 UTC (rev 18754) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSTestSetup(XOPWrappedTestCase.class, "jaxws-samples-xop-doclit.war"); + return new JBossWSTestSetup(XOPWrappedTestCase.class, DeploymentArchive.NAME); } protected void setUp() throws Exception