Author: veithen
Date: Tue Jun 8 18:33:56 2010
New Revision: 952764
URL: http://svn.apache.org/viewvc?rev=952764&view=rev
Log:
Merged r944915 and r951385 to the 1.5 branch in order to support 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/builder/BuilderUtil.java
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
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/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:944347
+/axis/axis2/java/core/trunk:944347,944915,951385
/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
Modified:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=952764&r1=952763&r2=952764&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Tue Jun 8 18:33:56 2010
@@ -32,6 +32,7 @@ import org.apache.axiom.om.impl.MTOMCons
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.builder.XOPAwareStAXOMBuilder;
+import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
@@ -227,8 +228,11 @@ public class BuilderUtil {
public static StAXBuilder getPOXBuilder(InputStream inStream, String
charSetEnc)
throws XMLStreamException {
StAXBuilder builder;
+ // We use the StAXParserConfiguration.SOAP here as well because we
don't want to allow
+ // document type declarations (that potentially reference external
entities), even
+ // in plain XML messages.
XMLStreamReader xmlreader =
- StAXUtils.createXMLStreamReader(inStream, charSetEnc);
+ StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP,
inStream, charSetEnc);
builder = new StAXOMBuilder(xmlreader);
return builder;
}
Modified:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java?rev=952764&r1=952763&r2=952764&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
Tue Jun 8 18:33:56 2010
@@ -22,6 +22,7 @@ package org.apache.axis2.builder;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXBuilder;
+import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder;
@@ -51,7 +52,7 @@ public class MTOMBuilder implements Buil
String actualCharSetEncoding = BuilderUtil.getCharSetEncoding(pis,
charSetEncoding);
// Get the XMLStreamReader for this input stream
- streamReader = StAXUtils.createXMLStreamReader(pis,
actualCharSetEncoding);
+ streamReader =
StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP, pis,
actualCharSetEncoding);
StAXBuilder builder = new MTOMStAXSOAPModelBuilder(streamReader,
attachments);
SOAPEnvelope envelope = (SOAPEnvelope)
builder.getDocumentElement();
Modified:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java?rev=952764&r1=952763&r2=952764&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
Tue Jun 8 18:33:56 2010
@@ -21,6 +21,7 @@ package org.apache.axis2.builder;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXBuilder;
+import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -54,8 +55,14 @@ public class SOAPBuilder implements Buil
PushbackInputStream pis = BuilderUtil.getPushbackInputStream(is);
String actualCharSetEncoding = BuilderUtil.getCharSetEncoding(pis,
charSetEncoding);
- // Get the XMLStreamReader for this input stream
- streamReader = StAXUtils.createXMLStreamReader(pis,
actualCharSetEncoding);
+ // Get the XMLStreamReader for this input stream.
+ // Note: StAXSOAPModelBuilder will trigger an exception when it
encounters a DTD event.
+ // However, with StAX implementations other than Woodstox,
this may already be
+ // too late. For these parsers, additional settings may be
required. We let
+ // the StAX dialect detector in Axiom apply the necessary
configuration.
+ // See also AXIS2-4450.
+ streamReader =
StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP, pis,
+ actualCharSetEncoding);
StAXBuilder builder = new StAXSOAPModelBuilder(streamReader);
SOAPEnvelope envelope = (SOAPEnvelope)
builder.getDocumentElement();
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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385
/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347
+/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385
/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347
+/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385
/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/http/src:944347
+/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385
/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/transport/local:944347
+/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385
/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385
/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 18:33:56 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058
