[jbossws-commits] JBossWS SVN: r17494 - in stack/cxf/trunk/modules/testsuite/cxf-tests: scripts and 8 other directories.

Author: alessio.soldano(a)jboss.com Date: 2013-04-15 19:23:31 -0400 (Mon, 15 Apr 2013) New Revision: 17494 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/Echo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: Adding some tests on using Apache CXF on AS the same as on a servlet only container (webservices subsystem disabled using jboss-deployment-structure.xml) Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-04-12 05:17:59 UTC (rev 17493) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -18,6 +18,9 @@ <!-- This is used for test archives embedding Spring and is intentionally different from the version specified in the jbossws-cxf main pom.xml to test there're no classloading clashes --> <test.spring.version>3.0.3.RELEASE</test.spring.version> + <!-- This is used for test archives embedding CXF and is intentionally different from the + version specified in the jbossws-cxf main pom.xml to test there're no classloading clashes --> + <test.cxf.version>2.6.6</test.cxf.version> </properties> <dependencies> @@ -134,10 +137,72 @@ <artifactId>spring-expression</artifactId> <version>${test.spring.version}</version> </artifactItem> + <artifactItem> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${test.spring.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${test.spring.version}</version> + </artifactItem> </artifactItems> <outputDirectory>target/spring</outputDirectory> </configuration> </execution> + <execution> + <id>copy-cxf</id> + <phase>process-test-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-simple</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-api</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-core</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-jaxb</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${test.cxf.version}</version> + </artifactItem> + </artifactItems> + <outputDirectory>target/cxf-embedded</outputDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-12 05:17:59 UTC (rev 17493) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -125,6 +125,36 @@ </manifest> </war> + <!-- jaxws-cxf-disabledWSSubsystem --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-disabledWSSubsystem.war" + webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF"> + <include name="jboss-deployment-structure.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-embedded --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-embedded.war" + webxml="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/noIntegration/embedded/WEB-INF"> + <include name="jboss-deployment-structure.xml"/> + <include name="beans.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/spring/" + prefix="WEB-INF/lib/"/> + <zipfileset + dir="${tests.output.dir}/cxf-embedded/" + prefix="WEB-INF/lib/"/> + </war> + <!-- jaxws-cxf-endorse --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/CXFEndpointServlet.java 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.noIntegration; + +import javax.servlet.ServletConfig; +import javax.xml.ws.Endpoint; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.transport.servlet.CXFNonSpringServlet; + +public class CXFEndpointServlet extends CXFNonSpringServlet +{ + + @Override + public void loadBus(ServletConfig servletConfig) + { + super.loadBus(servletConfig); + + // You could add the endpoint publish codes here + Bus bus = getBus(); + BusFactory.setThreadDefaultBus(bus); + Endpoint.publish("/Echo1", new EchoImpl()); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.noIntegration; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Verifies a plain Apache CXF ws endpoint war can be deployed on + * AS similarly as on a Tomcat instance (the Apache CXF libs from + * the AS modules are used instead of embedding them in the war). + * This is is NOT the suggest approach as any Java EE support is + * actually disabled / skipped (including any JBossWS-CXF + * integration additions, JSR-109, etc.) + * + * Testcase provided here for the sake of verifying usage of AS as + * a plain servlet container only, which is sometimes an easy + * migration path for Apache CXF WS endpoints previously deployed + * on Tomcat. + * + * @author alessio.soldano(a)jboss.com + * @since 15-Apr-2013 + */ +public class DisabledWSSubsystemTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(DisabledWSSubsystemTestCase.class, "jaxws-cxf-disabledWSSubsystem.war"); + } + + public void testEndpointInvocation() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-disabledWSSubsystem/services/Echo1?wsdl"); + Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoService")); + Echo echo = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoEndpointPort"), Echo.class); + assertEquals("Foo", echo.echo("Foo")); + } + + public void testServicesPage() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-disabledWSSubsystem/services"); + InputStream is = url.openStream(); + assertNotNull(is); + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + try { + StringBuilder sb = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + sb.append(line); + } + assertTrue(sb.toString().contains("Available SOAP services:")); + } finally { + reader.close(); + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/Echo.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/Echo.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/Echo.java 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.noIntegration; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EchoEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/noIntegration", serviceName = "EchoService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Echo +{ + String echo(String input); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EchoImpl.java 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.noIntegration; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EchoEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/noIntegration", serviceName = "EchoService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EchoImpl +{ + @WebMethod + public String echo(String input) + { + System.out.println("echo: " + input); + return input; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/EmbeddedCXFTestCase.java 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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.cxf.noIntegration; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Verifies a plain Apache CXF ws endpoint war can be deployed on + * AS the same as on a Tomcat instance. This is is NOT the suggested + * approach as any Java EE support is actually disabled / skipped + * (including any JBossWS-CXF integration additions, JSR-109, etc.) + * + * Testcase provided here for the sake of verifying usage of AS as + * a plain servlet container only, which is sometimes an easy + * migration path for Apache CXF WS endpoints previously deployed + * on Tomcat. + * + * @author alessio.soldano(a)jboss.com + * @since 15-Apr-2013 + */ +public class EmbeddedCXFTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(EmbeddedCXFTestCase.class, "jaxws-cxf-embedded.war"); + } + + public void testEndpointInvocation() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-embedded/services/Echo1?wsdl"); + Service service = Service.create(wsdlURL, new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoService")); + Echo echo = service.getPort(new QName("http://org.jboss.ws.jaxws.cxf/noIntegration", "EchoEndpointPort"), Echo.class); + assertEquals("Foo", echo.echo("Foo")); + } + + public void testServicesPage() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-embedded/services"); + InputStream is = url.openStream(); + assertNotNull(is); + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + try { + StringBuilder sb = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + sb.append(line); + } + assertTrue(sb.toString().contains("Available SOAP services:")); + } finally { + reader.close(); + } + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/beans.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,18 @@ +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jaxws="http://cxf.apache.org/jaxws" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd"> + + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/> + <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/> + + <jaxws:endpoint id="echo" + implementor="org.jboss.test.ws.jaxws.cxf.noIntegration.EchoImpl" + address="/Echo1"/> + +</beans> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/jboss-deployment-structure.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2"> + <deployment> + <exclude-subsystems> + <subsystem name="webservices" /> + </exclude-subsystems> + <!-- Dependencies below included for the sake of simplifying test only, would actually come within the deployment in this scenario --> + <dependencies> + <module name="javax.wsdl4j.api"/> + <module name="org.apache.ws.xmlschema"/> + <module name="org.apache.neethi"/> + <module name="org.codehaus.woodstox"/> + </dependencies> + </deployment> +</jboss-deployment-structure> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/embedded/WEB-INF/web.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <servlet> + <servlet-name>CXFServlet</servlet-name> + <display-name>CXF Servlet</display-name> + <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class> + <init-param> + <param-name>config-location</param-name> + <param-value>/WEB-INF/beans.xml</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/jboss-deployment-structure.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2"> + <deployment> + <exclude-subsystems> + <subsystem name="webservices" /> + </exclude-subsystems> + <dependencies> + <module name="org.apache.cxf"/> + <module name="org.apache.cxf.impl"/> + <module name="javax.wsdl4j.api"/> + <module name="org.apache.ws.xmlschema"/> + <module name="org.apache.neethi"/> + <module name="org.codehaus.woodstox"/> + </dependencies> + </deployment> +</jboss-deployment-structure> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/noIntegration/moduleImports/WEB-INF/web.xml 2013-04-15 23:23:31 UTC (rev 17494) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <servlet> + <servlet-name>CXFServlet</servlet-name> + <display-name>CXF Servlet</display-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.noIntegration.CXFEndpointServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file