JBossWS SVN: r14457 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 7 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-31 09:45:18 -0400 (Tue, 31 May 2011)
New Revision: 14457
Added:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java
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/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/hornetq-jms.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/jboss-dependency.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/wsdl/HelloWorldService.wsdl
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3125] Adding API based testcase on SOAP-over-JMS 1.0 support
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-05-31 13:43:19 UTC (rev 14456)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-05-31 13:45:18 UTC (rev 14457)
@@ -92,7 +92,56 @@
<include name="**/*" />
</metainf>
</jar>
+
+ <!-- jaxws-cxf-jms-api -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.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-as6/wsdl"
+ prefix="WEB-INF/classes/META-INF/wsdl"/>
+ </war>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.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>
+ <!-- jaxws-jms-api-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6-client.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-as6">
+ <include name="wsdl/**/*" />
+ <include name="jboss-dependency.xml"/>
+ </metainf>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.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>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/hornetq-testqueue-as6.sar">
+ <fileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6">
+ <include name="hornetq-jms.xml"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-cxf-webserviceref -->
<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">
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.java 2011-05-31 13:45:18 UTC (rev 14457)
@@ -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;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/jms")
+public interface HelloWorld
+{
+ String echo(String input);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/HelloWorldImpl.java 2011-05-31 13:45:18 UTC (rev 14457)
@@ -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;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "HelloWorldImplPort",
+ serviceName = "HelloWorldService",
+ wsdlLocation = "META-INF/wsdl/HelloWorldService.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.jms.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;
+ }
+}
Added: 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 (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,84 @@
+/*
+ * 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.Endpoint;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case for publishing a JMS (SOAP-over-JMS 1.0) endpoint through API
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 29-Apr-2011
+ */
+public final class JMSEndpointAPITestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ if (isTargetJBoss6()) {
+ return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "hornetq-testqueue-as6.sar,jaxws-cxf-jms-api-as6-client.jar,jaxws-cxf-jms-api-as6.war");
+ } else {
+ return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war");
+ }
+ }
+
+ public void testServerSide() throws Exception
+ {
+ final String asSuffix = isTargetJBoss6() ? "as6" : "as7";
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-" + asSuffix);
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("true", br.readLine());
+ }
+
+ public void testClientSide() throws Exception
+ {
+ if (!isTargetJBoss6()) {
+ System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available on AS7");
+ return;
+ }
+ URL wsdlUrl = Thread.currentThread().getContextClassLoader().getResource("META-INF/wsdl/HelloWorldService.wsdl");
+ Object implementor = new HelloWorldImpl();
+ Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor);
+ try
+ {
+ 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);
+ assertEquals("Hi", proxy.echo("Hi"));
+ }
+ finally
+ {
+ ep.stop();
+ }
+ }
+}
Added: 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 (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/TestServlet.java 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,78 @@
+/*
+ * 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.Endpoint;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+
+@WebServlet(name = "TestServlet", urlPatterns = "/*")
+public class TestServlet 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);
+ Object implementor = new HelloWorldImpl();
+ Endpoint ep = Endpoint.publish("jms:queue:testQueue", implementor);
+ try
+ {
+ 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);
+ result = "Hi".equals(proxy.echo("Hi"));
+ }
+ finally
+ {
+ ep.stop();
+ bus.shutdown(true);
+ }
+ res.getWriter().print(result);
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ throw new ServletException(t);
+ }
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/hornetq-jms.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/hornetq-jms.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/hornetq-jms.xml 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration
+ xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="testQueue">
+ <entry name="queue/test"/>
+ </queue>
+</configuration>
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/jboss-dependency.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/jboss-dependency.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/jboss-dependency.xml 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,3 @@
+<dependency xmlns="urn:jboss:dependency:1.0">
+ <item>org.hornetq:name="testQueue",module=JMS,type=Queue</item>
+</dependency>
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/wsdl/HelloWorldService.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/wsdl/HelloWorldService.wsdl 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,59 @@
+<?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:service name="HelloWorldService">
+ <soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
+ <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
+ <soap:address location="jms:queue:testQueue"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Added: 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 (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl 2011-05-31 13:45:18 UTC (rev 14457)
@@ -0,0 +1,59 @@
+<?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: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:service>
+</wsdl:definitions>
\ No newline at end of file
13 years, 7 months
JBossWS SVN: r14456 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-31 09:43:19 -0400 (Tue, 31 May 2011)
New Revision: 14456
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
Log:
[JBWS-3125] Adding dependency on javax.jms.api to spring module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-05-31 13:42:09 UTC (rev 14455)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springframework/spring/main/module.xml 2011-05-31 13:43:19 UTC (rev 14456)
@@ -30,6 +30,7 @@
<dependencies>
<module name="javax.api" />
+ <module name="javax.jms.api" />
<module name="javax.annotation.api" />
<module name="org.apache.commons.logging" />
</dependencies>
13 years, 7 months
JBossWS SVN: r14455 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-31 09:42:09 -0400 (Tue, 31 May 2011)
New Revision: 14455
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Fixing JMS testcases so that they don't silently ignore failures on AS7; excluding them for now
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -31,18 +31,14 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
/**
* The test for cxf jms transport packaged in a jar file and deployed with jbossws-cxf.xml
@@ -55,27 +51,10 @@
public static Test suite() throws Exception
{
- if (isHornetQAvailable()) {
- return new JBossWSCXFTestSetup(JMSEndpointsTestCase.class, "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
- } else {
- return new TestSuite();
- }
+ return new JBossWSCXFTestSetup(JMSEndpointsTestCase.class,
+ "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar");
}
- public static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void testMessagingClient() throws Exception
{
String reqMessage =
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -31,17 +31,12 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.JMSEndpointsTestCase;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -53,34 +48,12 @@
{
private static boolean waitForResponse;
- public static Test suite() throws Exception
+ public static Test suite() throws Exception
{
- if (isHornetQAvailable())
- {
- return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class,
- "hornetq-fromjava-jmsendpoints-as6.sar, jaxws-fromjava-jmsendpoints-as6.jar");
- }
- else
- {
- return new TestSuite();
- }
-
+ return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class,
+ "hornetq-fromjava-jmsendpoints-as6.sar, jaxws-fromjava-jmsendpoints-as6.jar");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void testMessagingClient() throws Exception
{
String reqMessage =
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2011-05-31 13:42:09 UTC (rev 14455)
@@ -34,23 +34,19 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.jboss.ws.common.DOMUtils;
-import org.jboss.ws.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
/**
* The test for cxf jms transport
@@ -61,34 +57,12 @@
{
private static boolean waitForResponse;
- public static Test suite() throws Exception
+ public static Test suite() throws Exception
{
- if (isHornetQAvailable())
- {
- return new JBossWSCXFTestSetup(JMSTransportTestCase.class,
- "hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
- }
- else
- {
- return new TestSuite();
- }
-
+ return new JBossWSCXFTestSetup(JMSTransportTestCase.class,
+ "hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
}
- private static boolean isHornetQAvailable()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
- String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
- return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
public void testJMSEndpointPort() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-jmstransport?wsdl");
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-31 04:13:10 UTC (rev 14454)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-31 13:42:09 UTC (rev 14455)
@@ -1068,6 +1068,9 @@
<!-- @WebServiceRef not implemented yet on AS7 -->
<exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase*</exclude>
+ <!-- JMS endpoint functionalities to be restored on AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/**</exclude>
+
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
</excludes>
13 years, 7 months
JBossWS SVN: r14454 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: klape
Date: 2011-05-31 00:13:10 -0400 (Tue, 31 May 2011)
New Revision: 14454
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/JBWS3251TestCase.java
Modified:
stack/native/branches/jbossws-native-3.1.2/
stack/native/branches/jbossws-native-3.1.2/modules/core/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/
Log:
[JBPAPP-6285] Backporting SOAPElementImpl concurrency issue (DOMException). Also adding test case.
Property changes on: stack/native/branches/jbossws-native-3.1.2
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk:12502,13992,14181,14183
+ /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946
/stack/native/trunk:12502,13992,14181,14183
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk/modules/core:12502,13992,14011,14181,14183
+ /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946
/stack/native/trunk/modules/core:12502,13992,14011,14181,14183
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-05-31 02:50:56 UTC (rev 14453)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-05-31 04:13:10 UTC (rev 14454)
@@ -80,7 +80,7 @@
public SOAPElementImpl(String localPart, String prefix, String nsURI)
{
super(DOMUtils.createElement(localPart, prefix, nsURI));
- this.element = (Element)domNode;
+ this.element = (Element)domNode;
log.trace("new SOAPElementImpl: " + getElementName());
}
@@ -89,6 +89,13 @@
{
this(name.getLocalName(), name.getPrefix(), name.getURI());
}
+
+ /** Called by addChild */
+ private SOAPElementImpl(Element element)
+ {
+ super(element);
+ this.element = element;
+ }
/** Called by SOAPFactory */
public SOAPElementImpl(QName qname)
@@ -187,9 +194,8 @@
*/
public SOAPElement addChildElement(String name) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(name);
+ return addChildElement(nameImp);
}
/**
@@ -206,9 +212,8 @@
if (nsURI == null)
throw new IllegalArgumentException("Cannot obtain namespace URI for prefix: " + prefix);
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, nsURI);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(localName, prefix, nsURI);
+ return addChildElement(nameImp);
}
/**
@@ -222,9 +227,8 @@
*/
public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, uri);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImpl = new NameImpl(localName, prefix, uri);
+ return addChildElement(nameImpl);
}
/**
@@ -235,10 +239,19 @@
* @throws javax.xml.soap.SOAPException if there is an error in creating the SOAPElement object
*/
public SOAPElement addChildElement(Name name) throws SOAPException
- {
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ {
+ Document doc = this.element.getOwnerDocument();
+ Element childEle = null;
+ if (name.getPrefix() == null || name.getPrefix().length() == 0)
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getLocalName());
+ } else
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName());
+ }
+
+ SOAPElement child = new SOAPElementImpl(childEle);
+ return addChildElement(child);
}
public SOAPElement addChildElement(QName qname) throws SOAPException
@@ -269,7 +282,16 @@
{
log.trace("addChildElement: " + getElementName() + " -> " + child.getElementName());
SOAPElementImpl soapElement = (SOAPElementImpl)child;
- soapElement = (SOAPElementImpl)appendChild(soapElement);
+
+ if (soapElement.domNode.getOwnerDocument() != element.getOwnerDocument())
+ {
+ Document oldDoc = DOMUtils.peekOwnerDocument();
+ DOMUtils.setOwnerDocument(element.getOwnerDocument());
+ soapElement = (SOAPElementImpl) SOAPFactoryImpl.newInstance().createElement((Element) (soapElement.domNode));
+ DOMUtils.setOwnerDocument(oldDoc);
+
+ }
+ soapElement = (SOAPElementImpl) appendChild(soapElement);
return soapElement.completeNamespaceDeclaration();
}
Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14181,14183
+ /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946
/stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14181,14183
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/JBWS3251TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/JBWS3251TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/JBWS3251TestCase.java 2011-05-31 04:13:10 UTC (rev 14454)
@@ -0,0 +1,120 @@
+package org.jboss.test.ws.common.soap;
+
+import java.util.Iterator;
+import java.util.concurrent.CountDownLatch;
+
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.Name;
+
+import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.NameImpl;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.soap.SOAPElementImpl;
+import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.wsf.test.JBossWSTest;
+
+public class JBWS3251TestCase extends JBossWSTest
+{
+ public void test() throws Exception
+ {
+ int threadCount = 20;
+ SoapElementTester test = new SoapElementTester();
+ CountDownLatch latch = new CountDownLatch(threadCount);
+
+ test.latch = latch;
+
+ for(int i=0; i<threadCount; i++)
+ {
+ Thread t = new Thread(test);
+ t.start();
+ }
+
+ latch.await();
+ Thread.currentThread().sleep(200);
+
+ assertTrue(test.allRunsSuccessful);
+ }
+
+ private class SoapElementTester implements Runnable
+ {
+ private final String soapXml =
+ "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsp=\"http://examples.jboss.com/ws\">\n" +
+ " <soapenv:Header>\n" +
+ " <wsp:info>\n" +
+ " <wsp:test>Child of Child</wsp:test>\n" +
+ " </wsp:info>\n" +
+ " </soapenv:Header>\n" +
+ " <soapenv:Body>\n" +
+ " </soapenv:Body>\n" +
+ "</soapenv:Envelope>";
+
+ private SOAPElement sharedElement;
+ public boolean allRunsSuccessful = true;
+ public CountDownLatch latch;
+
+ public void run()
+ {
+ Name name = new NameImpl(
+ "Envelope",
+ "soapenv",
+ "http://schemas.xmlsoap.org/soap/envelope/"
+ );
+
+ //Do we even need this part?
+ SOAPContentElement soapEl = new SOAPContentElement(name);
+ soapEl.setXMLFragment(new XMLFragment(soapXml));
+
+ sharedElement = soapEl;
+
+ if(!printNodeNames())
+ allRunsSuccessful = false;
+ }
+
+ public boolean printNodeNames()
+ {
+ try
+ {
+ Iterator i = sharedElement.getChildElements();
+ while(i.hasNext())
+ {
+ Object o = i.next();
+ if(!(o instanceof SOAPElement))
+ continue;
+
+ SOAPElement elt = (SOAPElement)o;
+
+ Iterator i2 = elt.getChildElements();
+ while(i2.hasNext())
+ {
+ o = i2.next();
+ if(!(o instanceof SOAPElement))
+ continue;
+
+ SOAPElement child = (SOAPElement)o;
+
+ Iterator i3 = child.getChildElements();
+ while(i3.hasNext())
+ {
+ o = i3.next();
+ if(!(o instanceof SOAPElement))
+ continue;
+
+ SOAPElement grandchild = (SOAPElement)o;
+ }
+ }
+ }
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ return false;
+ }
+ finally
+ {
+ latch.countDown();
+ }
+ return true;
+ }
+ }
+}
13 years, 7 months
JBossWS SVN: r14453 - framework/tags/jbossws-framework-2.0.1.GA_CP06.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-05-30 22:50:56 -0400 (Mon, 30 May 2011)
New Revision: 14453
Modified:
framework/tags/jbossws-framework-2.0.1.GA_CP06/version.properties
Log:
[JBPAPP-6560]:Update version number
Modified: framework/tags/jbossws-framework-2.0.1.GA_CP06/version.properties
===================================================================
--- framework/tags/jbossws-framework-2.0.1.GA_CP06/version.properties 2011-05-31 02:45:03 UTC (rev 14452)
+++ framework/tags/jbossws-framework-2.0.1.GA_CP06/version.properties 2011-05-31 02:50:56 UTC (rev 14453)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_CP-SNAPSHOT
-repository.id=2.0.1.GA_CP-SNAPSHOT
+version.id=2.0.1.GA_CP06
+repository.id=2.0.1.GA_CP06
implementation.title=JBoss Web Services - Framework
implementation.url=http://www.jboss.org/products/jbossws
@@ -15,7 +15,7 @@
# Thirdparty library versions
jbossws-common=1.0.0.GA_CP05-brew
-jbossws-spi=1.0.0.GA_CP02-brew
+jbossws-spi=1.0.0.GA_CP03-brew
dom4j=1.6.1
jboss-common-core=2.0.2.GA
13 years, 7 months
JBossWS SVN: r14452 - framework/tags.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-05-30 22:45:03 -0400 (Mon, 30 May 2011)
New Revision: 14452
Added:
framework/tags/jbossws-framework-2.0.1.GA_CP06/
Log:
[JBPAPP-6560]:Tag jbossws-framework-2.0.1.GA_CP06
13 years, 7 months
JBossWS SVN: r14451 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-30 09:43:35 -0400 (Mon, 30 May 2011)
New Revision: 14451
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
Log:
Synch with AS7
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-05-30 13:30:40 UTC (rev 14450)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-05-30 13:43:35 UTC (rev 14451)
@@ -29,10 +29,13 @@
</resources>
<dependencies>
+ <module name="asm.asm" />
<module name="javax.api" />
<module name="javax.annotation.api" />
+ <module name="javax.jms.api" />
<module name="javax.jws.api" />
<module name="javax.mail.api" />
+ <module name="javax.resource.api" />
<module name="javax.servlet.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.bind.api" services="import"/>
13 years, 7 months
JBossWS SVN: r14450 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-30 09:30:40 -0400 (Mon, 30 May 2011)
New Revision: 14450
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
Log:
[JBWS-3303] Add commons-lang dependency on cxf module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-05-30 09:05:19 UTC (rev 14449)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-05-30 13:30:40 UTC (rev 14450)
@@ -40,6 +40,7 @@
<module name="javax.xml.soap.api" />
<module name="javax.xml.stream.api" />
<module name="javax.xml.ws.api" />
+ <module name="org.apache.commons.lang" />
<module name="org.apache.neethi" />
<module name="org.apache.velocity" />
<module name="org.apache.ws.xmlschema" />
13 years, 7 months
JBossWS SVN: r14449 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-30 05:05:19 -0400 (Mon, 30 May 2011)
New Revision: 14449
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling excluded tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-30 08:55:39 UTC (rev 14448)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-05-30 09:05:19 UTC (rev 14449)
@@ -980,14 +980,6 @@
<!--# not yet supported on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
- <!-- AS7-EJB3 integration regressions -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude>
-
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
13 years, 7 months
JBossWS SVN: r14448 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-30 04:55:39 -0400 (Mon, 30 May 2011)
New Revision: 14448
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling excluded tests
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-05-27 10:03:09 UTC (rev 14447)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-05-30 08:55:39 UTC (rev 14448)
@@ -783,27 +783,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- AS7 integration regressions -->
- <exclude>org/jboss/test/ws/jaxws/samples/jaxbintros/JAXBIntroTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws771/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1909/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2014/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2166/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2221/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2565/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude>
-
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
13 years, 7 months