avar 2003/02/24 11:47:56
Modified: java/src/org/apache/axis/soap SOAP11Constants.java
SOAP12Constants.java SOAPConstants.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/test/soap12 TestEncodingStyle.java
java/test/soap TestHeaderAttrs.java
Log:
missed mustunderstand fault namespace
Revision Changes Path
1.10 +8 -0 xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java
Index: SOAP11Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP11Constants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SOAP11Constants.java 7 Jan 2003 19:41:58 -0000 1.9
+++ SOAP11Constants.java 24 Feb 2003 19:47:55 -0000 1.10
@@ -136,5 +136,13 @@
return Constants.FAULT_VERSIONMISMATCH;
}
+ /**
+ * Obtain the Qname of Mustunderstand fault code
+ */
+ public QName getMustunderstandFaultQName() {
+ return Constants.FAULT_MUSTUNDERSTAND;
+ }
+
+
}
1.12 +8 -0 xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java
Index: SOAP12Constants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAP12Constants.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SOAP12Constants.java 7 Feb 2003 18:02:56 -0000 1.11
+++ SOAP12Constants.java 24 Feb 2003 19:47:56 -0000 1.12
@@ -141,4 +141,12 @@
return Constants.FAULT_SOAP12_VERSIONMISMATCH;
}
+ /**
+ * Obtain the Qname of Mustunderstand fault code
+ */
+ public QName getMustunderstandFaultQName() {
+ return Constants.FAULT_SOAP12_MUSTUNDERSTAND;
+ }
+
+
}
1.11 +5 -0 xml-axis/java/src/org/apache/axis/soap/SOAPConstants.java
Index: SOAPConstants.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/soap/SOAPConstants.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SOAPConstants.java 7 Jan 2003 19:41:58 -0000 1.10
+++ SOAPConstants.java 24 Feb 2003 19:47:56 -0000 1.11
@@ -130,4 +130,9 @@
*/
public QName getVerMismatchFaultCodeQName();
+ /**
+ * Obtain the Qname of Mustunderstand fault code
+ */
+ public QName getMustunderstandFaultQName();
+
}
1.93 +7 -5 xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- SOAPService.java 25 Jan 2003 19:35:33 -0000 1.92
+++ SOAPService.java 24 Feb 2003 19:47:56 -0000 1.93
@@ -72,6 +72,7 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPHeaderElement;
import org.apache.axis.providers.BasicProvider;
+import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.utils.LockableHashtable;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.XMLUtils;
@@ -191,20 +192,21 @@
}
}
+ SOAPConstants soapConstants = msgContext.getSOAPConstants();
// !!! we should indicate SOAP1.2 compliance via the
// MessageContext, not a boolean here....
- boolean doMisunderstoodHeaders = true;
if (misunderstoodHeaders != null) {
AxisFault fault =
- new AxisFault(Constants.FAULT_MUSTUNDERSTAND,
- null,
- null, null);
+ new AxisFault(soapConstants.getMustunderstandFaultQName(),
+ null, null,
+ null, null,
+ null);
StringBuffer whatWasMissUnderstood= new StringBuffer(256);
// !!! If SOAP 1.2, insert misunderstood fault headers here
- if (doMisunderstoodHeaders) {
+ if (soapConstants == SOAPConstants.SOAP12_CONSTANTS) {
enum = misunderstoodHeaders.elements();
while (enum.hasMoreElements()) {
SOAPHeaderElement badHeader = (SOAPHeaderElement)enum.
1.2 +0 -1 xml-axis/java/test/soap12/TestEncodingStyle.java
Index: TestEncodingStyle.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/soap12/TestEncodingStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestEncodingStyle.java 16 Jan 2003 23:47:29 -0000 1.1
+++ TestEncodingStyle.java 24 Feb 2003 19:47:56 -0000 1.2
@@ -159,7 +159,6 @@
try {
SOAPEnvelope envelope = message.getSOAPEnvelope();
} catch (AxisFault af) {
- expectedFault = true;
return af.getFaultString().indexOf(expected_str) != -1 &&
expected_code.equals(af.getFaultCode());
}
1.11 +1 -1 xml-axis/java/test/soap/TestHeaderAttrs.java
Index: TestHeaderAttrs.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/soap/TestHeaderAttrs.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestHeaderAttrs.java 11 Dec 2002 22:40:18 -0000 1.10
+++ TestHeaderAttrs.java 24 Feb 2003 19:47:56 -0000 1.11
@@ -152,7 +152,7 @@
assertTrue("Non AxisFault Exception : " + e,
e instanceof AxisFault);
AxisFault fault = (AxisFault)e;
- assertEquals("Bad fault code!", Constants.FAULT_MUSTUNDERSTAND,
+ assertEquals("Bad fault code!",
soapVersion.getMustunderstandFaultQName(),
fault.getFaultCode());
return;
}
