svn commit: r1748104 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl: AttachmentsMimePartProvider.java SAAJConverterImpl.java

[veithen]

Author: veithen
Date: Mon Jun 13 07:26:52 2016
New Revision: 1748104

URL: http://svn.apache.org/viewvc?rev=1748104&view=rev
Log:
Eliminate usage of internal Axiom class.

Added:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java
      - copied, changed from r1748050, 
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java
Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java
 (from r1748050, 
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java&p1=webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java&r1=1748050&r2=1748104&rev=1748104&view=diff
==============================================================================
--- 
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java
 Mon Jun 13 07:26:52 2016
@@ -17,32 +17,31 @@
  * under the License.
  */
 
-package org.apache.axiom.om.impl.builder;
+package org.apache.axis2.jaxws.message.util.impl;
 
 import java.io.IOException;
 
 import javax.activation.DataHandler;
 
 import org.apache.axiom.attachments.Attachments;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
 
 /**
  * Adapts an {@link Attachments} instance to the {@link MimePartProvider} 
interface.
- * <p>
- * For internal use only.
  */
-public class AttachmentsMimePartProvider implements MimePartProvider, 
Detachable {
+final class AttachmentsMimePartProvider implements MimePartProvider {
     private final Attachments attachments;
 
     public AttachmentsMimePartProvider(Attachments attachments) {
         this.attachments = attachments;
     }
 
+    @Override
     public boolean isLoaded(String contentID) {
-        // TODO: implement this
-        return false;
+        return true;
     }
 
+    @Override
     public DataHandler getDataHandler(String contentID) throws IOException {
         DataHandler dh = attachments.getDataHandler(contentID);
         if (dh == null) {
@@ -51,8 +50,4 @@ public class AttachmentsMimePartProvider
             return dh;
         }
     }
-
-    public void detach() {
-        attachments.getAllContentIDs();
-    }
 }

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=1748104&r1=1748103&r2=1748104&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 Mon Jun 13 07:26:52 2016
@@ -25,7 +25,6 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.AttachmentsMimePartProvider;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;