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 di...@apache.org on 2005/10/12 14:47:29 UTC
svn commit: r314867 - in /webservices/axis/trunk/java:
src/org/apache/axis/encoding/SerializationContext.java
test/saaj/TestSOAPFaults.java
Author: dims
Date: Wed Oct 12 05:47:25 2005
New Revision: 314867
URL: http://svn.apache.org/viewcvs?rev=314867&view=rev
Log:
Another location to check and disable Pretty XML. Creates problems with WSS4J in Signature Verification.
Modified:
webservices/axis/trunk/java/src/org/apache/axis/encoding/SerializationContext.java
webservices/axis/trunk/java/test/saaj/TestSOAPFaults.java
Modified: webservices/axis/trunk/java/src/org/apache/axis/encoding/SerializationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/src/org/apache/axis/encoding/SerializationContext.java?rev=314867&r1=314866&r2=314867&view=diff
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/encoding/SerializationContext.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/encoding/SerializationContext.java Wed Oct 12 05:47:25 2005
@@ -315,6 +315,8 @@
} else {
enableNamespacePrefixOptimization = JavaUtils.isTrue(AxisProperties.getProperty(AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,
"true"));
+ disablePrettyXML = JavaUtils.isTrue(AxisProperties.getProperty(AxisEngine.PROP_DISABLE_PRETTY_XML,
+ "true"));
}
// Set up preferred prefixes based on current schema, soap ver, etc.
Modified: webservices/axis/trunk/java/test/saaj/TestSOAPFaults.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/test/saaj/TestSOAPFaults.java?rev=314867&r1=314866&r2=314867&view=diff
==============================================================================
--- webservices/axis/trunk/java/test/saaj/TestSOAPFaults.java (original)
+++ webservices/axis/trunk/java/test/saaj/TestSOAPFaults.java Wed Oct 12 05:47:25 2005
@@ -18,6 +18,8 @@
import java.io.ByteArrayOutputStream;
import java.util.Iterator;
+import org.custommonkey.xmlunit.XMLUnit;
+
public class TestSOAPFaults extends AxisTestBase {
public TestSOAPFaults(String name) {
super(name);
@@ -45,7 +47,7 @@
String xml = new String(baos.toByteArray());
assertTrue(xml.indexOf("Hello")!=-1);
}
-
+
public void testSOAPFaultSaveChanges() throws Exception {
MessageFactory msgFactory =
MessageFactory.newInstance();
@@ -101,7 +103,7 @@
}
}
}
-
+
}
public void testAxis1432() throws Exception {
@@ -122,7 +124,7 @@
" </soapenv:Fault>\n" +
" </soapenv:Body>\n" +
"</soapenv:Envelope>";
-
+
MessageFactory fac = MessageFactory.newInstance();
SOAPMessage faultMessage = fac.createMessage();
@@ -161,7 +163,13 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
faultMessage.writeTo(baos);
String xml2 = new String(baos.toByteArray());
- assertXMLEqual(xml,xml2);
+ boolean ws = XMLUnit.getIgnoreWhitespace();
+ try {
+ XMLUnit.setIgnoreWhitespace(true);
+ assertXMLEqual(xml,xml2);
+ } finally {
+ XMLUnit.setIgnoreWhitespace(ws);
+ }
}
public static void main(String[] args) throws Exception {