Author: dims
Date: Wed Jul 11 14:32:31 2007
New Revision: 555404
URL: http://svn.apache.org/viewvc?view=rev&rev=555404
Log:
- Prevent NPE in SOAPBuilderHelper
- Special case for XMLNS_PREFIX since sjsxp does not seem to turn the correct
prefix for xml uri in OMSerializerUtil
- Check for xml being equal instead of explicit byte-by-byte in
OMSourcedElementTest
- add a new prefix in OMOutputTest since the same prefix was being used in 2
spots.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Wed Jul 11 14:32:31 2007
@@ -23,6 +23,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import javax.xml.namespace.NamespaceContext;
@@ -379,6 +380,9 @@
}
}
if (namespace != null) {
+ if(prefix == null && OMConstants.XMLNS_URI.equals(namespace)){
+ prefix = OMConstants.XMLNS_PREFIX;
+ }
// Qualified attribute
writer.writeAttribute(prefix, namespace,
attr.getLocalName(),
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAPBuilderHelper.java
Wed Jul 11 14:32:31 2007
@@ -43,8 +43,12 @@
protected void processNamespaceData(OMElement node, boolean
checkSOAPNamespace) {
int namespaceCount = parser.getNamespaceCount();
for (int i = 0; i < namespaceCount; i++) {
- node.declareNamespace(parser.getNamespaceURI(i),
- parser.getNamespacePrefix(i));
+ String nsp = parser.getNamespaceURI(i);
+ String prefix = parser.getNamespacePrefix(i);
+ if(nsp != null && prefix != null) {
+ node.declareNamespace(nsp,
+ prefix);
+ }
}
// set the own namespace
@@ -62,8 +66,6 @@
namespace = node.findNamespace(namespaceURI, prefix);
}
node.setNamespace(namespace);
- } else {
-
}
// TODO we got to have this to make sure OM reject mesagess that are
not name space qualified
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/AbstractTestCase.java
Wed Jul 11 14:32:31 2007
@@ -23,9 +23,11 @@
import java.io.File;
+import org.custommonkey.xmlunit.XMLTestCase;
+
/** Abstract base class for test cases. */
public abstract class AbstractTestCase
- extends TestCase {
+ extends XMLTestCase {
protected String testDir = "test" + File.separator;
protected String sampleDir = "samples" + File.separator;
protected String outDir = "target" + File.separator + "generated" +
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
Wed Jul 11 14:32:31 2007
@@ -73,7 +73,7 @@
OMElement data = new OMElementImpl("data", dataName, fac);
OMNamespaceImpl mime = new OMNamespaceImpl(
- "http://www.w3.org/2003/06/xmlmime";, "m");
+ "http://www.w3.org/2003/06/xmlmime";, "mime");
OMElement text = new OMElementImpl("name", dataName, fac);
OMAttribute cType1 = new OMAttributeImpl("contentType", mime,
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMSourcedElementTest.java
Wed Jul 11 14:32:31 2007
@@ -139,12 +139,12 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
element.serialize(bos);
String newText = new String(bos.toByteArray());
- assertEquals("Serialized text error", testDocument, newText);
+ assertXMLEqual("Serialized text error", testDocument, newText);
assertTrue("Element not expanded when serializing",
element.isExpanded());
bos = new ByteArrayOutputStream();
element.serialize(bos);
- assertEquals("Serialized text error", testDocument,
+ assertXMLEqual("Serialized text error", testDocument,
new String(bos.toByteArray()));
assertTrue("Element not expanded when serializing",
element.isExpanded());
}
@@ -171,13 +171,13 @@
StringWriter writer = new StringWriter();
element.serialize(writer);
String result = writer.toString();
- assertEquals("Serialized text error", testDocument, result);
+ assertXMLEqual("Serialized text error", testDocument, result);
assertTrue("Element not expanded when serializing",
element.isExpanded());
writer = new StringWriter();
element.serialize(writer);
result = writer.toString();
- assertEquals("Serialized text error", testDocument, result);
+ assertXMLEqual("Serialized text error", testDocument, result);
assertTrue("Element not expanded when serializing",
element.isExpanded());
}
@@ -190,7 +190,7 @@
StringWriter writer = new StringWriter();
element.serializeAndConsume(writer);
String result = writer.toString();
- assertEquals("Serialized text error", testDocument, result);
+ assertXMLEqual("Serialized text error", testDocument, result);
assertFalse("Element expansion when serializing",
element.isExpanded());
}
@@ -204,14 +204,14 @@
XMLStreamWriter xmlwriter =
XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
element.serialize(writer);
xmlwriter.flush();
- assertEquals("Serialized text error", testDocument, writer.toString());
+ assertXMLEqual("Serialized text error", testDocument,
writer.toString());
assertTrue("Element not expanded when serializing",
element.isExpanded());
writer = new StringWriter();
xmlwriter =
XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
element.serialize(writer);
xmlwriter.flush();
- assertEquals("Serialized text error", testDocument, writer.toString());
+ assertXMLEqual("Serialized text error", testDocument,
writer.toString());
assertTrue("Element not expanded when serializing",
element.isExpanded());
}
@@ -225,7 +225,7 @@
XMLStreamWriter xmlwriter =
XMLOutputFactory.newInstance().createXMLStreamWriter(writer);
element.serializeAndConsume(writer);
xmlwriter.flush();
- assertEquals("Serialized text error", testDocument, writer.toString());
+ assertXMLEqual("Serialized text error", testDocument,
writer.toString());
assertFalse("Element expansion when serializing",
element.isExpanded());
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java?view=diff&rev=555404&r1=555403&r2=555404
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
Wed Jul 11 14:32:31 2007
@@ -35,7 +35,9 @@
public void testConversion() {
try {
InputStream is = new FileInputStream(soap11FaulXmlPath);
- XMLStreamReader reader =
XMLInputFactory.newInstance().createXMLStreamReader(is);
+ XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+ xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE,
Boolean.TRUE) ;
+ XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(is);
SOAPEnvelope env = new StAXSOAPModelBuilder(reader,
null).getSOAPEnvelope();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
