You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/11/12 08:28:14 UTC
svn commit: r1846379 - in /webservices/axiom/branches/1.2.x: ./ pom.xml
samples/pom.xml
samples/src/test/java/org/apache/axiom/samples/MTOMSample.java
Author: veithen
Date: Mon Nov 12 08:28:14 2018
New Revision: 1846379
URL: http://svn.apache.org/viewvc?rev=1846379&view=rev
Log:
Merge r1846359 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/samples/pom.xml
webservices/axiom/branches/1.2.x/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 08:28:14 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,1843075,1843517,1845037,1845623,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,1843075,1843517,1845037,1845623,1846359,1846362
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1846379&r1=1846378&r2=1846379&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Nov 12 08:28:14 2018
@@ -512,14 +512,9 @@
<version>1.10.19</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.2.6</version>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: webservices/axiom/branches/1.2.x/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/samples/pom.xml?rev=1846379&r1=1846378&r2=1846379&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/samples/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/samples/pom.xml Mon Nov 12 08:28:14 2018
@@ -71,13 +71,8 @@
support seems to be broken (or at least to have to behave differently).
To avoid that problem, we use CXF as the JAX-WS implementation. -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: webservices/axiom/branches/1.2.x/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java?rev=1846379&r1=1846378&r2=1846379&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java (original)
+++ webservices/axiom/branches/1.2.x/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java Mon Nov 12 08:28:14 2018
@@ -52,14 +52,14 @@ public class MTOMSample extends TestCase
OMElement fileId = soapFactory.createOMElement(new QName("fileId"), retrieveContent);
fileId.setText(id);
- // Use the java.net.URL API to connect to the service
+ // Use the java.net.URL API to connect to the service and send the request
URLConnection connection = serviceURL.openConnection();
connection.setDoOutput(true);
- connection.addRequestProperty("Content-Type", "text/xml; charset=UTF-8");
- OutputStream out = connection.getOutputStream();
- // Send the request
OMOutputFormat format = new OMOutputFormat();
+ format.setDoOptimize(true);
format.setCharSetEncoding("UTF-8");
+ connection.addRequestProperty("Content-Type", format.getContentType());
+ OutputStream out = connection.getOutputStream();
request.serialize(out, format);
out.close();