You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by aj...@apache.org on 2005/08/22 16:36:40 UTC
svn commit: r234498 - in /webservices/axis/trunk/java/modules:
integration/test/org/apache/axis2/swa/EchoRawSwATest.java
xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
Author: ajith
Date: Mon Aug 22 07:36:18 2005
New Revision: 234498
URL: http://svn.apache.org/viewcvs?rev=234498&view=rev
Log:
The change to the serializers made some MTOM tests to fail. Now the OMTextImpl.java is modified to have the correct serilization mechanism
Modified:
webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=234498&r1=234497&r2=234498&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Mon Aug 22 07:36:18 2005
@@ -98,7 +98,7 @@
Socket socket = new Socket("127.0.0.1", 5555);
OutputStream outStream = socket.getOutputStream();
InputStream inStream = socket.getInputStream();
- InputStream requestMsgInStream = getResourceAsStream("org/apache/axis2/swa/swainput.bin");
+ InputStream requestMsgInStream = getResourceAsStream("/org/apache/axis2/swa/swainput.bin");
int data;
while ((data = requestMsgInStream.read()) != -1) {
System.out.print(data);
@@ -119,14 +119,14 @@
break;
}
}
+
assertTrue(sb.toString().indexOf(
"Apache Axis2 - The NExt Generation Web Services Engine") > 0);
assertTrue(sb.toString().indexOf("multipart/related") > 0);
}
private InputStream getResourceAsStream(String path) {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- return cl.getResourceAsStream(path);
+ return this.getClass().getResourceAsStream(path);
}
private void compareWithCreatedOMText(OMText actualTextData) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=234498&r1=234497&r2=234498&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Mon Aug 22 07:36:18 2005
@@ -649,7 +649,8 @@
//serialize children
Iterator children = this.getChildren();
while (children.hasNext()) {
- ((OMNode)children.next()).serializeWithCache(omOutput);
+ //A call to the Serialize or the serializeWithCache wont make a difference here
+ ((OMNode)children.next()).serialize(omOutput);
}
OMSerializerUtil.serializeEndpart(omOutput);
} else{
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=234498&r1=234497&r2=234498&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java Mon Aug 22 07:36:18 2005
@@ -164,7 +164,7 @@
public void serializeWithCache(
org.apache.axis2.om.impl.OMOutputImpl omOutput)
throws XMLStreamException {
- writeOutput(omOutput);
+ serializeLocal(omOutput);
}
@@ -290,7 +290,10 @@
public void serialize(org.apache.axis2.om.impl.OMOutputImpl omOutput)
throws XMLStreamException {
-
+ serializeLocal(omOutput);
+ }
+
+ private void serializeLocal(OMOutputImpl omOutput) throws XMLStreamException {
if (!this.isBinary) {
writeOutput(omOutput);
} else {