Author: veithen
Date: Tue Jun 8 05:54:37 2010
New Revision: 952542
URL: http://svn.apache.org/viewvc?rev=952542&view=rev
Log:
Merged r803725 to the 1.5 branch to make SAAJ compile with Axiom 1.2.9.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,834058
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,834058
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,834058
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058
Modified:
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=952542&r1=952541&r2=952542&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Tue Jun 8 05:54:37 2010
@@ -80,19 +80,9 @@ public class SOAPElementImpl extends Nod
element.discard();
}
- /* (non-Javadoc)
- */
- public void internalSerialize(javax.xml.stream.XMLStreamWriter writer)
- throws XMLStreamException {
- element.internalSerialize(writer);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.axiom.om.OMNode#serializeAndConsume(org.apache.axiom.om.impl.OMOutputImpl)
- */
- public void internalSerializeAndConsume(javax.xml.stream.XMLStreamWriter
writer)
+ public void internalSerialize(javax.xml.stream.XMLStreamWriter writer,
boolean cache)
throws XMLStreamException {
- element.internalSerializeAndConsume(writer);
+ element.internalSerialize(writer, cache);
}
/**
Modified:
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=952542&r1=952541&r2=952542&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Tue Jun 8 05:54:37 2010
@@ -246,14 +246,9 @@ public class TextImplEx extends NodeImpl
textNode.discard();
}
- public void internalSerialize(javax.xml.stream.XMLStreamWriter writer)
+ public void internalSerialize(javax.xml.stream.XMLStreamWriter writer,
boolean cache)
throws XMLStreamException {
- textNode.internalSerialize(writer);
- }
-
- public void internalSerializeAndConsume(javax.xml.stream.XMLStreamWriter
writer)
- throws XMLStreamException {
- textNode.internalSerializeAndConsume(writer);
+ textNode.internalSerialize(writer, cache);
}
/**
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,834058
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,834058
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/transport/local:771051,801630,834058
+/webservices/axis2/trunk/java/modules/transport/local:771051,801630,803725,834058
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,834058
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,803725,834058
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 05:54:37 2010
@@ -1 +1 @@
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,834058
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058
