5:20 p.m.
Author: darran.lofthouse(a)jboss.com
Date: 2009-04-08 11:20:29 -0400 (Wed, 08 Apr 2009)
New Revision: 9767
Added:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties
Log:
[JBPAPP-1869] Support for SOAP 1.2 in wsconsume.
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
---
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-04-08
15:13:02 UTC (rev 9766)
+++
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2009-04-08
15:20:29 UTC (rev 9767)
@@ -21,23 +21,25 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import junit.framework.TestCase;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
-
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
+import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.List;
-import java.lang.reflect.Method;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+import junit.framework.TestCase;
+
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
/**
* Test the WSContractConsumer API across different implementations.
- * NOTE: All tests expect to be execurted below 'output/tests'.
+ * NOTE: All tests expect to be executed below 'output/tests'.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
@@ -276,6 +278,23 @@
}
+ /**
+ * Tests the SOAP 1.2 binding extension
+ *
+ */
+ public void testSOAP12Extension() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+
consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension");
+ consumer.setGenerateSource(true);
+ consumer.setExtension(true);
+
consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl");
+ File sei = new
File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ File service = new
File("wsconsume/java/org/jboss/test/ws/tools/testSOAP12Extension/TestService.java");
+ assertTrue("Service not generated", service.exists());
+ }
+
private void consumeWSDL() throws Exception
{
consumer.setOutputDirectory(outputDirectory);
Copied:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
(from rev 9490,
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl)
===================================================================
---
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl
(rev 0)
+++
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/src/test/resources/jaxws/smoke/tools/wsdl/TestServiceSoap12.wsdl 2009-04-08
15:20:29 UTC (rev 9767)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/">
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo"/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding"
type="tns:EndpointInterface">
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"
style="rpc"/>
+ <operation name="echo">
+ <soap12:operation soapAction=""/>
+ <input>
+ <soap12:body use="literal"
namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap12:body use="literal"
namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort"
binding="tns:EndpointInterfaceBinding">
+ <soap12:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties
===================================================================
---
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties 2009-04-08
15:13:02 UTC (rev 9766)
+++
framework/branches/jbossws-framework-2.0.1.GA_CP02_JBPAPP-1869/version.properties 2009-04-08
15:20:29 UTC (rev 9767)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA_CP02
-repository.id=2.0.1.GA_CP02
+version.id=2.0.1.GA_CP02_JBPAPP-1869
+repository.id=2.0.1.GA_CP02_JBPAPP-1869
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_CP02-brew
-jbossws-spi=1.0.0.GA_CP01-brew
+jbossws-spi=1.0.0.GA_CP01_JBPAPP-1869
dom4j=1.6.1
jboss-common-core=2.0.2.GA