June 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r14538 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2011-06-13 10:55:07 -0400 (Mon, 13 Jun 2011) New Revision: 14538 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-6707/ Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-6706/ Log: renamed to patch JIRA JBPAPP-6707

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14537 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-06-13 10:44:58 -0400 (Mon, 13 Jun 2011) New Revision: 14537 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: updating excludes Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-13 14:30:46 UTC (rev 14536) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-13 14:44:58 UTC (rev 14537) @@ -1024,7 +1024,6 @@ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> @@ -1038,7 +1037,6 @@ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14536 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-06-13 10:30:46 -0400 (Mon, 13 Jun 2011) New Revision: 14536 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3240] fixing tests relying on AS specific data dirs Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-06-13 14:29:48 UTC (rev 14535) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-13 14:30:46 UTC (rev 14536) @@ -833,10 +833,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14535 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples: xop/doclit and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-06-13 10:29:48 -0400 (Mon, 13 Jun 2011) New Revision: 14535 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: [JBWS-3240] fixing tests relying on AS specific data dirs Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java 2011-06-13 10:59:03 UTC (rev 14534) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java 2011-06-13 14:29:48 UTC (rev 14535) @@ -31,6 +31,7 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; @@ -58,8 +59,9 @@ { if (dataDir == null) { + ClassLoader loader = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class, loader).getServerConfig(); dataDir = serverConfig.getServerDataDir(); } return dataDir; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-06-13 10:59:03 UTC (rev 14534) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-06-13 14:29:48 UTC (rev 14535) @@ -153,7 +153,15 @@ assertNotNull(response); assertNotNull(response.getDataHandler().getContent()); - File tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); + File tmpDir = null; + if (isTargetJBoss6()) + { + tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); + } + else + { + tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); + } assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists()); //[JBWS-2834]: windows file delete issue

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14534 - stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-06-13 06:59:03 -0400 (Mon, 13 Jun 2011) New Revision: 14534 Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml Log: [JBWS-3125] Update native Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-13 10:31:35 UTC (rev 14533) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-13 10:59:03 UTC (rev 14534) @@ -31,6 +31,7 @@ <dependencies> <module name="javax.api"/> <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> <module name="javax.ejb.api"/> <module name="javax.jws.api"/> <module name="javax.servlet.api"/>

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14533 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-06-13 06:31:35 -0400 (Mon, 13 Jun 2011) New Revision: 14533 Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl Removed: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3125] Merging changes to trunk Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-13 10:31:35 UTC (rev 14533) @@ -31,6 +31,7 @@ <dependencies> <module name="javax.api"/> <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> <module name="javax.ejb.api"/> <module name="javax.jws.api"/> <module name="javax.servlet.api"/> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -39,6 +39,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.HttpEndpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; @@ -73,16 +74,19 @@ { DDEndpoint ddep = createDDEndpoint(ep.getTargetBeanClass(), (ArchiveDeployment)dep, ep); - if (depType == DeploymentType.JAXWS_EJB3) + if (ep instanceof HttpEndpoint) { - ddep.setInvoker(invokerEJB3); + if (depType == DeploymentType.JAXWS_EJB3) + { + ddep.setInvoker(invokerEJB3); + } + + if (depType == DeploymentType.JAXWS_JSE) + { + ddep.setInvoker(invokerJSE); + } } - if (depType == DeploymentType.JAXWS_JSE) - { - ddep.setInvoker(invokerJSE); - } - processWSDDContribution(ddep, (ArchiveDeployment)dep); log.info("Add " + ddep); Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-06-13 10:31:35 UTC (rev 14533) @@ -142,6 +142,63 @@ </fileset> </jar> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> + <include name="wsdl/**/*" /> + </metainf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorld*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-test-servlet.war" + needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7/wsdl" + prefix="WEB-INF/classes/META-INF/wsdl"/> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> + </manifest> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet.war" + needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/wsdl" + prefix="WEB-INF/classes/META-INF/wsdl"/> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/DeploymentTestServlet.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms; + +import java.io.IOException; +import java.net.URL; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; + +@WebServlet(name = "TestServlet", urlPatterns = "/*") +public class DeploymentTestServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + boolean result; + URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + //start a new bus to avoid affecting the one that could already be assigned to this thread + Bus bus = BusFactory.newInstance().createBus(); + BusFactory.setThreadDefaultBus(bus); + try + { + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + Service service = Service.create(wsdlUrl, serviceName); + + //JMS test + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + result = "Hi".equals(proxy.echo("Hi")); + } + finally + { + bus.shutdown(true); + } + res.getWriter().print(result); + } + catch (Throwable t) + { + t.printStackTrace(); + throw new ServletException(t); + } + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -62,7 +62,7 @@ public void testClientSide() throws Exception { if (!isTargetJBoss6()) { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available on AS7"); + System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; } URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); @@ -73,7 +73,7 @@ QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(HelloWorld.class); + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); assertEquals("Hi", proxy.echo("Hi")); } finally Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms; + +import java.io.BufferedReader; +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; + +/** + * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) endpoint only + * + * @author alessio.soldano(a)jboss.com + * @since 10-Jun-2011 + */ +public class JMSEndpointOnlyDeploymentTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCase.class, "jaxws-cxf-jms-only-deployment-test-servlet.war,jaxws-cxf-jms-only-deployment.jar"); + } + + public void testJMSEndpointServerSide() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-only-deployment-test-servlet"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + assertEquals("true", br.readLine()); + } + + public void testJMSEndpointClientSide() throws Exception + { + if (!isTargetJBoss6()) + { + System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + return; + } + URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + + Service service = Service.create(wsdlUrl, serviceName); + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + assertEquals("Hi", proxy.echo("Hi")); + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -59,7 +59,7 @@ QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(HelloWorld.class); + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); result = "Hi".equals(proxy.echo("Hi")); } finally Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jms_http; - -import java.io.IOException; -import java.net.URL; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; - -@WebServlet(name = "TestServlet", urlPatterns = "/*") -public class DeploymentTestServlet extends HttpServlet -{ - private static final long serialVersionUID = 1L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - try - { - boolean result; - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); - //start a new bus to avoid affecting the one that could already be assigned to this thread - Bus bus = BusFactory.newInstance().createBus(); - BusFactory.setThreadDefaultBus(bus); - try - { - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - Service service = Service.create(wsdlUrl, serviceName); - - //JMS test - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - result = "Hi".equals(proxy.echo("Hi")); - //HTTP test - HelloWorld httpProxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); - result = result && "(http) Hi".equals(httpProxy.echo("Hi")); - } - finally - { - bus.shutdown(true); - } - res.getWriter().print(result); - } - catch (Throwable t) - { - t.printStackTrace(); - throw new ServletException(t); - } - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms_http; + +import java.io.IOException; +import java.net.URL; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; + +@WebServlet(name = "TestServlet", urlPatterns = "/*") +public class DeploymentTestServlet extends HttpServlet +{ + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + boolean result; + URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + //start a new bus to avoid affecting the one that could already be assigned to this thread + Bus bus = BusFactory.newInstance().createBus(); + BusFactory.setThreadDefaultBus(bus); + try + { + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + Service service = Service.create(wsdlUrl, serviceName); + + //JMS test + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + result = "Hi".equals(proxy.echo("Hi")); + //HTTP test + HelloWorld httpProxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); + result = result && "(http) Hi".equals(httpProxy.echo("Hi")); + } + finally + { + bus.shutdown(true); + } + res.getWriter().print(result); + } + catch (Throwable t) + { + t.printStackTrace(); + throw new ServletException(t); + } + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jms_http; - -import javax.jws.WebService; - -@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms") -public interface HelloWorld -{ - String echo(String input); -} Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms_http; + +import javax.jws.WebService; + +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms") +public interface HelloWorld +{ + String echo(String input); +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jms_http; - -import javax.jws.WebService; - -@WebService -( - portName = "HelloWorldImplPort", - serviceName = "HelloWorldService", - wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", - endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", - targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" -) -public class HelloWorldImpl implements HelloWorld -{ - public String echo(String input) - { - System.out.println("input: " + input); - return input; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorldImpl.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms_http; + +import javax.jws.WebService; + +@WebService +( + portName = "HelloWorldImplPort", + serviceName = "HelloWorldService", + wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", + targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" +) +public class HelloWorldImpl implements HelloWorld +{ + public String echo(String input) + { + System.out.println("input: " + input); + return input; + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jms_http; - -import javax.jws.WebService; - -@WebService -( - portName = "HttpHelloWorldImplPort", - serviceName = "HelloWorldService", - wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", - endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", - targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" -) -public class HttpHelloWorldImpl implements HelloWorld -{ - public String echo(String input) - { - System.out.println("input (http): " + input); - return "(http) " + input; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorldImpl.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms_http; + +import javax.jws.WebService; + +@WebService +( + portName = "HttpHelloWorldImplPort", + serviceName = "HelloWorldService", + wsdlLocation = "WEB-INF/wsdl/HelloWorldService.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms_http.HelloWorld", + targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms" +) +public class HttpHelloWorldImpl implements HelloWorld +{ + public String echo(String input) + { + System.out.println("input (http): " + input); + return "(http) " + input; + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jms_http; - -import java.io.BufferedReader; -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; - -/** - * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) and a HTTP endpoints - * - * @author alessio.soldano(a)jboss.com - * @since 10-Jun-2011 - */ -public final class JMSHTTPEndpointDeploymentTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCase.class, "jaxws-cxf-jms-http-deployment-test-servlet.war,jaxws-cxf-jms-http-deployment.war"); - } - - public void testJMSEndpointServerSide() throws Exception - { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - assertEquals("true", br.readLine()); - } - - public void testJMSEndpointClientSide() throws Exception - { - if (!isTargetJBoss6()) - { - System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); - return; - } - URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - - Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); - assertEquals("Hi", proxy.echo("Hi")); - } - - public void testHTTPEndpointClientSide() throws Exception - { - URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); - - Service service = Service.create(wsdlUrl, serviceName); - HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); - assertEquals("(http) Hi", proxy.echo("Hi")); - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jms_http; + +import java.io.BufferedReader; +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; + +/** + * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) and a HTTP endpoints + * + * @author alessio.soldano(a)jboss.com + * @since 10-Jun-2011 + */ +public final class JMSHTTPEndpointDeploymentTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCase.class, "jaxws-cxf-jms-http-deployment-test-servlet.war,jaxws-cxf-jms-http-deployment.war"); + } + + public void testJMSEndpointServerSide() throws Exception + { + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + assertEquals("true", br.readLine()); + } + + public void testJMSEndpointClientSide() throws Exception + { + if (!isTargetJBoss6()) + { + System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); + return; + } + URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + + Service service = Service.create(wsdlUrl, serviceName); + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldImplPort"), HelloWorld.class); + assertEquals("Hi", proxy.echo("Hi")); + } + + public void testHTTPEndpointClientSide() throws Exception + { + URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); + + Service service = Service.create(wsdlUrl, serviceName); + HelloWorld proxy = (HelloWorld) service.getPort(new QName("http://org.jboss.ws/jaxws/cxf/jms", "HttpHelloWorldImplPort"), HelloWorld.class); + assertEquals("(http) Hi", proxy.echo("Hi")); + } +} Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2011-06-13 10:31:35 UTC (rev 14533) @@ -50,10 +50,25 @@ </wsdl:output> </wsdl:operation> </wsdl:binding> + <wsdl:binding name="HttpHelloWorldServiceSoapBinding" type="tns:HelloWorld"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> <wsdl:service name="HelloWorldService"> <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> + <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort"> + <soap:address location="http://host:port"/> + </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>EndpointServlet</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.cxf.jms_http.HttpHelloWorldImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>EndpointServlet</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/web.xml 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>EndpointServlet</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.jms_http.HttpHelloWorldImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>EndpointServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2011-06-10 16:11:09 UTC (rev 14515) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2011-06-13 10:31:35 UTC (rev 14533) @@ -1,74 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<wsdl:definitions name="HelloWorldService" targetNamespace="http://org.jboss.ws/jaxws/cxf/jms" - xmlns:ns1="http://schemas.xmlsoap.org/soap/http" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://org.jboss.ws/jaxws/cxf/jms" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:soapjms="http://www.w3.org/2010/soapjms/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <wsdl:types> -<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/jaxws/cxf/jms" version="1.0" xmlns:tns="http://org.jboss.ws/jaxws/cxf/jms" xmlns:xs="http://www.w3.org/2001/XMLSchema"> -<xs:element name="echo" type="tns:echo"/> -<xs:element name="echoResponse" type="tns:echoResponse"/> -<xs:complexType name="echo"> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" type="xs:string"/> - </xs:sequence> - </xs:complexType> -<xs:complexType name="echoResponse"> - <xs:sequence> - <xs:element minOccurs="0" name="return" type="xs:string"/> - </xs:sequence> - </xs:complexType> -</xs:schema> - </wsdl:types> - <wsdl:message name="echoResponse"> - <wsdl:part element="tns:echoResponse" name="parameters"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="echo"> - <wsdl:part element="tns:echo" name="parameters"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="echo"> - <wsdl:input message="tns:echo" name="echo"> - </wsdl:input> - <wsdl:output message="tns:echoResponse" name="echoResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="HelloWorldServiceSoapBinding" type="tns:HelloWorld"> - <soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="echo"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="HttpHelloWorldServiceSoapBinding" type="tns:HelloWorld"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="echo"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="HelloWorldService"> - <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> - <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> - <soap:address location="jms:queue:testQueue"/> - </wsdl:port> - <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort"> - <soap:address location="http://localhost:8080/jaxws-cxf-jms-http-deployment"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl (from rev 14515, stack/cxf/branches/JBWS-3125/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2011-06-13 10:31:35 UTC (rev 14533) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<wsdl:definitions name="HelloWorldService" targetNamespace="http://org.jboss.ws/jaxws/cxf/jms" + xmlns:ns1="http://schemas.xmlsoap.org/soap/http" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.ws/jaxws/cxf/jms" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soapjms="http://www.w3.org/2010/soapjms/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <wsdl:types> +<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/jaxws/cxf/jms" version="1.0" xmlns:tns="http://org.jboss.ws/jaxws/cxf/jms" xmlns:xs="http://www.w3.org/2001/XMLSchema"> +<xs:element name="echo" type="tns:echo"/> +<xs:element name="echoResponse" type="tns:echoResponse"/> +<xs:complexType name="echo"> + <xs:sequence> + <xs:element minOccurs="0" name="arg0" type="xs:string"/> + </xs:sequence> + </xs:complexType> +<xs:complexType name="echoResponse"> + <xs:sequence> + <xs:element minOccurs="0" name="return" type="xs:string"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + </wsdl:types> + <wsdl:message name="echoResponse"> + <wsdl:part element="tns:echoResponse" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part element="tns:echo" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="HelloWorld"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="HelloWorldServiceSoapBinding" type="tns:HelloWorld"> + <soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="HttpHelloWorldServiceSoapBinding" type="tns:HelloWorld"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloWorldService"> + <soapjms:jndiConnectionFactoryName>java:/ConnectionFactory</soapjms:jndiConnectionFactoryName> + <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> + <soap:address location="jms:queue:testQueue"/> + </wsdl:port> + <wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort"> + <soap:address location="http://localhost:8080/jaxws-cxf-jms-http-deployment"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-13 10:29:22 UTC (rev 14532) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-06-13 10:31:35 UTC (rev 14533) @@ -728,6 +728,11 @@  <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> + </excludes> </configuration> </plugin> @@ -877,6 +882,11 @@  <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> + </excludes> </configuration> </plugin>

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14532 - common/trunk/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-06-13 06:29:22 -0400 (Mon, 13 Jun 2011) New Revision: 14532 Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java Log: [JBWS-3125] Merging changes to trunk Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-13 10:28:28 UTC (rev 14531) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-13 10:29:22 UTC (rev 14532) @@ -89,17 +89,17 @@ public String getAddress() { - if (getTargetDestination() != null) + if (targetDestination != null) { StringBuffer address = new StringBuffer(); - address.append("jms:jndi:" + getTargetDestination()); + address.append("jms:jndi:" + targetDestination); if (this.getReplyDestination() != null) { address.append("?replyToName =" + this.getReplyDestination()); } return address.toString(); } - return "Not available"; + return super.getAddress(); } //TODO:enable jms endpoint management Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2011-06-13 10:28:28 UTC (rev 14531) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2011-06-13 10:29:22 UTC (rev 14532) @@ -78,32 +78,35 @@ List<Endpoint> deleteList = new LinkedList<Endpoint>(); for (Endpoint ep : dep.getService().getEndpoints()) { - boolean confidential = isConfidentialTransportGuarantee(dep, ep); - int currentPort = confidential ? securePort : port; - String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : ""); - - HttpEndpoint httpEp = (HttpEndpoint)ep; - String urlPattern = httpEp.getURLPattern(); - if (urlPattern == null) - throw new IllegalStateException("Cannot obtain url pattern"); - - if (urlPattern.endsWith("/*")) - urlPattern = urlPattern.substring(0, urlPattern.length() - 2); - - protocol = confidential ? "https://" : "http://"; - String address = protocol + hostAndPort + contextRoot + urlPattern; - httpEp.setAddress(address); - //JBWS-2957: EJB3 binds the same endpoint class to multiple beans at multiple JNDI locations; - //generally speaking we can't have multiple endpoints published at the same address and we - //can't ensure that completely in AS integration, since the publish address is final just here - if (!endpointsMap.containsKey(address)) + if (ep instanceof HttpEndpoint) { - endpointsMap.put(address, httpEp); + boolean confidential = isConfidentialTransportGuarantee(dep, ep); + int currentPort = confidential ? securePort : port; + String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : ""); + + HttpEndpoint httpEp = (HttpEndpoint)ep; + String urlPattern = httpEp.getURLPattern(); + if (urlPattern == null) + throw new IllegalStateException("Cannot obtain url pattern"); + + if (urlPattern.endsWith("/*")) + urlPattern = urlPattern.substring(0, urlPattern.length() - 2); + + protocol = confidential ? "https://" : "http://"; + String address = protocol + hostAndPort + contextRoot + urlPattern; + httpEp.setAddress(address); + //JBWS-2957: EJB3 binds the same endpoint class to multiple beans at multiple JNDI locations; + //generally speaking we can't have multiple endpoints published at the same address and we + //can't ensure that completely in AS integration, since the publish address is final just here + if (!endpointsMap.containsKey(address)) + { + endpointsMap.put(address, httpEp); + } + else + { + deleteList.add(httpEp); + } } - else - { - deleteList.add(httpEp); - } } //Remove endpoints with duplicated address for (Endpoint ep : deleteList) Copied: common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java (from rev 14519, common/branches/JBWS-3125/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java) =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/SOAPAddressWSDLParser.java 2011-06-13 10:29:22 UTC (rev 14532) @@ -0,0 +1,355 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.ws.common.deployment; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.jboss.wsf.spi.util.StAXUtils.attributeAsQName; +import static org.jboss.wsf.spi.util.StAXUtils.match; +import static org.jboss.wsf.spi.util.StAXUtils.nextElement; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.spi.util.StAXUtils; + +/** + * A partial StAX-based WSDL parser for retrieving soap:address elements + * + * @author alessio.soldano(a)jboss.com + */ +public final class SOAPAddressWSDLParser +{ + public static final String SOAP_OVER_JMS_NS = "http://www.w3.org/2010/soapjms/"; + private static final String WSDL_NS = "http://schemas.xmlsoap.org/wsdl/"; + private static final String SOAP_NS = "http://schemas.xmlsoap.org/wsdl/soap/"; + private static final String SOAP12_NS = "http://schemas.xmlsoap.org/wsdl/soap12/"; + private static final String DEFINITIONS = "definitions"; + private static final String SERVICE = "service"; + private static final String PORT = "port"; + private static final String BINDING = "binding"; + private static final String TRANSPORT = "transport"; + private static final String ADDRESS = "address"; + private static final String LOCATION = "location"; + private static final String NAME = "name"; + private static final String TARGET_NAMESPACE = "targetNamespace"; + + private WSDLMetaData metadata; + + public SOAPAddressWSDLParser(URL wsdlUrl) + { + this.metadata = getMetaData(wsdlUrl); + } + + public String filterSoapAddress(QName serviceName, QName portName, String transportNamespace) + { + //get the soap:address of the required service/port if the corresponding binding uses SOAP over JMS transport + WSDLServiceMetaData smd = metadata.getServices().get(serviceName); + if (smd != null) + { + WSDLPortMetaData pmd = smd.getPorts().get(portName); + if (pmd != null) + { + WSDLBindingMetaData bmd = metadata.getBindings().get(pmd.getBindingName()); + if (bmd != null && transportNamespace.equals(bmd.getSoapTransport())) + { + return pmd.getSoapAddress(); + } + } + } + return null; + } + + protected static WSDLMetaData getMetaData(URL wsdlUrl) + { + InputStream is = null; + try + { + is = wsdlUrl.openStream(); + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return getMetaData(xmlr); + } + catch (Exception e) + { + throw new WebServiceException("Failed to read " + wsdlUrl + ":" + e.getMessage(), e); + } + finally + { + try + { + if (is != null) is.close(); + } + catch (IOException e) {} //ignore + } + } + + private static WSDLMetaData getMetaData(XMLStreamReader reader) throws XMLStreamException + { + int iterate; + try + { + iterate = reader.nextTag(); + } + catch (XMLStreamException e) + { + // skip non-tag elements + iterate = reader.nextTag(); + } + WSDLMetaData metadata = new WSDLMetaData(); + switch (iterate) + { + case END_ELEMENT : { + // we're done + break; + } + case START_ELEMENT : { + + if (match(reader, WSDL_NS, DEFINITIONS)) + { + String targetNS = reader.getAttributeValue(null, TARGET_NAMESPACE); + parseDefinitions(reader, metadata, targetNS); + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + return metadata; + } + + private static void parseDefinitions(XMLStreamReader reader, WSDLMetaData metadata, String targetNS) throws XMLStreamException + { + while (reader.hasNext()) + { + switch (nextElement(reader)) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, WSDL_NS, DEFINITIONS)) + { + return; + } + continue; + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, WSDL_NS, SERVICE)) { + QName name = attributeAsQName(reader, null, NAME, targetNS); + WSDLServiceMetaData smd = parseService(reader, targetNS); + smd.setName(name); + metadata.getServices().put(smd.getName(), smd); + } + else if (match(reader, WSDL_NS, BINDING)) { + QName name = attributeAsQName(reader, null, NAME, targetNS); + WSDLBindingMetaData bmd = parseBinding(reader); + bmd.setName(name); + metadata.getBindings().put(bmd.getName(), bmd); + } + continue; + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private static WSDLServiceMetaData parseService(XMLStreamReader reader, String targetNS) throws XMLStreamException + { + WSDLServiceMetaData smd = new WSDLServiceMetaData(); + while (reader.hasNext()) + { + switch (nextElement(reader)) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, WSDL_NS, SERVICE)) + { + return smd; + } + continue; + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, WSDL_NS, PORT)) { + QName name = attributeAsQName(reader, null, NAME, targetNS); + QName binding = attributeAsQName(reader, null, BINDING, targetNS); + WSDLPortMetaData pmd = parsePort(reader); + pmd.setName(name); + pmd.setBindingName(binding); + smd.getPorts().put(pmd.getName(), pmd); + } + continue; + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private static WSDLPortMetaData parsePort(XMLStreamReader reader) throws XMLStreamException + { + WSDLPortMetaData pmd = new WSDLPortMetaData(); + while (reader.hasNext()) + { + switch (nextElement(reader)) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, WSDL_NS, PORT)) + { + return pmd; + } + continue; + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, SOAP_NS, ADDRESS) || match(reader, SOAP12_NS, ADDRESS)) { + String location = reader.getAttributeValue(null, LOCATION); + pmd.setSoapAddress(location); + reader.nextTag(); + } + continue; + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private static WSDLBindingMetaData parseBinding(XMLStreamReader reader) throws XMLStreamException + { + WSDLBindingMetaData bmd = new WSDLBindingMetaData(); + while (reader.hasNext()) + { + switch (nextElement(reader)) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, WSDL_NS, BINDING)) + { + return bmd; + } + continue; + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, SOAP_NS, BINDING) || match(reader, SOAP12_NS, BINDING)) { + String transport = reader.getAttributeValue(null, TRANSPORT); + bmd.setSoapTransport(transport); + reader.nextTag(); + } + continue; + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private static class WSDLMetaData + { + private Map<QName, WSDLServiceMetaData> services = new HashMap<QName, SOAPAddressWSDLParser.WSDLServiceMetaData>(); + private Map<QName, WSDLBindingMetaData> bindings = new HashMap<QName, SOAPAddressWSDLParser.WSDLBindingMetaData>(); + + public Map<QName, WSDLServiceMetaData> getServices() + { + return services; + } + public Map<QName, WSDLBindingMetaData> getBindings() + { + return bindings; + } + } + + private static class WSDLServiceMetaData + { + private QName name; + private Map<QName, WSDLPortMetaData> ports = new HashMap<QName, WSDLPortMetaData>(); + + public QName getName() + { + return name; + } + public void setName(QName name) + { + this.name = name; + } + public Map<QName, WSDLPortMetaData> getPorts() + { + return ports; + } + } + + private static class WSDLPortMetaData + { + private String soapAddress; + private QName name; + private QName bindingName; + + public String getSoapAddress() + { + return soapAddress; + } + public void setSoapAddress(String soapAddress) + { + this.soapAddress = soapAddress; + } + public QName getName() + { + return name; + } + public void setName(QName name) + { + this.name = name; + } + public QName getBindingName() + { + return bindingName; + } + public void setBindingName(QName bindingName) + { + this.bindingName = bindingName; + } + } + + private static class WSDLBindingMetaData + { + private String soapTransport; + private QName name; + + public String getSoapTransport() + { + return soapTransport; + } + public void setSoapTransport(String soapTransport) + { + this.soapTransport = soapTransport; + } + public QName getName() + { + return name; + } + public void setName(QName name) + { + this.name = name; + } + } + +} Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2011-06-13 10:28:28 UTC (rev 14531) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2011-06-13 10:29:22 UTC (rev 14532) @@ -49,19 +49,22 @@ { for (Endpoint ep : dep.getService().getEndpoints()) { - HttpEndpoint httpEp = (HttpEndpoint)ep; - String urlPattern = httpEp.getURLPattern(); - if (urlPattern == null) + if (ep instanceof HttpEndpoint) { - urlPattern = getExplicitPattern(dep, ep); + HttpEndpoint httpEp = (HttpEndpoint)ep; + String urlPattern = httpEp.getURLPattern(); if (urlPattern == null) - urlPattern = getImplicitPattern(dep, ep); - - // Always prefix with '/' - if (urlPattern.startsWith("/") == false) - urlPattern = "/" + urlPattern; - - httpEp.setURLPattern(urlPattern); + { + urlPattern = getExplicitPattern(dep, ep); + if (urlPattern == null) + urlPattern = getImplicitPattern(dep, ep); + + // Always prefix with '/' + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; + + httpEp.setURLPattern(urlPattern); + } } } }

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14531 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/jms and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-06-13 06:28:28 -0400 (Mon, 13 Jun 2011) New Revision: 14531 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java Log: [JBWS-3125] Merging changes to trunk Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2011-06-12 04:40:25 UTC (rev 14530) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2011-06-13 10:28:28 UTC (rev 14531) @@ -32,7 +32,7 @@ { public enum DeploymentType { - JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_JMS; + JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, @Deprecated JAXWS_JMS; }; public enum DeploymentState Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2011-06-12 04:40:25 UTC (rev 14530) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2011-06-13 10:28:28 UTC (rev 14531) @@ -29,10 +29,8 @@ public interface HttpEndpoint extends Endpoint { /** Get the URL pattern for this endpoint */ - @Deprecated String getURLPattern(); /** Set the URL pattern for this endpoint */ - @Deprecated void setURLPattern(String urlPattern); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2011-06-12 04:40:25 UTC (rev 14530) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2011-06-13 10:28:28 UTC (rev 14531) @@ -39,7 +39,8 @@ //wsdl location private String wsdlLocation = ""; - + private String soapAddress = ""; + //parent component private JMSEndpointsMetaData endpointsMetaData = null; @@ -93,4 +94,14 @@ this.wsdlLocation = wsdlLocation; } + public String getSoapAddress() + { + return soapAddress; + } + + public void setSoapAddress(String soapAddress) + { + this.soapAddress = soapAddress; + } + } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-06-12 04:40:25 UTC (rev 14530) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-06-13 10:28:28 UTC (rev 14531) @@ -41,11 +41,13 @@ { } + @Deprecated public JMSEndpointsMetaData(URL descriptorURL) { this.descriptorURL = descriptorURL; } + @Deprecated public URL getDescriptorURL() { return descriptorURL;

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14530 - in stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws: api/main and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-06-12 00:40:25 -0400 (Sun, 12 Jun 2011) New Revision: 14530 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml Log: [JBWS-3271] allow each WS stack to use its own SAAJ impl Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-06-12 04:39:28 UTC (rev 14529) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-06-12 04:40:25 UTC (rev 14530) @@ -30,9 +30,10 @@ <dependencies> <module name="javax.api"/> - <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="javax.xml.soap.api"/> <module name="javax.xml.ws.api"/> <module name="org.jboss.logging"/> <module name="org.jboss.modules"/> </dependencies> + </module> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml 2011-06-12 04:40:25 UTC (rev 14530) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.saaj-impl"> + + <resources> +  + </resources> + + <dependencies> + <module name="com.sun.xml.messaging.saaj" services="import"/> + </dependencies> + +</module>

13 years, 6 months

1
0
0 / 0

JBossWS SVN: r14529 - in stack/native/trunk/modules: resources/src/main/resources/modules/org/jboss/ws/api/main and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-06-12 00:39:28 -0400 (Sun, 12 Jun 2011) New Revision: 14529 Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3271] allow each WS stack to use its own SAAJ impl Modified: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-06-11 18:41:29 UTC (rev 14528) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/api/main/module.xml 2011-06-12 04:39:28 UTC (rev 14529) @@ -30,7 +30,7 @@ <dependencies> <module name="javax.api"/> - <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="javax.xml.soap.api"/> <module name="javax.xml.ws.api"/> <module name="org.jboss.logging"/> <module name="org.jboss.modules"/> Added: stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml (rev 0) +++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/saaj-impl/main/module.xml 2011-06-12 04:39:28 UTC (rev 14529) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.0" name="org.jboss.ws.saaj-impl"> + + <resources> +  + </resources> + + <dependencies> + <module name="org.jboss.ws.native.jbossws-native-core"/> + <module name="org.jboss.ws.native.jbossws-native-factories" services="import"/> + </dependencies> + +</module> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-06-11 18:41:29 UTC (rev 14528) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-12 04:39:28 UTC (rev 14529) @@ -837,11 +837,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1815/JBWS1815TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2011