axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r632063 - in /webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws: framework/JAXWSTest.java provider/SoapMessageProviderTests.java provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl provider/soapmsg/SoapMessageProvider.java
Date Thu, 28 Feb 2008 17:18:39 GMT
Author: rott
Date: Thu Feb 28 09:18:23 2008
New Revision: 632063

URL: http://svn.apache.org/viewvc?rev=632063&view=rev
Log:
Restoring SoapMessageProviderTests.  The sample service was missing a .wsdl file, and a few
other necessary changes due to using a new deployer since it was last running.

One test remains disabled, see JIRA AXIS2-3558

Added:
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl
Modified:
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java?rev=632063&r1=632062&r2=632063&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
Thu Feb 28 09:18:23 2008
@@ -169,8 +169,7 @@
         suite.addTestSuite(StringMessageProviderTests.class);
         suite.addTestSuite(SourceProviderTests.class);
         suite.addTestSuite(SourceMessageProviderTests.class);
-        // TODO FIXME: Test fails
-        //suite.addTestSuite(SoapMessageProviderTests.class);
+        suite.addTestSuite(SoapMessageProviderTests.class);
         suite.addTestSuite(SoapMessageMUProviderTests.class);
         suite.addTestSuite(JAXBProviderTests.class);
         suite.addTestSuite(ProxyTests.class);

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java?rev=632063&r1=632062&r2=632063&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/SoapMessageProviderTests.java
Thu Feb 28 09:18:23 2008
@@ -101,7 +101,10 @@
      * Sends an SOAPMessage containing only xml data to the web service.  
      * Receives a response containing just xml data.
      */
-    public void testProviderSourceXMLOnly(){
+    
+    // TODO: test disabled due to XMLDispatch.createMessageFromValue failing to copy
+    // mime header to request.  Server sample has an assert that checks for it, and fails.
+    public void _testProviderSourceXMLOnly(){
         try{       
             // Create the dispatch
             Dispatch<SOAPMessage> dispatch = createDispatch();

Added: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl?rev=632063&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl
(added)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/META-INF/ProviderSOAPMessage.wsdl
Thu Feb 28 09:18:23 2008
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+-->
+
+<definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:s="http://www.w3.org/2001/XMLSchema" 
+    xmlns:tns="http://soapmsg.provider.jaxws.axis2.apache.org"
+    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
+    xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" 
+    xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
+    targetNamespace="http://soapmsg.provider.jaxws.axis2.apache.org" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+     	<xsd:schema
+			targetNamespace="http://soapmsg.provider.jaxws.axis2.apache.org"
+			xmlns:tns="http://soapmsg.provider.jaxws.axis2.apache.org"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<xsd:complexType name="StringArray">
+				<xsd:sequence>
+					<xsd:element name="value" type="xsd:string"
+						minOccurs="0" maxOccurs="unbounded" />
+
+				</xsd:sequence>
+			</xsd:complexType>
+
+			<xsd:element name="inMessage" type="tns:StringArray" />
+			<xsd:element name="outMessage" type="tns:StringArray" />
+		        <xsd:element name="twoWayExceptionFault" type="xsd:string" />
+	</xsd:schema>
+    
+
+  </types>
+   
+  <message name="emptyMessage"/>
+  <message name="inMessage">
+    <part name="parameters" element="tns:inMessage" />
+  </message>
+  <message name="outMessage">
+    <part name="parameters" element="tns:outMessage" />
+  </message>
+
+  <portType name="EchoServiceInterface">
+    <operation name="invokeOp">
+      <input message="tns:inMessage" />
+      <output message="tns:outMessage" />
+    </operation>  
+  </portType>
+
+  <binding name="EchoServiceSoap" type="tns:EchoServiceInterface">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <operation name="invokeOp">
+      <soap:operation soapAction="echoString" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="SoapMessageProviderService">
+    <port name="SoapMessageProviderPort" binding="tns:EchoServiceSoap">
+      <soap:address location="http://localhost:6060/axis2/services/SoapMessageProviderService"
/>
+    </port>
+  </service>
+
+</definitions>

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java?rev=632063&r1=632062&r2=632063&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/provider/soapmsg/SoapMessageProvider.java
Thu Feb 28 09:18:23 2008
@@ -53,7 +53,9 @@
 import javax.xml.ws.soap.SOAPFaultException;
 
 @WebServiceProvider(serviceName="SoapMessageProviderService",
-		wsdlLocation="META-INF/ProviderSOAPMessage.wsdl")
+		targetNamespace="http://soapmsg.provider.jaxws.axis2.apache.org",
+		wsdlLocation="META-INF/ProviderSOAPMessage.wsdl",
+		portName="SoapMessageProviderPort")
 @BindingType(SOAPBinding.SOAP11HTTP_BINDING)
 @ServiceMode(value=Service.Mode.MESSAGE)
 public class SoapMessageProvider implements Provider<SOAPMessage> {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message