Return-Path: 
 <axis-cvs-return-7942-apmail-ws-axis-cvs-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org
Received: (qmail 79911 invoked from network); 2 Aug 2005 03:22:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Aug 2005 03:22:41 -0000
Received: (qmail 24235 invoked by uid 500); 2 Aug 2005 03:22:40 -0000
Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org
Received: (qmail 23959 invoked by uid 500); 2 Aug 2005 03:22:38 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 23946 invoked by uid 99); 2 Aug 2005 03:22:38 -0000
X-ASF-Spam-Status: No, hits=-9.7 required=10.0
	tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 01 Aug 2005 20:22:23 -0700
Received: (qmail 79664 invoked by uid 65534); 2 Aug 2005 03:22:21 -0000
Message-ID: <20050802032221.79663.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r226930 [2/2] - in /webservices/axis/trunk/java/modules:
 addressing/ addressing/test-resources/ common/src/org/apache/axis2/
 core/src/org/apache/axis2/ core/src/org/apache/axis2/clientapi/
 core/src/org/apache/axis2/context/ core/src/org/apa...
Date: Tue, 02 Aug 2005 03:22:08 -0000
To: axis-cvs@ws.apache.org
From: hemapani@apache.org
X-Mailer: svnmailer-1.0.3
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Mon Aug  1 20:18:04 2005
@@ -16,8 +16,8 @@
 
 package org.apache.axis2.engine;
 
-import org.apache.axis2.AxisFault;
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.ServiceDescription;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Mon Aug  1 20:18:04 2005
@@ -1,16 +1,17 @@
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
 import junit.framework.TestCase;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.description.ModuleDescription;
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.phaseresolver.PhaseException;
-import org.apache.axis2.AxisFault;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Mon Aug  1 20:18:04 2005
@@ -166,11 +166,15 @@
                 <exclude>**/*InteropStubTest.java</exclude>
                 <exclude>**/*EchoRawXMLChunckedTest.java</exclude>
                 <exclude>**org/apache/axis2/mail/*.java</exclude>
-                <exclude>**/*CallUnregisteredServiceTest.java</exclude>
-		<exclude>**/*SoapProcessingModelTest.java</exclude>
-		<exclude>**/*HandlerFailureTest.java</exclude>
+                
+                <exclude>**/OneWayRawXMLTest.java</exclude>
+                <exclude>**/*EchoRawMTOMTest.java</exclude>
+                <exclude>**/*EchoRawMTOMLoadTest.java</exclude>
+                <exclude>**/*EchoRawMTOMToBase64Test.java</exclude>
+                <exclude>**/*MTOMCommonsChunkingTest.java</exclude>
+         
                 <!--
-		<exclude>**/*SOAP12Test.java</exclude>
+         		<exclude>**/*SOAP12Test.java</exclude>
                 <exclude>**/*SOAP12TestWithFaults.java</exclude>
                 <exclude>**/*FaultHandlingTest.java</exclude>
                 

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientUtil.java Mon Aug  1 20:18:04 2005
@@ -46,7 +46,7 @@
      *
      * @return msgContext
      */
