April 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17495 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-16 12:09:00 -0400 (Tue, 16 Apr 2013) New Revision: 17495 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java Log: Fixing comment Modified: 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 2013-04-15 23:23:31 UTC (rev 17494) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/DisabledWSSubsystemTestCase.java 2013-04-16 16:09:00 UTC (rev 17495) @@ -38,7 +38,7 @@ * 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 + * 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.) *

11 years, 11 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

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 @@  <test.spring.version>3.0.3.RELEASE</test.spring.version> +  + <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> +  + <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> + +  + <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> +  <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> + <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

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17493 - projects/wsi-bp-test/trunk.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-04-12 01:17:59 -0400 (Fri, 12 Apr 2013) New Revision: 17493 Modified: projects/wsi-bp-test/trunk/pom.xml Log: Add as800 profile and update the component version Modified: projects/wsi-bp-test/trunk/pom.xml =================================================================== --- projects/wsi-bp-test/trunk/pom.xml 2013-04-12 04:46:32 UTC (rev 17492) +++ projects/wsi-bp-test/trunk/pom.xml 2013-04-12 05:17:59 UTC (rev 17493) @@ -26,27 +26,30 @@ <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> - <jbossws.cxf.version>4.1.3.Final</jbossws.cxf.version> - <jbossws.shared.testsuite.version>4.1.1.Final</jbossws.shared.testsuite.version> + <jbossws.cxf.version>4.2.0-SNAPSHOT</jbossws.cxf.version> + <jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version> <gnu.getopt.version>1.0.13</gnu.getopt.version> <log4j.version>1.2.14</log4j.version> - <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> <jboss713.version>7.1.3.Final</jboss713.version> - <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> + <jboss720.version>7.2.0.Final</jboss720.version> + <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> <spring.version>3.0.7.RELEASE</spring.version> + <picketlink.version>2.1.4.Final</picketlink.version> + <org.slf4j.version>1.6.1</org.slf4j.version> </properties>  <modules> <module>bp12-tests</module> + <module>bsp12-tests</module> </modules>  @@ -102,6 +105,22 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + + + <dependency> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-core</artifactId> + <version>${picketlink.version}</version> + <scope>test</scope> + </dependency> + + + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version> @@ -460,19 +479,19 @@ </profile>  <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jboss.version>${jboss711.version}</jboss.version> - <jbossws.integration.target>jboss711</jbossws.integration.target> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -489,6 +508,12 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -496,19 +521,19 @@ </profile>  <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss713.version}</jboss.version> + <jbossws.integration.target>jboss713</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -525,6 +550,12 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> @@ -532,50 +563,46 @@ </profile>  <profile> - <id>jboss713</id> + <id>jboss720</id> <properties> - <jboss.version>${jboss713.version}</jboss.version> - <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.version>${jboss720.version}</jboss.version> + <jbossws.integration.target>jboss720</jbossws.integration.target> </properties> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss713-tests-integration</artifactId> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-webservices-tests-integration</artifactId> + <version>${jboss.version}</version> </dependency> </dependencies> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins> </build> </profile> -  + <profile> - <id>jboss720</id> + <id>jboss800</id> <properties> - <jboss.version>${jboss720.version}</jboss.version> - <jbossws.integration.target>jboss720</jbossws.integration.target> + <jboss.version>${jboss800.version}</jboss.version> + <jbossws.integration.target>jboss800</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -587,11 +614,16 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <configuration> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> + <excludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/*TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/*TestCase*</exclude> + </excludes> </configuration> </plugin> </plugins>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17491 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-11 05:10:57 -0400 (Thu, 11 Apr 2013) New Revision: 17491 Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/as/webservices/server/jaxrpc-integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss800/org/jboss/ws/native/ Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-6608] Changes related to JAX-RPC support removal on AS 8 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-11 08:43:20 UTC (rev 17490) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-04-11 09:10:57 UTC (rev 17491) @@ -45,7 +45,7 @@ <include name="cxf*security.jar"/> </fileset> </jandex> - <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> + <antcall target="deploy-jbossws-cxf-modules-as7" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> @@ -137,7 +137,7 @@ <include name="cxf*security.jar"/> </fileset> </jandex> - <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> + <antcall target="deploy-jbossws-cxf-modules-as7" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> @@ -200,7 +200,7 @@ <include name="cxf*security.jar"/> </fileset> </jandex> - <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> + <antcall target="deploy-jbossws-cxf-modules-as8" inheritall="false"> <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> @@ -208,7 +208,8 @@ </antcall> <copy toDir="${deploy.structure}/modules/system/layers/base"> <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> - <include name="**/jboss/as/webservices/**/module.xml"/> + <include name="**/jboss/as/webservices/main/module.xml"/> + <include name="**/jboss/as/webservices/server/integration/main/module.xml"/> </fileset> </copy> </target> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-04-11 08:43:20 UTC (rev 17490) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-04-11 09:10:57 UTC (rev 17491) @@ -28,7 +28,7 @@   - <macrodef name="macro-deploy-jbossws-modules"> + <macrodef name="macro-deploy-jbossws-modules-as8"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -60,6 +60,113 @@ <include name="**/jbossws-cxf-transports-httpserver.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/cxf-api*.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/cxf-*.jar"/> + <exclude name="**/cxf-api*.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-api.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-common.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/tools/common/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-common-tools.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/neethi.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/xmlsec.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/wss4j.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/xmlschema-core.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/opensaml/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/opensaml.jar"/> + <include name="**/openws.jar"/> + <include name="**/xmltooling.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}-server-integration.jar"/> + </fileset> + </copy> +  + <installModules targetDir="@{targetdir}"> + <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> + <include name="**/module.xml"/> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + <exclude name="**/spring/**/module.xml"/> + </fileset> + </installModules> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-modules-as7"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <attribute name="modules-jbossid"/> + <sequential> +  + <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-client.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jaxws-jboss-httpserver-httpspi.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-server.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-factories.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-transports-httpserver.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-native-core.jar"/> @@ -156,12 +263,18 @@ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-cxf-modules"> + <target name="deploy-jbossws-cxf-modules-as7"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> + <macro-deploy-jbossws-modules-as7 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target> + <target name="deploy-jbossws-cxf-modules-as8"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + <macro-deploy-jbossws-modules-as8 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> + </target> +    Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2013-04-11 09:10:57 UTC (rev 17491) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0"> + + <deploymentAspect class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides" class="java.lang.String">ContextProperties</property> + <property name="contextProperties" class="java.util.HashMap"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>stack.transport.class</key> + <value>org.jboss.wsf.stack.cxf.CXFServletExt</value> + </entry> + </map> + </property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> + <property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property> + <property name="provides" class="java.lang.String">StackDescriptor</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> + <property name="provides" class="java.lang.String">ResourceResolver</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires" class="java.lang.String">ContainerMetaData</property> + <property name="provides" class="java.lang.String">StackEndpointHandler</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect"> + <property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property> + <property name="provides" class="java.lang.String">StackInstanceProvider</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> + <property name="provides" class="java.lang.String">JAXBIntros</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + + <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> + <property name="provides" class="java.lang.String">BusHolder</property> + <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> + <property name="forJaxRpc" class="boolean">false</property> + </deploymentAspect> + +</deploymentAspects> + Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-04-11 08:43:20 UTC (rev 17490) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2013-04-11 09:10:57 UTC (rev 17491) @@ -57,13 +57,9 @@ /> <copy - file="${src.dir}/jbossws-cxf-config-as7.xml" + file="${src.dir}/jbossws-cxf-config-as8.xml" tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> - <copy - file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" - /> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-11 08:43:20 UTC (rev 17490) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-11 09:10:57 UTC (rev 17491) @@ -819,6 +819,9 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> +  + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> +  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17490 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-11 04:43:20 -0400 (Thu, 11 Apr 2013) New Revision: 17490 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java Log: [JBWS-3623] Adding workaround... Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2013-04-11 07:58:13 UTC (rev 17489) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2013-04-11 08:43:20 UTC (rev 17490) @@ -26,6 +26,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URL; +import java.util.Currency; +import java.util.Locale; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -53,6 +55,9 @@ private static int port1 = 8871; private static int port2 = 8872; + + @SuppressWarnings("unused") + private static Currency currency = Currency.getInstance(Locale.US); //workaround for JBWS-3623 public void testDifferentPortsSameContext() throws Exception {

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17489 - projects/wsi-bp-test/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-04-11 03:58:13 -0400 (Thu, 11 Apr 2013) New Revision: 17489 Added: projects/wsi-bp-test/branches/wsi-bp-test-4.1.3.Final/ Log: Create the branch works for AS7.2.0.Final

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17488 - projects/wsi-bp-test.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-04-11 03:57:43 -0400 (Thu, 11 Apr 2013) New Revision: 17488 Added: projects/wsi-bp-test/branches/ Log: Create branches

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17487 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-10 09:19:20 -0400 (Wed, 10 Apr 2013) New Revision: 17487 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: Removing unrequired module dependency Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-04-09 14:46:42 UTC (rev 17486) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-04-10 13:19:20 UTC (rev 17487) @@ -781,9 +781,6 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> <include name="jaxws-endpoint-config.xml" /> </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> </war>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17486 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-09 10:46:42 -0400 (Tue, 09 Apr 2013) New Revision: 17486 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3622] Excluding tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-09 14:46:42 UTC (rev 17486) @@ -126,6 +126,10 @@ */ public void test2121() throws Exception { + if (true) { + System.out.println("FIXME: [JBWS-3622] Restore HTTPS tests w/ Undertow"); + return; + } Service service = Service.create(new URL(serviceURLHttps + "SecurityService2121?wsdl"), serviceName); ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService2121Port"), ServiceIface.class); setupWsse(proxy); Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-09 14:22:28 UTC (rev 17485) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-09 14:46:42 UTC (rev 17486) @@ -839,6 +839,11 @@ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r17485 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-04-09 10:22:28 -0400 (Tue, 09 Apr 2013) New Revision: 17485 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java Log: [JBWS-3622] Initial changes on ssl option names specified to create https listener on AS8 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -56,10 +56,20 @@ */ JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + else + { + sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("keystore-password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("alias", "tomcat"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -56,10 +56,20 @@ */ JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameOverTransportTestCase.class, "jaxws-samples-wsse-policy-username.war"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + else + { + sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("keystore-password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("alias", "tomcat"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -62,10 +62,20 @@ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples21xTestCase.class, "jaxws-samples-wsse-policy-oasis-21x.war,jaxws-samples-wsse-policy-oasis-client.jar"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "false"); - sslOptions.put("key-alias", "tomcat"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("key-alias", "tomcat"); + } + else + { + sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("keystore-password", "changeit"); + sslOptions.put("verify-client", "false"); + sslOptions.put("alias", "tomcat"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-09 06:19:32 UTC (rev 17484) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2013-04-09 14:22:28 UTC (rev 17485) @@ -65,12 +65,24 @@ JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples23xTestCase.class, "jaxws-samples-wsse-policy-oasis-23x.war,jaxws-samples-wsse-policy-oasis-client.jar"); Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("password", "changeit"); - sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) - sslOptions.put("key-alias", "tomcat"); - sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); - sslOptions.put("ca-certificate-password", "changeit"); + if (isTargetJBoss7()) + { + sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("password", "changeit"); + sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("key-alias", "tomcat"); + sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); + sslOptions.put("ca-certificate-password", "changeit"); + } + else + { + sslOptions.put("keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); + sslOptions.put("keystore-password", "changeit"); + sslOptions.put("verify-client", "true"); //enable SSL mutual authentication (https client cert is checked on server side) + sslOptions.put("alias", "tomcat"); + sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore")); + sslOptions.put("ca-certificate-password", "changeit"); + } setup.setHttpsConnectorRequirement(sslOptions); return setup; }

11 years, 11 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2013