You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2007/02/15 23:53:56 UTC
svn commit: r508221 - in /webservices/axis2/trunk/java/modules/jaxws:
src/org/apache/axis2/jaxws/message/ src/org/apache/axis2/jaxws/utility/
test/org/apache/axis2/jaxws/provider/
test/org/apache/axis2/jaxws/provider/soapmsg/
Author: scheu
Date: Thu Feb 15 14:53:55 2007
New Revision: 508221
URL: http://svn.apache.org/viewvc?view=rev&rev=508221
Log:
AXIS2-2196
Contributor: Rich Scheuerle
Quick fix to XMLFault in JAXWS, modified test, plus disable trace during test suite run.
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLFaultCode.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/SimpleServer.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/src/org/apache/axis2/jaxws/message/XMLFaultCode.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLFaultCode.java?view=diff&rev=508221&r1=508220&r2=508221
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLFaultCode.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLFaultCode.java Thu Feb 15 14:53:55 2007
@@ -98,6 +98,25 @@
String namespace = qName.getNamespaceURI();
String localPart = qName.getLocalPart();
XMLFaultCode xmlFaultCode= RECEIVER;
+ // Due to problems in the OM, sometimes that qname is not retrieved correctly.
+ // So use the localName to find the XMLFaultCode
+ if (localPart.equalsIgnoreCase("Sender")) { // SOAP 1.2
+ xmlFaultCode = SENDER;
+ } else if (localPart.equalsIgnoreCase("Receiver")) { // SOAP 1.2
+ xmlFaultCode = RECEIVER;
+ } else if (localPart.equalsIgnoreCase("Client")) { // SOAP 1.1
+ xmlFaultCode = SENDER;
+ } else if (localPart.equalsIgnoreCase("Server")) { // SOAP 1.1
+ xmlFaultCode = RECEIVER;
+ } else if (localPart.equalsIgnoreCase("MustUnderstand")) { // Both
+ xmlFaultCode = MUSTUNDERSTAND;
+ } else if (localPart.equalsIgnoreCase("DataEncodingUnknown")) { // SOAP 1.2
+ xmlFaultCode = DATAENCODINGUNKNOWN;
+ } else if (localPart.equalsIgnoreCase("VersionMismatch")) { // Both
+ xmlFaultCode = VERSIONMISMATCH;
+ }
+ /*
+ * TODO: Due to problems in the OM, sometimes that qname is not retrieved correctly.
if (namespace.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
// SOAP 1.2
if (localPart.equals("Sender")) {
@@ -123,6 +142,7 @@
xmlFaultCode = VERSIONMISMATCH;
}
}
+ */
return xmlFaultCode;
}
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/SimpleServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/SimpleServer.java?view=diff&rev=508221&r1=508220&r2=508221
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/SimpleServer.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/utility/SimpleServer.java Thu Feb 15 14:53:55 2007
@@ -68,7 +68,7 @@
}
public static void main(String[] args) throws Exception {
- org.apache.log4j.BasicConfigurator.configure();
+ //org.apache.log4j.BasicConfigurator.configure();
SimpleServer server = new SimpleServer();
server.start();
}
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?view=diff&rev=508221&r1=508220&r2=508221
==============================================================================
--- 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 15 14:53:55 2007
@@ -204,7 +204,8 @@
SOAPFault fault = e.getFault();
assertTrue(fault != null);
assertTrue(fault.getFaultString().equals("sample fault"));
- assertTrue(fault.getFaultCodeAsQName().getNamespaceURI().equals(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE));
+ QName expectedFaultCode = new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Client");
+ assertTrue(fault.getFaultCodeAsQName().equals(expectedFaultCode));
assertTrue(fault.getDetail() != null);
DetailEntry de = (DetailEntry) fault.getDetail().getDetailEntries().next();
assertTrue(de != null);
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?view=diff&rev=508221&r1=508220&r2=508221
==============================================================================
--- 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 15 14:53:55 2007
@@ -21,12 +21,14 @@
import java.io.InputStream;
import java.util.Iterator;
+import javax.xml.namespace.QName;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.Detail;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.Name;
import javax.xml.soap.Node;
import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPFactory;
import javax.xml.soap.SOAPFault;
@@ -325,6 +327,8 @@
SOAPMessage m = mf.createMessage();
SOAPBody body = m.getSOAPBody();
SOAPFault fault = body.addFault();
+ QName faultCode = new QName(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, "Client");
+ fault.setFaultCode(faultCode);
fault.setFaultString("sample fault");
Detail detail = fault.addDetail();
Name deName = sf.createName("detailEntry");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org