You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/04/27 20:55:24 UTC
svn commit: r1331540 - in /axis/axis2/java/core/trunk/modules:
integration/test/org/apache/axis2/mtom/EchoService2.java
kernel/src/org/apache/axis2/builder/BuilderUtil.java
kernel/src/org/apache/axis2/builder/MIMEBuilder.java
Author: veithen
Date: Fri Apr 27 18:55:24 2012
New Revision: 1331540
URL: http://svn.apache.org/viewvc?rev=1331540&view=rev
Log:
Removed stuff deprecated several major releases ago.
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoService2.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoService2.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoService2.java?rev=1331540&r1=1331539&r2=1331540&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoService2.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoService2.java Fri Apr 27 18:55:24 2012
@@ -27,7 +27,6 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.context.MessageContext;
@@ -37,8 +36,7 @@ public class EchoService2 {
public OMElement mtomSample(OMElement element) throws Exception {
Attachments attachments = null;
- attachments = (Attachments)MessageContext.getCurrentMessageContext()
- .getProperty(MTOMConstants.ATTACHMENTS);
+ attachments = MessageContext.getCurrentMessageContext().getAttachmentMap();
// Get image data
IncomingAttachmentStreams streams = attachments.getIncomingAttachmentStreams();
IncomingAttachmentInputStream stream = streams.getNextStream();
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1331540&r1=1331539&r2=1331540&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Fri Apr 27 18:55:24 2012
@@ -462,10 +462,6 @@ public class BuilderUtil {
throw new XMLStreamException(e);
}
- // Put a reference to Attachments Map in to the message context For
- // backword compatibility with Axis2 1.0
- msgContext.setProperty(MTOMConstants.ATTACHMENTS, attachments);
-
// Setting the Attachments map to new SwA API
msgContext.setAttachmentMap(attachments);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java?rev=1331540&r1=1331539&r2=1331540&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java Fri Apr 27 18:55:24 2012
@@ -48,10 +48,6 @@ public class MIMEBuilder implements Buil
msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
charSetEncoding);
- // Put a reference to Attachments Map in to the message context For
- // backword compatibility with Axis2 1.0
- msgContext.setProperty(MTOMConstants.ATTACHMENTS, attachments);
-
// Setting the Attachments map to new SwA API
msgContext.setAttachmentMap(attachments);
// We set the following for all the MIME messages.. Will be overridden