You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/08/07 06:50:13 UTC

svn commit: r230631 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis2/transport/http/ core/webapp/ integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/integration/ integration/test/org/apache/axis2/swa/ saaj/s...

Author: chinthaka
Date: Sat Aug  6 21:49:32 2005
New Revision: 230631

URL: http://svn.apache.org/viewcvs?rev=230631&view=rev
Log:
- Moving MTOM constants in MIME helper to MTOM constants
- removing redundant castings
- removing System.out and converted some printStackTraces to loggers

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
    webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp
    webservices/axis/trunk/java/modules/core/webapp/errorModule.jsp
    webservices/axis/trunk/java/modules/core/webapp/listSingleService.jsp
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
    webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
    webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java
    webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
    webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java
    webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
    webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MTOMConstants.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/BadInputTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Sat Aug  6 21:49:32 2005
@@ -47,6 +47,7 @@
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis2.om.impl.llom.mtom.MTOMStAXSOAPModelBuilder;
+import org.apache.axis2.om.impl.MTOMConstants;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
@@ -343,8 +344,8 @@
         /*
 		 * put a reference to Attachments in to the message context
 		 */
-        msgContext.setProperty(MIMEHelper.ATTACHMENTS, mimeHelper);
-        if (mimeHelper.getAttachmentSpecType().equals(MIMEHelper.MTOM_TYPE)) {
+        msgContext.setProperty(MTOMConstants.ATTACHMENTS, mimeHelper);
+        if (mimeHelper.getAttachmentSpecType().equals(MTOMConstants.MTOM_TYPE)) {
             /*
              * Creates the MTOM specific MTOMStAXSOAPModelBuilder
              */
@@ -354,7 +355,7 @@
                     mimeHelper,
                     SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         } else if (
-            mimeHelper.getAttachmentSpecType().equals(MIMEHelper.SWA_TYPE)) {
+            mimeHelper.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE)) {
             builder =
                 new StAXSOAPModelBuilder(
                     reader,

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Sat Aug  6 21:49:32 2005
@@ -143,14 +143,12 @@
                     faultContext.setProperty(HTTPConstants.HTTPOutTransportInfo,msgContext.getProperty(HTTPConstants.HTTPOutTransportInfo));
                     engine.sendFault(faultContext);
                 } else {
-                    log.error(e);
-                    e.printStackTrace();
+                    log.error(e,e);
                 }
             } catch (Exception e1) {
-                log.error(e1);
-                e1.printStackTrace();
+                log.error(e1.getMessage(), e1);
             }
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         } finally {
             if (socket != null) {
                 try {

Modified: webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp Sat Aug  6 21:49:32 2005
@@ -336,7 +336,7 @@
             call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
 
             OMElement result =
-                    (OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);
+                    call.invokeBlocking(operationName.getLocalPart(), payload);
             StringWriter writer = new StringWriter();
             result.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
             writer.flush();

Modified: webservices/axis/trunk/java/modules/core/webapp/errorModule.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/errorModule.jsp?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/errorModule.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/errorModule.jsp Sat Aug  6 21:49:32 2005
@@ -13,7 +13,7 @@
   <body>
   <%
       Hashtable errornessModules =(Hashtable)request.getSession().getAttribute(Constants.ERROR_MODULE_MAP);
-      String moduleName = (String)request.getParameter("moduleName");
+      String moduleName = request.getParameter("moduleName");
   %> <h3>The Module has deployment faults</h3><%
   %><font color="red" ><%=(String)errornessModules.get(moduleName) %></font><%
   %>

Modified: webservices/axis/trunk/java/modules/core/webapp/listSingleService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/listSingleService.jsp?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/listSingleService.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/listSingleService.jsp Sat Aug  6 21:49:32 2005
@@ -18,7 +18,7 @@
             String isFault = (String)request.getSession().getAttribute(Constants.IS_FAULTY);
             if(Constants.IS_FAULTY.equals(isFault)){
                 Hashtable errornessservices =(Hashtable)request.getSession().getAttribute(Constants.ERROR_SERVICE_MAP);
-                String servicName = (String)request.getParameter("serviceName");
+                String servicName = request.getParameter("serviceName");
                 %>
                     <h3>This Web service has deployment faults</h3><%
                      %><font color="red" ><%=(String)errornessservices.get(servicName) %></font>

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/CharctersetEncodingTest.java Sat Aug  6 21:49:32 2005
@@ -125,7 +125,7 @@
 			call.close();
 
 		} catch (AxisFault e) {
-			e.printStackTrace();
+			log.error(e,e);
 			assertFalse("Faliure in processing", true);
 		}
 	}

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/engine/HandlerFailureTest.java Sat Aug  6 21:49:32 2005
@@ -171,7 +171,6 @@
                             System.out));
             fail("the test must fail due to bad service Name");
         } catch (AxisFault e) {
-            e.printStackTrace();
             log.info(e.getMessage());
             String message = e.getMessage();
             assertTrue((message.indexOf(UtilServer.FAILURE_MESSAGE)) >= 0);

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Sat Aug  6 21:49:32 2005
@@ -88,8 +88,6 @@
                 count--;
             }
         } catch (AxisFault e) {
-
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Sat Aug  6 21:49:32 2005
@@ -25,6 +25,7 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.impl.llom.OMTextImpl;
+import org.apache.axis2.om.impl.MTOMConstants;
 
 /**
  * @version $Rev: $ $Date: $
@@ -33,7 +34,7 @@
 public class EchoSwA {
     private MessageContext msgcts;
     public EchoSwA() {
-    } 
+    }
 
     public void init(MessageContext msgcts) {
         this.msgcts = msgcts;
@@ -44,9 +45,9 @@
         OMElement child  = (OMElement)omEle.getFirstChild();
         OMAttribute attr = (OMAttribute)child.getFirstAttribute(new QName("href"));
         String contentID = attr.getValue();
-        MIMEHelper attachment = (MIMEHelper)msgcts.getProperty(MIMEHelper.ATTACHMENTS);
+        MIMEHelper attachment = (MIMEHelper)msgcts.getProperty(MTOMConstants.ATTACHMENTS);
         contentID = contentID.trim();
-        
+
         if (contentID.substring(0, 3).equalsIgnoreCase("cid")) {
             contentID = contentID.substring(4);
         }

Modified: webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java (original)
+++ webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java Sat Aug  6 21:49:32 2005
@@ -17,6 +17,8 @@
 
 import org.apache.axis2.om.impl.OMOutputImpl;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.xml.soap.AttachmentPart;
 import javax.xml.soap.SOAPBody;
@@ -39,12 +41,14 @@
     private SOAPPartImpl mSOAPPart;
     private java.util.Hashtable mProps = new java.util.Hashtable();
     private MimeHeaders headers;
+    private Log log = LogFactory.getLog(getClass());
+
 
     public SOAPMessageImpl(Object initialContents) {
         try {
             setup(initialContents, false, null, null, null);
         } catch (SOAPException e) {
-            e.printStackTrace();
+           log.error("Error in creating SOAPMessage", e);
         }
     }
 
@@ -58,7 +62,7 @@
                     null,
                     headers);
         } catch (SOAPException e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/PrefixesTest.java Sat Aug  6 21:49:32 2005
@@ -52,7 +52,6 @@
         msg.writeTo(baos);
 
         String xml = new String(baos.toByteArray());
-        System.out.println(xml);
         assertTrue(xml.indexOf("prefix1") != -1);
         assertTrue(xml.indexOf("prefix2") != -1);
         assertTrue(xml.indexOf("http://www.sun.com") != -1);

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPBodyTest.java Sat Aug  6 21:49:32 2005
@@ -98,9 +98,6 @@
             SOAPElement el = (SOAPElement) it.next();
             count++;
             Name name = el.getElementName();
-            System.out.println("Element:" + el);
-            System.out.println("BODY ELEMENT NAME:" + name.getPrefix() + ":"
-                    + name.getLocalName() + " " + name.getURI());
         }
         assertTrue(count == 1);
     }

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/SOAPFaultsTest.java Sat Aug  6 21:49:32 2005
@@ -144,12 +144,6 @@
             String string = fault.getFaultString();
             String actor = fault.getFaultActor();
 
-            System.out.println("SOAP fault contains: ");
-            System.out.println("    fault code = " + code);
-            System.out.println("    fault string = " + string);
-            if (actor != null) {
-                System.out.println("    fault actor = " + actor);
-            }
 
             detail = fault.getDetail();
             if (detail != null) {
@@ -157,7 +151,6 @@
                 while (it.hasNext()) {
                     entry = (DetailEntry) it.next();
                     String value = entry.getValue();
-                    System.out.println("    Detail entry = " + value);
                 }
             }
         }

Modified: webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java (original)
+++ webservices/axis/trunk/java/modules/saaj/test/org/apache/axis2/saaj/TextTest.java Sat Aug  6 21:49:32 2005
@@ -121,8 +121,7 @@
         SOAPElement postalCode = delivery.addChildElement(name);
         postalCode.addTextNode("PostalCode015");
 
-        System.out.println("The message is lll:\n");
-        message.writeTo(System.out);
+//        message.writeTo(System.out);
 
 	}
 

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java Sat Aug  6 21:49:32 2005
@@ -162,8 +162,6 @@
                                                                     elem =
                                                                             (OMElement) node;
                                                                     String str5 = elem.getLocalName();
-                                                                    System.out.println(
-                                                                            str5);
                                                                     if (str5.equals(
                                                                             "NavigableUrl")) {
                                                                         String txt = elem.getText();
@@ -190,12 +188,10 @@
                 }
             }
         }
-        System.out.println("Outside of loop");
         GUIHandler.showResults(strURL + endHTML);
     }
 
     public void reportError(Exception e) {
-        System.out.println("Error occured after responce is received");
         e.printStackTrace();
     }
 }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientCallbackHandler.java Sat Aug  6 21:49:32 2005
@@ -141,7 +141,6 @@
                                                 OMNode.ELEMENT_NODE) {
                                             elem = (OMElement) node;
                                             String str3 = elem.getLocalName();
-                                            System.out.println(str3);
                                             if (elem.getLocalName().equals(
                                                     "snippet")) {
                                                 //System.out.println("Got the snippet");

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/attachments/MIMEHelper.java Sat Aug  6 21:49:32 2005
@@ -21,28 +21,12 @@
 import javax.mail.internet.ParseException;
 
 import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.impl.MTOMConstants;
 
 /**
  * @author <a href="mailto:thilina@opensource.lk"> Thilina Gunarathne </a>
  */
 public class MIMEHelper {
-    /**
-     * if the Message is MTOM optimised then <code>MTOM_TYPE</code>
-     */
-    public static final String MTOM_TYPE = "application/xop+xml";
-
-    /**
-     * If the message is Soap with Attachments <code>SwA_TYPE</code>
-     */
-    public static final String SWA_TYPE = "text/xml";
-
-    /**
-     * <code>rootPart</code> is used as the key for the root BodyPart in the
-     * Parts HashMap
-     */
-    public static final String ROOT_PART = "SoapPart";
-
-    public static final String ATTACHMENTS = "Attachments";
 
     /**
      * <code>ContentType</code> of the MIME message
@@ -101,7 +85,7 @@
      *      read till first MIME boundary is found or end of stream reached.
      */
     public MIMEHelper(InputStream inStream, String contentTypeString,
-            boolean fileCacheEnable, String attachmentRepoDir)
+                      boolean fileCacheEnable, String attachmentRepoDir)
             throws OMException {
         this.attachmentRepoDir = attachmentRepoDir;
         this.fileCacheEnable = fileCacheEnable;
@@ -170,10 +154,10 @@
     public String getAttachmentSpecType() {
         if (this.applicationType == null) {
             applicationType = contentType.getParameter("type");
-            if (applicationType.equalsIgnoreCase(MTOM_TYPE)) {
-                this.applicationType = MTOM_TYPE;
-            } else if (applicationType.equalsIgnoreCase(SWA_TYPE)) {
-                this.applicationType = SWA_TYPE;
+            if (applicationType.equalsIgnoreCase(MTOMConstants.MTOM_TYPE)) {
+                this.applicationType = MTOMConstants.MTOM_TYPE;
+            } else if (applicationType.equalsIgnoreCase(MTOMConstants.SWA_TYPE)) {
+                this.applicationType = MTOMConstants.SWA_TYPE;
             } else {
                 throw new OMException(
                         "Invalid Application type. Support available for MTOM/SOAP 1.2 & SwA/SOAP 1.l only.");

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MTOMConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MTOMConstants.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MTOMConstants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/MTOMConstants.java Sat Aug  6 21:49:32 2005
@@ -22,4 +22,18 @@
     public static final String XOP_INCLUDE = "Include";
     public static final String XOP_NAMESPACE_URI = "http://www.w3.org/2004/08/xop/include";
 
+    /**
+     * if the Message is MTOM optimised then <code>MTOM_TYPE</code>
+     */
+    String MTOM_TYPE = "application/xop+xml";
+    /**
+     * If the message is Soap with Attachments <code>SwA_TYPE</code>
+     */
+    String SWA_TYPE = "text/xml";
+    /**
+     * <code>rootPart</code> is used as the key for the root BodyPart in the
+     * Parts HashMap
+     */
+    String ROOT_PART = "SoapPart";
+    String ATTACHMENTS = "Attachments";
 }

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/BadInputTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/BadInputTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/BadInputTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/BadInputTest.java Sat Aug  6 21:49:32 2005
@@ -132,31 +132,7 @@
 
     }
 
-    //    public void testAllMessagesInBadSOAP() throws OMException, Exception{
-    //           File dir = ;
-    //           File[] files = dir.listFiles();
-    //           
-    //           if(files != null){
-    //               for(int i = 0;i<files.length;i++){
-    //                   System.out.print(files[i] + "=");              
-    //                try {
-    //                       if(files[i].isFile() && files[i].getName().endsWith(".xml")){
-    //                           SOAPEnvelope soapEnvelope = (SOAPEnvelope) OMTestUtils.getOMBuilder(
-    //                                   files[i]).getDocumentElement();
-    //                           OMTestUtils.walkThrough(soapEnvelope);
-    //                       }
-    //                } catch (OMException e) {
-    //                    System.out.println(e);
-    //                }catch(AxisFault e){
-    //                    System.out.println(e);
-    //               }catch(Exception e){
-    //                    e.printStackTrace();
-    //                    fail("must failed gracefully with OMException or AxisFault");
-    //                    return;
-    //               }
-    //           }
-    //       }
-    //    }
+    
 
 
 }

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/CharacterEncodingTest.java Sat Aug  6 21:49:32 2005
@@ -88,8 +88,6 @@
 		
 		assertNotNull("No value for testParam param", result);
 		
-		System.out.println("\nResult: " + result);
-		
 		assertEquals("Expected result not received.", expected, result);
 	
 		

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java?rev=230631&r1=230630&r2=230631&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilderTest.java Sat Aug  6 21:49:32 2005
@@ -171,12 +171,7 @@
                     roleAttribute.getLocalName().equals(
                             SOAP12Constants.SOAP_ROLE));
             
-            System.out.println(roleAttribute.getValue().trim());
-            System.out.println(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI + "/" +
-                    SOAP12Constants.SOAP_ROLE +
-                    "/" +
-                    "ultimateReceiver");
-            
+
             assertTrue("SOAP 1.2 :- Role value mismatch",
                     roleAttribute.getValue().trim().equals(
                             SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI + "/" +