-    public static MessageContext getMessageContext() {
+    public static MessageContext getMessageContext() throws AxisFault {
         OMNamespace namespace, nulNS;
         OMElement operation, value1, value2;
         OMElement subValue1, subValue2, subValue3, subValue4, subValue5;

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java Mon Aug  1 20:18:04 2005
@@ -47,7 +47,7 @@
      */
     public static MessageContext getMessageContext(
             AsynchronousClient asyncClient)
-            throws DeploymentException {
+            throws AxisFault {
         OMNamespace defNs;
         OMElement operation;
         MessageContext msgContext = null;

Modified: webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Mon Aug  1 20:18:04 2005
@@ -1,33 +1,33 @@
 package sample.groovy;
 
-import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
-import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.i18n.Messages;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyObject;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
+import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.impl.OMOutputImpl;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
 import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.AxisFault;
-import org.codehaus.groovy.control.CompilationFailedException;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.io.ByteArrayInputStream;
-
-import groovy.lang.GroovyObject;
-import groovy.lang.GroovyClassLoader;
+import org.apache.axis2.soap.SOAPFactory;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -52,78 +52,92 @@
  * Date: Jul 14, 2005
  * Time: 3:13:03 PM
  */
-public class GroovyReceiver  extends AbstractInOutSyncMessageReceiver
-        implements MessageReceiver{
-
-    public void invokeBusinessLogic(MessageContext inMessage, MessageContext outMessage) throws AxisFault {
-        ServiceDescription service =
-                inMessage.getOperationContext().getServiceContext().getServiceConfig();
-        Parameter implInfoParam = service.getParameter("ServiceClass");
-        if (implInfoParam==null){
-            throw new AxisFault(Messages.getMessage("paramIsNotSpecified","ServiceClass"));
-        }
-        InputStream groovyFileStream = this.getClass().getResourceAsStream(implInfoParam.getValue().toString());
-
-        //look at the method name. if available this should be a groovy method
-        OperationDescription op = inMessage.getOperationContext().getAxisOperation();
-        if (op == null) {
-            throw new AxisFault(Messages.getMessage("notFound","Operation"));
-        }
-        String methodName = op.getName().getLocalPart();
-        OMElement firstChild = (OMElement)inMessage.getEnvelope().getBody().getFirstChild();
-        inMessage.getEnvelope().build();
+public class GroovyReceiver
+    extends AbstractInOutSyncMessageReceiver
+    implements MessageReceiver {
+
+    public void invokeBusinessLogic(
+        MessageContext inMessage,
+        MessageContext outMessage)
+        throws AxisFault {
         try {
+            ServiceDescription service =
+                inMessage
+                    .getOperationContext()
+                    .getServiceContext()
+                    .getServiceConfig();
+            Parameter implInfoParam = service.getParameter("ServiceClass");
+            if (implInfoParam == null) {
+                throw new AxisFault(
+                    Messages.getMessage("paramIsNotSpecified", "ServiceClass"));
+            }
+            InputStream groovyFileStream =
+                this.getClass().getResourceAsStream(
+                    implInfoParam.getValue().toString());
+
+            //look at the method name. if available this should be a groovy method
+            OperationDescription op =
+                inMessage.getOperationContext().getAxisOperation();
+            if (op == null) {
+                throw new AxisFault(
+                    Messages.getMessage("notFound", "Operation"));
+            }
+            String methodName = op.getName().getLocalPart();
+            OMElement firstChild =
+                (OMElement) inMessage.getEnvelope().getBody().getFirstChild();
+            inMessage.getEnvelope().build();
             StringWriter writer = new StringWriter();
             firstChild.build();
-            firstChild.serializeWithCache(new OMOutputImpl(XMLOutputFactory.newInstance().createXMLStreamWriter(writer)));
+            firstChild.serializeWithCache(
+                new OMOutputImpl(
+                    XMLOutputFactory.newInstance().createXMLStreamWriter(
+                        writer)));
             writer.flush();
             String value = writer.toString();
-            if (value !=null) {
-                try {
-                    InputStream in = new ByteArrayInputStream(value.getBytes());
-                    GroovyClassLoader loader = new GroovyClassLoader();
-                    Class groovyClass = loader.parseClass(groovyFileStream);
-                    GroovyObject groovyObject = (GroovyObject) groovyClass.newInstance();
-                    Object[] arg = {in};
-                    Object obj =groovyObject.invokeMethod(methodName, arg );
-                    if (obj==null){
-                        throw new AxisFault(Messages.getMessage("groovryNoanswer"));
-                    }
-
-                    SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
-                    SOAPEnvelope envelope = fac.getDefaultEnvelope();
-
-                    OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
-                    OMElement responseElement = fac.createOMElement(methodName + "Response", ns);
-                    String outMessageString =   obj.toString();
-                   // System.out.println("outMessageString = " + outMessageString);
-                   // responseElement.setText(outMessageString);
-                    responseElement.addChild(getpayLoad(outMessageString));
-                    envelope.getBody().addChild(responseElement);
-                    outMessage.setEnvelope(envelope);
-                } catch (CompilationFailedException e) {
-                    throw new AxisFault(e);
-                } catch (InstantiationException e) {
-                    throw new AxisFault(e);
-                } catch (IllegalAccessException e) {
-                    throw new AxisFault(e);
+            if (value != null) {
+                InputStream in = new ByteArrayInputStream(value.getBytes());
+                GroovyClassLoader loader = new GroovyClassLoader();
+                Class groovyClass = loader.parseClass(groovyFileStream);
+                GroovyObject groovyObject =
+                    (GroovyObject) groovyClass.newInstance();
+                Object[] arg = { in };
+                Object obj = groovyObject.invokeMethod(methodName, arg);
+                if (obj == null) {
+                    throw new AxisFault(Messages.getMessage("groovryNoanswer"));
+                }
+                
+                SOAPFactory fac = null;
+                if(inMessage.isSOAP11()){
+                    fac = OMAbstractFactory.getSOAP11Factory();
+                }else{
+                    fac = OMAbstractFactory.getSOAP12Factory();
                 }
+                SOAPEnvelope envelope = fac.getDefaultEnvelope();
+                OMNamespace ns =
+                    fac.createOMNamespace("http://soapenc/", "res");
+                OMElement responseElement =
+                    fac.createOMElement(methodName + "Response", ns);
+                String outMessageString = obj.toString();
+                // System.out.println("outMessageString = " + outMessageString);
+                // responseElement.setText(outMessageString);
+                responseElement.addChild(getpayLoad(outMessageString));
+                envelope.getBody().addChild(responseElement);
+                outMessage.setEnvelope(envelope);
             }
-        } catch (XMLStreamException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-
+        } catch (Exception e) {
+            throw new AxisFault(e);
+        } 
     }
 
     private OMElement getpayLoad(String str) throws XMLStreamException {
-        XMLStreamReader xmlReader=  XMLInputFactory.newInstance().createXMLStreamReader(new
-                ByteArrayInputStream(str.getBytes()));
+        XMLStreamReader xmlReader =
+            XMLInputFactory.newInstance().createXMLStreamReader(
+                new ByteArrayInputStream(str.getBytes()));
         OMFactory fac = OMAbstractFactory.getOMFactory();
 
-        StAXOMBuilder staxOMBuilder = new
-                StAXOMBuilder(fac,(XMLStreamReader) xmlReader);
-        return   staxOMBuilder.getDocumentElement();
+        StAXOMBuilder staxOMBuilder =
+            new StAXOMBuilder(fac, (XMLStreamReader) xmlReader);
+        return staxOMBuilder.getDocumentElement();
     }
-
 
 }

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/imagetransfer/client/MTOMClientModel.java Mon Aug  1 20:18:04 2005
@@ -15,8 +15,14 @@
  */
 package sample.mtom.imagetransfer.client;
 
+import java.awt.Image;
+import java.io.File;
+import java.io.FileInputStream;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.attachments.utils.ImageDataSource;
 import org.apache.axis2.attachments.utils.JDK13IO;
@@ -27,12 +33,6 @@
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.OMText;
 
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import java.awt.*;
-import java.io.File;
-import java.io.FileInputStream;
-
 
 public class MTOMClientModel {
     private File inputFile = null;
@@ -83,7 +83,7 @@
         call.setTo(targetEPR);
         // enabling MTOM in the client side
         call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-        call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,
+        call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP, false);
         OMElement result = (OMElement) call.invokeBlocking(operationName
                 .getLocalPart(),

Modified: webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/mtom/interop/client/InteropClientModel.java Mon Aug  1 20:18:04 2005
@@ -22,7 +22,6 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -66,7 +65,7 @@
         call.setTo(targetEPR);
         // enabling MTOM in the client side
         call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-        call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,
+        call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP, false);
         OMElement result = (OMElement) call.invokeBlocking(operationName
                 .getLocalPart(),

Modified: webservices/axis/trunk/java/modules/samples/src/sample/yahooservices/RESTSearch/RESTSearchClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/yahooservices/RESTSearch/RESTSearchClient.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/yahooservices/RESTSearch/RESTSearchClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/yahooservices/RESTSearch/RESTSearchClient.java Mon Aug  1 20:18:04 2005
@@ -1,18 +1,16 @@
 package sample.yahooservices.RESTSearch;
 
-import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.AddressingConstants;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.impl.OMOutputImpl;
 
 
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.XMLOutputFactory;
-
-
 /**
  * Created by IntelliJ IDEA.
  * User: saminda
@@ -30,7 +28,7 @@
         try{
             Call call = new Call();
             call.setTo(new EndpointReference(eprGet));
-            call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,Constants.TRANSPORT_HTTP, false);
+            call.setTransportInfo(Constants.TRANSPORT_HTTP,Constants.TRANSPORT_HTTP, false);
             call.setDoREST(true);
             call.setRestThroughPOST(false);
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CallUnregisteredServiceTest.java Mon Aug  1 20:18:04 2005
@@ -18,10 +18,12 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.context.MessageContext;
@@ -36,8 +38,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-
 public class CallUnregisteredServiceTest extends TestCase {
     private Log log = LogFactory.getLog(getClass());
     private QName serviceName = new QName("", "EchoXMLService");
@@ -101,7 +101,7 @@
             fail("The test must fail due to wrong service Name");
 
         } catch (AxisFault e) {
-            assertTrue(e.getMessage().indexOf("Service Not found") > 0);
+            assertTrue(e.getMessage().indexOf("Service Not found") >= 0);
             tearDown();
             return;
         }

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/CommonsHTTPEchoRawXMLTest.java Mon Aug  1 20:18:04 2005
@@ -18,10 +18,12 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
@@ -37,8 +39,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-
 public class CommonsHTTPEchoRawXMLTest extends TestCase {
     private EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
@@ -91,7 +91,7 @@
                 Constants.TESTING_PATH + "commons-http-enabledRepository");
 
         call.setTo(targetEPR);
-        call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,
+        call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP,
                 false);
 
@@ -135,7 +135,7 @@
                 Constants.TESTING_PATH + "commons-http-enabledRepository");
 
         call.setTo(targetEPR);
-        call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,
+        call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP,
                 false);
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLChunckedTest.java Mon Aug  1 20:18:04 2005
@@ -18,9 +18,11 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -33,8 +35,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class EchoRawXMLChunckedTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLLoadTest.java Mon Aug  1 20:18:04 2005
@@ -18,9 +18,11 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -33,8 +35,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class EchoRawXMLLoadTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsSyncTest.java Mon Aug  1 20:18:04 2005
@@ -16,9 +16,11 @@
 
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -33,8 +35,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class EchoRawXMLOnTwoChannelsSyncTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLOnTwoChannelsTest.java Mon Aug  1 20:18:04 2005
@@ -16,10 +16,12 @@
 
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
@@ -36,8 +38,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class EchoRawXMLOnTwoChannelsTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/EchoRawXMLTest.java Mon Aug  1 20:18:04 2005
@@ -18,10 +18,12 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
@@ -36,8 +38,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class EchoRawXMLTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/FaultHandlingTest.java Mon Aug  1 20:18:04 2005
@@ -1,6 +1,15 @@
 package org.apache.axis2.engine;
 
+import java.io.File;
+import java.io.FileReader;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
@@ -18,13 +27,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.File;
-import java.io.FileReader;
-
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
  *
@@ -47,25 +49,20 @@
     private EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
             + (UtilServer.TESTING_PORT)
-//            + ("5556")
+
             + "/axis/services/EchoXMLService/echoOMElement");
     private Log log = LogFactory.getLog(getClass());
     private QName operationName = new QName("echoOMElement");
 
     protected String testResourceDir = "test-resources";
-    MyInOutMEPClient inOutMEPClient;
+    private MyInOutMEPClient inOutMEPClient;
 
 
     private boolean finish = false;
 
-    protected void setUp() {
-        try {
+    protected void setUp() throws Exception {
             UtilServer.start();
             inOutMEPClient = getMyInOutMEPClient();
-        } catch (Exception e) {
-            log.info(e.getMessage());
-        }
-
     }
 
     public void testTwoHeadersSOAPMessage() throws AxisFault, XMLStreamException {
@@ -115,17 +112,11 @@
         assertNotNull(fault.getReason().getText());
     }
 
-    private SOAPEnvelope getResponse(SOAPEnvelope inEnvelope) {
-        try {
+    private SOAPEnvelope getResponse(SOAPEnvelope inEnvelope) throws AxisFault {
             inOutMEPClient.setExceptionToBeThrownOnSOAPFault(false);
             SOAPEnvelope result =
                     inOutMEPClient.invokeBlockingWithEnvelopeOut(operationName.getLocalPart(), inEnvelope);
             return result;
-        } catch (AxisFault axisFault) {
-            log.info(axisFault.getMessage());
-            fail("Something wrong in getting the response from " + operationName.getLocalPart() + " service");
-        }
-        return null;
     }
 
     private SOAPEnvelope getTwoHeadersSOAPEnvelope(SOAPFactory fac) {

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/HandlerFailureTest.java Mon Aug  1 20:18:04 2005
@@ -18,10 +18,13 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.Flow;
@@ -34,14 +37,10 @@
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-
 
 public class HandlerFailureTest extends TestCase {
     private Log log = LogFactory.getLog(getClass());
@@ -52,10 +51,8 @@
     private static final String ADDRESS = "http://127.0.0.1:" +
             (UtilServer.TESTING_PORT) +
             "/axis/services/" + SERVICE_NAME + "/" + OPERATION_NAME;
-//    private static final String ADDRESS = "http://127.0.0.1:8080/axis/services/" + SERVICE_NAME;
     private EndpointReference targetEPR = new EndpointReference(ADDRESS);
     private QName serviceName = new QName("", SERVICE_NAME);
-    //private QName serviceName = new QName("", targetEPR.getValue());
 
     private QName operationName = new QName(OPERATION_NAME);
 
@@ -174,9 +171,10 @@
                             System.out));
             fail("the test must fail due to bad service Name");
         } catch (AxisFault e) {
+            e.printStackTrace();
             log.info(e.getMessage());
-            assertTrue(
-                    (e.getMessage().indexOf(UtilServer.FAILURE_MESSAGE)) > 0);
+            String message = e.getMessage();
+            assertTrue((message.indexOf(UtilServer.FAILURE_MESSAGE)) >= 0);
             return;
         }
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/MessageWithServerTest.java Mon Aug  1 20:18:04 2005
@@ -18,7 +18,16 @@
 
 //todo
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.net.Socket;
+
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.ModuleDescription;
 import org.apache.axis2.description.OperationDescription;
@@ -28,13 +37,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.net.Socket;
 
 public class MessageWithServerTest extends TestCase {
     private Log log = LogFactory.getLog(getClass());

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/OneWayRawXMLTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/OneWayRawXMLTest.java Mon Aug  1 20:18:04 2005
@@ -18,10 +18,12 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.MessageSender;
 import org.apache.axis2.context.MessageContext;
@@ -35,8 +37,6 @@
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class OneWayRawXMLTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SOAPversionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SOAPversionTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SOAPversionTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SOAPversionTest.java Mon Aug  1 20:18:04 2005
@@ -1,9 +1,12 @@
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -22,9 +25,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDescriptionBuilderTest.java Mon Aug  1 20:18:04 2005
@@ -1,17 +1,18 @@
 package org.apache.axis2.engine;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Iterator;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.description.AxisDescWSDLComponentFactory;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
-import org.apache.wsdl.WSDLDescription;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.Iterator;
+import org.apache.wsdl.WSDLDescription;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDispatchingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDispatchingTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDispatchingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/ServiceDispatchingTest.java Mon Aug  1 20:18:04 2005
@@ -18,9 +18,11 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -34,8 +36,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class ServiceDispatchingTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler.java Mon Aug  1 20:18:04 2005
@@ -16,13 +16,13 @@
 
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class SpeakingHandler extends AbstractHandler implements Handler {
     private Log log = LogFactory.getLog(getClass());

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler1.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler1.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/SpeakingHandler1.java Mon Aug  1 20:18:04 2005
@@ -16,16 +16,16 @@
 
 package org.apache.axis2.engine;
 
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
-import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
 
 public class SpeakingHandler1 extends AbstractHandler implements Handler {
     private Log log = LogFactory.getLog(getClass());

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/chuncking-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/chuncking-enabled-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/chuncking-enabled-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/chuncking-enabled-axis2.xml Mon Aug  1 20:18:04 2005
@@ -41,7 +41,7 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender">
+    <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding" locked="xsd:false">chunked</parameter>
     </transportSender>

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Mon Aug  1 20:18:04 2005
@@ -33,19 +33,13 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender">
-        <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="xsd:false">chunked</parameter>
-    </transportSender>
-
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 
-    <transportSender name="commons-http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+    <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="xsd:false">HTTP/1.1</parameter>
         <parameter name="Transfer-Encoding" locked="xsd:false">chunked</parameter>
     </transportSender>
-
 
     <!-- ================================================= -->
     <!-- Global Modules  -->

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-axis2.xml Mon Aug  1 20:18:04 2005
@@ -40,7 +40,7 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender"/>
+
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml Mon Aug  1 20:18:04 2005
@@ -40,7 +40,7 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender"/>
+
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml Mon Aug  1 20:18:04 2005
@@ -40,7 +40,7 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender"/>
+
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Mon Aug  1 20:18:04 2005
@@ -28,14 +28,11 @@
 import junit.framework.TestCase;
 
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.attachments.utils.ImageDataSource;
 import org.apache.axis2.attachments.utils.JDK13IO;
-import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -44,7 +41,6 @@
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.impl.llom.OMTextImpl;
-import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
@@ -122,7 +118,7 @@
                 Constants.TESTING_PATH + "commons-http-enabledRepository");
         call.setTo(targetEPR);
         call.set(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
-        call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP,
+        call.setTransportInfo(Constants.TRANSPORT_HTTP,
                 Constants.TRANSPORT_HTTP, false);
         call.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         OMElement result = call.invokeBlocking(operationName

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Mon Aug  1 20:18:04 2005
@@ -20,16 +20,21 @@
  * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
  */
 
+import java.awt.Image;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.attachments.utils.ImageDataSource;
 import org.apache.axis2.attachments.utils.JDK13IO;
-import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -43,12 +48,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import java.awt.*;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 
 public class EchoRawMTOMTest extends TestCase {
     private EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:"

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml Mon Aug  1 20:18:04 2005
@@ -45,7 +45,8 @@
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="http" class="org.apache.axis2.transport.http.HTTPTransportSender"/>
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+    </transportSender>
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/swa/EchoRawSwATest.java Mon Aug  1 20:18:04 2005
@@ -20,37 +20,25 @@
  * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
  */
 
+import java.io.InputStream;
+import java.net.Socket;
+
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.attachments.utils.ImageDataSource;
-import org.apache.axis2.attachments.utils.JDK13IO;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.impl.llom.OMTextImpl;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.transport.http.HTTPTransportSender;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
-import java.awt.*;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.Socket;
 
 public class EchoRawSwATest extends TestCase {
     private EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:"

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/OMOutputImpl.java Mon Aug  1 20:18:04 2005
@@ -24,8 +24,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
+
 
 /**
  * For the moment this assumes that transport takes the decision of whether
@@ -41,9 +44,16 @@
     private String mimeBoundary = null;
     private String rootContentId = null;
     private int nextid = 0;
+    private boolean isSoap11 = true;
 
+    /**
+     * Field DEFAULT_CHAR_SET_ENCODING specifies the default 
+     * character encoding scheme to be used
+     */
+    private static final String DEFAULT_CHAR_SET_ENCODING = "utf-8";
+
+    private String charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
     private String xmlVersion = OMConstants.DEFAULT_XML_VERSION;
-    private String charSetEncoding = OMConstants.DEFAULT_CHAR_SET_ENCODING;
     private boolean ignoreXMLDeclaration = false;
 
 
@@ -63,38 +73,44 @@
      * @throws FactoryConfigurationError
      */
     public OMOutputImpl(OutputStream outStream, boolean doOptimize)
-            throws XMLStreamException, FactoryConfigurationError {
+        throws XMLStreamException, FactoryConfigurationError {
         setOutputStream(outStream, doOptimize);
     }
-    
 
+    public void setOutputStream(OutputStream outStream, boolean doOptimize)
+        throws XMLStreamException, FactoryConfigurationError {
 
-    public void setOutputStream(OutputStream outStream, boolean doOptimize) throws XMLStreamException,
-			FactoryConfigurationError {
+        this.doOptimize = doOptimize;
+        this.outStream = outStream;
 
-		this.doOptimize = doOptimize;
-		this.outStream = outStream;
+        if (charSetEncoding == null) //Default encoding is UTF-8
+            this.charSetEncoding = DEFAULT_CHAR_SET_ENCODING;
 
-		if (charSetEncoding == null) //Default encoding is UTF-8
-			this.charSetEncoding = OMConstants.DEFAULT_CHAR_SET_ENCODING;
-
-		if (doOptimize) {
-			bufferedSoapOutStream = new ByteArrayOutputStream();
-			xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(
-					bufferedSoapOutStream, this.charSetEncoding);
-			binaryNodeList = new LinkedList();
-		} else {
-			xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(
-					outStream, this.charSetEncoding);
-		}
-	}
+        if (doOptimize) {
+            bufferedSoapOutStream = new ByteArrayOutputStream();
+            xmlWriter =
+                XMLOutputFactory.newInstance().createXMLStreamWriter(
+                    bufferedSoapOutStream,
+                    this.charSetEncoding);
+            binaryNodeList = new LinkedList();
+        } else {
+            xmlWriter =
+                XMLOutputFactory.newInstance().createXMLStreamWriter(
+                    outStream,
+                    this.charSetEncoding);
+        }
+    }
 
     public void flush() throws XMLStreamException {
         xmlWriter.flush();
         if (doOptimize) {
-            MIMEOutputUtils.complete(outStream, bufferedSoapOutStream,
-                    binaryNodeList, getMimeBoundary(), getRootContentId(), 
-					this.charSetEncoding);
+            MIMEOutputUtils.complete(
+                outStream,
+                bufferedSoapOutStream,
+                binaryNodeList,
+                getMimeBoundary(),
+                getRootContentId(),
+                this.charSetEncoding);
         }
     }
 
@@ -102,10 +118,27 @@
         return doOptimize;
     }
 
-    public String getOptimizedContentType() {
-		return MIMEOutputUtils.getContentTypeForMime(getMimeBoundary(),
-				getRootContentId(), this.getCharSetEncoding());
-	}
+    public String getContentType() {
+
+        if (isOptimized()) {
+            return MIMEOutputUtils.getContentTypeForMime(
+                getMimeBoundary(),
+                getRootContentId(),
+                this.getCharSetEncoding());
+        } else {
+
+            StringBuffer buf = new StringBuffer();
+            if (!isSoap11) {
+                buf.append(SOAP12Constants.SOAP_12_CONTENT_TYPE);
+                buf.append("; charset=" + this.getCharSetEncoding());
+            } else {
+                buf.append(SOAP11Constants.SOAP_11_CONTENT_TYPE)
+                    .append("; charset=" + this.getCharSetEncoding());
+            }
+            return buf.toString();
+        }
+
+    }
 
     public void writeOptimized(OMText node) {
         binaryNodeList.add(node);
@@ -120,37 +153,41 @@
     }
 
     public String getMimeBoundary() {
-		if (mimeBoundary == null) {
-			mimeBoundary = "MIMEBoundary"
-					+ MIMEOutputUtils.getRandomStringOf18Characters();
-		}
-		return mimeBoundary;
-	}
-
-	public String getRootContentId() {
-		if (rootContentId == null) {
-			rootContentId = "0."
-					+ MIMEOutputUtils.getRandomStringOf18Characters()
-					+ "@apache.org";
-		}
-		return rootContentId;
-	}
-
-	public String getNextContentId() {
-		nextid++;
-		return nextid + "." + MIMEOutputUtils.getRandomStringOf18Characters()
-				+ "@apache.org";
-	}
-    
+        if (mimeBoundary == null) {
+            mimeBoundary =
+                "MIMEBoundary"
+                    + MIMEOutputUtils.getRandomStringOf18Characters();
+        }
+        return mimeBoundary;
+    }
+
+    public String getRootContentId() {
+        if (rootContentId == null) {
+            rootContentId =
+                "0."
+                    + MIMEOutputUtils.getRandomStringOf18Characters()
+                    + "@apache.org";
+        }
+        return rootContentId;
+    }
+
+    public String getNextContentId() {
+        nextid++;
+        return nextid
+            + "."
+            + MIMEOutputUtils.getRandomStringOf18Characters()
+            + "@apache.org";
+    }
+
     /**
-	 * Returns the character set endocing scheme If the value of the
-	 * charSetEncoding is not set then the default will be returned
-	 * 
-	 * @return
-	 */
-	public String getCharSetEncoding() {
-		return this.charSetEncoding;
-	}
+     * Returns the character set endocing scheme If the value of the
+     * charSetEncoding is not set then the default will be returned
+     * 
+     * @return
+     */
+    public String getCharSetEncoding() {
+        return this.charSetEncoding;
+    }
 
     public void setCharSetEncoding(String charSetEncoding) {
         this.charSetEncoding = charSetEncoding;
@@ -164,6 +201,13 @@
         this.xmlVersion = xmlVersion;
     }
 
+    /**
+     * @param b
+     */
+    public void setSoap11(boolean b) {
+        isSoap11 = b;
+    }
+
     public boolean isIgnoreXMLDeclaration() {
         return ignoreXMLDeclaration;
     }
@@ -171,5 +215,6 @@
     public void ignoreXMLDeclaration(boolean ignoreXMLDeclaration) {
         this.ignoreXMLDeclaration = ignoreXMLDeclaration;
     }
+
 
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=226930&r1=226929&r2=226930&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Mon Aug  1 20:18:04 2005
@@ -15,21 +15,31 @@
  */
 package org.apache.axis2.soap.impl.llom;
 
-import org.apache.axis2.om.*;
+import java.io.StringWriter;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis2.om.OMConstants;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMXMLParserWrapper;
 import org.apache.axis2.om.impl.llom.OMElementImpl;
 import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
-import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.soap.SOAPFault;
+import org.apache.axis2.soap.SOAPFaultCode;
+import org.apache.axis2.soap.SOAPFaultDetail;
+import org.apache.axis2.soap.SOAPFaultNode;
+import org.apache.axis2.soap.SOAPFaultReason;
+import org.apache.axis2.soap.SOAPFaultRole;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Iterator;
-
 /**
  * Class SOAPFaultImpl
  */
@@ -130,7 +140,7 @@
 
         OMElement exceptionElement = getDetail().getFirstChildWithName(
                 new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
-        if (exceptionElement != null) {
+        if (exceptionElement != null && exceptionElement.getText() != null) {
             return new Exception(exceptionElement.getText());
         }
         return null;
@@ -138,8 +148,8 @@
 
     protected void putExceptionToSOAPFault(Exception e) throws SOAPProcessingException {
         StringWriter sw = new StringWriter();
-        log.info(e.getMessage());
-
+        sw.write(e.getMessage());
+        sw.flush();
         getDetail();
         if (getDetail() == null) {
             setDetail(getNewSOAPFaultDetail(this));