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 2017/02/02 23:39:30 UTC
svn commit: r1781489 - in /webservices/axiom/branches/1.2.x: ./
axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Author: veithen
Date: Thu Feb 2 23:39:29 2017
New Revision: 1781489
URL: http://svn.apache.org/viewvc?rev=1781489&view=rev
Log:
Merge r1781488 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 2 23:39:29 2017
@@ -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
+/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,1781488
Modified: webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java?rev=1781489&r1=1781488&r2=1781489&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java (original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java Thu Feb 2 23:39:29 2017
@@ -500,6 +500,8 @@ public class OMOutputFormat {
*
* @return the current factory; if none has been set explicitly, an
* {@link AxiomMultipartWriterFactory} instance is returned
+ *
+ * @deprecated
*/
public MultipartWriterFactory getMultipartWriterFactory() {
return multipartWriterFactory == null
@@ -513,6 +515,8 @@ public class OMOutputFormat {
*
* @param multipartWriterFactory
* the factory
+ *
+ * @deprecated
*/
public void setMultipartWriterFactory(MultipartWriterFactory multipartWriterFactory) {
this.multipartWriterFactory = multipartWriterFactory;