Author: veithen
Date: Mon Nov 12 23:21:38 2018
New Revision: 1846473
URL: http://svn.apache.org/viewvc?rev=1846473&view=rev
Log:
Backport fix for AXIOM-492 (r1846368) to the 1.2 branch.
Added:
webservices/axiom/branches/1.2.x/systests/jaxws-tests/
- copied from r1846368, webservices/axiom/trunk/systests/jaxws-tests/
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/systests/jaxws-tests/pom.xml
webservices/axiom/branches/1.2.x/systests/jaxws-tests/src/test/java/MTOMTest.java
webservices/axiom/branches/1.2.x/systests/pom.xml
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 23:21:38 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1844631,1845037,1845623,1846359,1846362
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1844631,1845037,1845623,1846359,1846362,1846368
Modified:
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java?rev=1846473&r1=1846472&r2=1846473&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
(original)
+++
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
Mon Nov 12 23:21:38 2018
@@ -31,10 +31,12 @@ import javax.xml.transform.sax.SAXSource
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
import org.apache.axiom.mime.ContentType;
+import org.apache.axiom.mime.MediaType;
import org.apache.axiom.om.impl.builder.AttachmentsMimePartProvider;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
+import org.apache.axiom.soap.SOAPVersion;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.w3c.dom.EntityReference;
import org.w3c.dom.Node;
@@ -640,11 +642,16 @@ public class OMXMLBuilderFactory {
} catch (ParseException ex) {
throw new OMException(ex);
}
- String type = contentType.getParameter("type");
+ MediaType type;
+ try {
+ type = new
ContentType(contentType.getParameter("type")).getMediaType();
+ } catch (ParseException ex) {
+ throw new OMException("Failed to parse root part content type",
ex);
+ }
SOAPFactory soapFactory;
- if ("text/xml".equalsIgnoreCase(type)) {
+ if (type.equals(SOAPVersion.SOAP11.getMediaType())) {
soapFactory = metaFactory.getSOAP11Factory();
- } else if ("application/soap+xml".equalsIgnoreCase(type)) {
+ } else if (type.equals(SOAPVersion.SOAP12.getMediaType())) {
soapFactory = metaFactory.getSOAP12Factory();
} else {
throw new OMException("Unable to determine SOAP version");
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1846473&r1=1846472&r2=1846473&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Nov 12 23:21:38 2018
@@ -546,6 +546,16 @@
<artifactId>asm</artifactId>
<version>5.2</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>9.4.12.v20180830</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -755,6 +765,11 @@
<version>0.1</version>
</plugin>
<plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>wsimport-maven-plugin</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.7</version>
Modified: webservices/axiom/branches/1.2.x/systests/jaxws-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/systests/jaxws-tests/pom.xml?rev=1846473&r1=1846368&r2=1846473&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/systests/jaxws-tests/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/systests/jaxws-tests/pom.xml Mon Nov 12
23:21:38 2018
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>systests</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.22-SNAPSHOT</version>
</parent>
<artifactId>jaxws-tests</artifactId>
Modified:
webservices/axiom/branches/1.2.x/systests/jaxws-tests/src/test/java/MTOMTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/systests/jaxws-tests/src/test/java/MTOMTest.java?rev=1846473&r1=1846368&r2=1846473&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/systests/jaxws-tests/src/test/java/MTOMTest.java
(original)
+++
webservices/axiom/branches/1.2.x/systests/jaxws-tests/src/test/java/MTOMTest.java
Mon Nov 12 23:21:38 2018
@@ -28,7 +28,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.ws.BindingProvider;
import javax.xml.ws.soap.MTOMFeature;
-import org.apache.axiom.mime.MultipartBody;
+import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
@@ -60,11 +60,8 @@ public class MTOMTest {
@Override
protected void doPost(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
- MultipartBody mp = MultipartBody.builder()
- .setInputStream(request.getInputStream())
- .setContentType(request.getContentType())
- .build();
- OMXMLBuilderFactory.createSOAPModelBuilder(mp);
+ Attachments attachments = new
Attachments(request.getInputStream(), request.getContentType());
+ OMXMLBuilderFactory.createSOAPModelBuilder(attachments);
SOAPFactory factory = OMAbstractFactory.getSOAP12Factory();
SOAPMessage message = factory.createDefaultSOAPMessage();
OMElement responseElement = factory.createOMElement(
Modified: webservices/axiom/branches/1.2.x/systests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/systests/pom.xml?rev=1846473&r1=1846472&r2=1846473&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/systests/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/systests/pom.xml Mon Nov 12 23:21:38 2018
@@ -34,6 +34,7 @@
<modules>
<module>cross-om-tests</module>
<module>eclipse-tests</module>
+ <module>jaxws-tests</module>
<module>jboss-tests</module>
<module>old-tests</module>
<module>osgi-tests</module>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 23:21:38 2018
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1846362
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1846362,1846368
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml?rev=1846473&r1=1846472&r2=1846473&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
(original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml Mon
Nov 12 23:21:38 2018
@@ -54,12 +54,10 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
