axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r498056 [1/3] - in /webservices/axis2/trunk/java/modules: jaxws/src/org/apache/axis2/jaxws/binding/ jaxws/src/org/apache/axis2/jaxws/client/ jaxws/src/org/apache/axis2/jaxws/client/async/ jaxws/src/org/apache/axis2/jaxws/client/proxy/ jaxws...
Date Sat, 20 Jan 2007 03:25:45 GMT
Author: scheu
Date: Fri Jan 19 19:25:43 2007
New Revision: 498056

URL: http://svn.apache.org/viewvc?view=rev&rev=498056
Log:
AXIS2-1976
Contributor: Mike Rheinheimer
Remove MessageException and MessageInternalException

Removed:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java
Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/BaseDispatch.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatchAsyncListener.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/impl/AsyncListener.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Block.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Message.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Protocol.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/BlockFactory.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/MessageFactory.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/XMLPartFactory.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartBase.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartFactoryImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLPartImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpine.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLStreamReaderForXMLSpine.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/Reader.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/SAAJConverter.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/SAAJFactory.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/SOAPBinding.java Fri Jan 19 19:25:43 2007
@@ -22,8 +22,8 @@
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFactory;
+import javax.xml.ws.WebServiceException;
 
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.util.SAAJFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -68,10 +68,10 @@
                 bindingNamespace = SOAP11_ENV_NS;
             }
             return SAAJFactory.createMessageFactory(bindingNamespace);
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO log it and then what?
             if(log.isDebugEnabled()){
-                log.debug("MessageException calling SAAJFactory.createMessageFactory(\""+bindingNamespace+"\")");
+                log.debug("WebServiceException calling SAAJFactory.createMessageFactory(\""+bindingNamespace+"\")");
             }
         } catch (SOAPException e) {
             // TODO log it and then what?
@@ -114,10 +114,10 @@
                 bindingNamespace = SOAP11_ENV_NS;
             }
             return SAAJFactory.createSOAPFactory(bindingNamespace);
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO log it and then what?
             if(log.isDebugEnabled()){
-                log.debug("MessageException calling SAAJFactory.createSOAPFactory(\""+bindingNamespace+"\")");
+                log.debug("WebServiceException calling SAAJFactory.createSOAPFactory(\""+bindingNamespace+"\")");
             }
         } catch (SOAPException e) {
             // TODO log it and then what?

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/BaseDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/BaseDispatch.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/BaseDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/BaseDispatch.java Fri Jan 19 19:25:43 2007
@@ -43,7 +43,6 @@
 import org.apache.axis2.jaxws.description.EndpointDescription;
 import org.apache.axis2.jaxws.marshaller.impl.alt.MethodMarshallerUtils;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.XMLFault;
 import org.apache.axis2.jaxws.spi.ServiceDelegate;
 import org.apache.commons.logging.Log;
@@ -127,19 +126,16 @@
             MessageContext responseMsgCtx = invocationContext.getResponseMessageContext();
             
             Message responseMsg = responseMsgCtx.getMessage();
-            try {
-                if (responseMsg.isFault()) {
-                    XMLFault fault = responseMsg.getXMLFault();
-                    // 4.3.2 conformance bullet 1 requires a ProtocolException here
-                    ProtocolException pe = MethodMarshallerUtils.createSystemException(responseMsg.getXMLFault(), responseMsg);
-                    throw  pe;
-                }
-                else if (responseMsgCtx.getLocalException() != null) {
-                    // use the factory, it'll throw the right thing:
-                    throw ExceptionFactory.makeWebServiceException(responseMsgCtx.getLocalException());
-                }
-            } catch (MessageException e) {
-                throw ExceptionFactory.makeWebServiceException(e);
+            
+            if (responseMsg.isFault()) {
+                XMLFault fault = responseMsg.getXMLFault();
+                // 4.3.2 conformance bullet 1 requires a ProtocolException here
+                ProtocolException pe = MethodMarshallerUtils.createSystemException(responseMsg.getXMLFault(), responseMsg);
+                throw  pe;
+            }
+            else if (responseMsgCtx.getLocalException() != null) {
+                // use the factory, it'll throw the right thing:
+                throw ExceptionFactory.makeWebServiceException(responseMsgCtx.getLocalException());
             }
             
             Object returnObj = getValueFromMessage(responseMsg);

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatch.java Fri Jan 19 19:25:43 2007
@@ -21,6 +21,7 @@
 import javax.xml.soap.SOAPMessage;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.Service.Mode;
 
 import org.apache.axiom.om.OMElement;
@@ -29,7 +30,6 @@
 import org.apache.axis2.jaxws.description.EndpointDescription;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
@@ -86,8 +86,6 @@
     			blockFactoryType = getBlockFactory();
     			return createEmptyMessage(Protocol.getProtocolForBinding(endpointDesc.getClientBindingID()));
     			
-    		}catch(MessageException e){
-    			throw ExceptionFactory.makeWebServiceException(e);
     		}catch(XMLStreamException e){
     			throw ExceptionFactory.makeWebServiceException(e);
     		}
@@ -252,7 +250,7 @@
         }
         return null;
     }
-    private Message createEmptyMessage(Protocol protocol)throws MessageException, XMLStreamException{
+    private Message createEmptyMessage(Protocol protocol)throws WebServiceException, XMLStreamException{
     	MessageFactory mf = (MessageFactory) FactoryRegistry.getFactory(MessageFactory.class);
     	Message m = mf.create(protocol);
     	return m;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatchAsyncListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatchAsyncListener.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatchAsyncListener.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/XMLDispatchAsyncListener.java Fri Jan 19 19:25:43 2007
@@ -2,6 +2,7 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.Service.Mode;
 
 import org.apache.axiom.om.OMElement;
@@ -9,7 +10,6 @@
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.factory.SOAPEnvelopeBlockFactory;
 import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory;
@@ -51,7 +51,7 @@
                 BlockFactory factory = (BlockFactory) FactoryRegistry.getFactory(blockFactoryType);
                 Block block = message.getBodyBlock(0, null, factory);
                 value = block.getBusinessObject(true);
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 e.printStackTrace();
             } catch (XMLStreamException e) {
                 e.printStackTrace();
@@ -76,7 +76,7 @@
 
                     value = block.getBusinessObject(true);
                 }
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 e.printStackTrace();
             } catch (XMLStreamException e) {
                 e.printStackTrace();

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java Fri Jan 19 19:25:43 2007
@@ -26,12 +26,12 @@
 import java.util.concurrent.TimeoutException;
 
 import javax.xml.ws.Response;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -167,13 +167,9 @@
         if (log.isDebugEnabled()) {
             log.debug("Demarshalling response message as a String");
         }
-        try {
-            Message msg = mc.getMessage();
-            OMElement om = msg.getAsOMElement();
-            return om.toString();
-        } catch (MessageException e) {
-            throw ExceptionFactory.makeWebServiceException(e);
-        }
+        Message msg = mc.getMessage();
+        OMElement om = msg.getAsOMElement();
+        return om.toString();
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncUtils.java Fri Jan 19 19:25:43 2007
@@ -18,10 +18,11 @@
  */
 package org.apache.axis2.jaxws.client.async;
 
+import javax.xml.ws.WebServiceException;
+
 import org.apache.axis2.client.async.AsyncResult;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.util.Constants;
 import org.apache.axis2.util.ThreadContextMigratorUtil;
 import org.apache.commons.logging.Log;
@@ -31,7 +32,7 @@
 
     private static final Log log = LogFactory.getLog(AsyncUtils.class);
     
-    public static MessageContext createMessageContext(AsyncResult result) throws MessageException {
+    public static MessageContext createMessageContext(AsyncResult result) throws WebServiceException {
         boolean debug = log.isDebugEnabled();
         MessageContext response = null;
         

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java Fri Jan 19 19:25:43 2007
@@ -24,11 +24,11 @@
 import java.util.concurrent.FutureTask;
 
 import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axis2.client.async.AsyncResult;
 import org.apache.axis2.client.async.Callback;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -69,7 +69,7 @@
         MessageContext response = null;
         try {
             response = AsyncUtils.createMessageContext(result);
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             cft.setError(e);
             if (debug) {
                 log.debug("An error occured while processing the async response.  " + e.getMessage());

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/async/PollingFuture.java Fri Jan 19 19:25:43 2007
@@ -18,10 +18,11 @@
  */
 package org.apache.axis2.jaxws.client.async;
 
+import javax.xml.ws.WebServiceException;
+
 import org.apache.axis2.client.async.AsyncResult;
 import org.apache.axis2.client.async.Callback;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -45,7 +46,7 @@
         MessageContext responseMsgCtx = null;
         try {
             responseMsgCtx = AsyncUtils.createMessageContext(result);
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             response.onError(e);
             if (debug) {
                 log.debug("An error occured while processing the async response.  " + e.getMessage());

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java Fri Jan 19 19:25:43 2007
@@ -128,7 +128,7 @@
                 if (debug) {
 				    log.debug("An error occured while invoking the method: " + e.getMessage());
                 }
-                throw ExceptionFactory.makeMessageException(e);
+                throw ExceptionFactory.makeWebServiceException(e);
 			}			
 		}
 		else {

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java Fri Jan 19 19:25:43 2007
@@ -21,13 +21,13 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.Service.Mode;
 
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.jaxws.description.OperationDescription;
 import org.apache.axis2.jaxws.description.ServiceDescription;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.util.MessageUtils;
 
 /**
@@ -62,7 +62,7 @@
         properties = new HashMap<String, Object>();
     }
     
-    public MessageContext(org.apache.axis2.context.MessageContext mc) throws MessageException {
+    public MessageContext(org.apache.axis2.context.MessageContext mc) throws WebServiceException {
         properties = new HashMap<String, Object>();
         
         if (mc != null) {

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java Fri Jan 19 19:25:43 2007
@@ -51,7 +51,6 @@
 import org.apache.axis2.jaxws.description.OperationDescription;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
 import org.apache.axis2.jaxws.message.util.MessageUtils;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
@@ -362,8 +361,8 @@
             if (log.isDebugEnabled()) {
                 log.debug("Properties: " + axisRequestMsgCtx.getProperties().toString());
             }
-        } catch (MessageException e) {
-            throw ExceptionFactory.makeWebServiceException(Messages.getMessage("prepareRequestFail"), e);
+        } catch (WebServiceException e) {
+            throw ExceptionFactory.makeWebServiceException(Messages.getMessage("prepareRequestFail"));
         } catch (AxisFault e) {
             throw ExceptionFactory.makeWebServiceException(Messages.getMessage("prepareRequestFail"), e);
         }
@@ -491,7 +490,7 @@
             op.setMessageReceiver(new CallbackReceiver());
     }
     
-    private Message createMessageFromOM(OMElement om) throws MessageException {
+    private Message createMessageFromOM(OMElement om) throws WebServiceException {
         try {
             MessageFactory mf = (MessageFactory) FactoryRegistry.getFactory(MessageFactory.class);
             Message msg = mf.createFrom(om);

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java Fri Jan 19 19:25:43 2007
@@ -16,10 +16,11 @@
  */
 package org.apache.axis2.jaxws.core.util;
 
+import javax.xml.ws.WebServiceException;
+
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.util.MessageContextBuilder;
 
 /**
@@ -51,8 +52,6 @@
             
             return newMC;
         } catch (AxisFault e) {
-            throw ExceptionFactory.makeWebServiceException(e);
-        } catch (MessageException e) {
             throw ExceptionFactory.makeWebServiceException(e);
         }
     }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/handler/SoapMessageContext.java Fri Jan 19 19:25:43 2007
@@ -22,11 +22,11 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 
 /**
  * The SOAPMessageContext is the context handed to SOAP-based application
@@ -51,12 +51,8 @@
     }
 
     public SOAPMessage getMessage(){
-    	try{
-    		Message msg = getMessageObject();
-    		return msg.getAsSOAPMessage();
-    	}catch(MessageException e){
-    		throw ExceptionFactory.makeWebServiceException(e);
-    	}
+        Message msg = getMessageObject();
+        return msg.getAsSOAPMessage();
     }
 
     public Set<URI> getRoles() {

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/impl/AsyncListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/impl/AsyncListener.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/impl/AsyncListener.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/impl/AsyncListener.java Fri Jan 19 19:25:43 2007
@@ -18,6 +18,7 @@
 
 import java.util.concurrent.Callable;
 
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.Service.Mode;
 
 import org.apache.axiom.om.OMElement;
@@ -27,7 +28,6 @@
 import org.apache.axis2.jaxws.core.InvocationContext;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 
 /**
  * The AsyncListener is responsible for holding the callback that was passed
@@ -100,12 +100,8 @@
      * @param msg
      */
     protected Object getResponseValueObject(MessageContext mc) {
-        try {
-            Message msg = mc.getMessage();
-            OMElement om = msg.getAsOMElement();
-            return om.toString();
-        } catch (MessageException e) {
-            throw ExceptionFactory.makeWebServiceException(e);
-        }
+        Message msg = mc.getMessage();
+        OMElement om = msg.getAsOMElement();
+        return om.toString();
     }
 }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitBareMethodMarshallerImpl.java Fri Jan 19 19:25:43 2007
@@ -32,7 +32,6 @@
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.marshaller.MethodParameter;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -115,7 +114,7 @@
 		}
         
     }
-	private ArrayList<MethodParameter> createParameterForSEIMethod(Message message, OperationDescription operationDesc)throws IllegalAccessException, InstantiationException, ClassNotFoundException, MessageException, XMLStreamException, JAXBException{
+	private ArrayList<MethodParameter> createParameterForSEIMethod(Message message, OperationDescription operationDesc)throws IllegalAccessException, InstantiationException, ClassNotFoundException, WebServiceException, XMLStreamException, JAXBException{
 	    ArrayList<MethodParameter> mps = new ArrayList<MethodParameter>();
 	    if(message == null){
 	        return null;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/DocLitWrappedMethodMarshallerImpl.java Fri Jan 19 19:25:43 2007
@@ -34,7 +34,6 @@
 import org.apache.axis2.jaxws.marshaller.MethodParameter;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
@@ -260,16 +259,16 @@
      * @param jaxbElement object representing the element to marshal (JAXBElement or object has @XmlRootElement)
      * @return
      * @throws JAXBException
-     * @throws MessageException
+     * @throws WebServiceException
      * @throws XMLStreamException
      */
-    private Message createMessage(Object jaxbElement, OperationDescription operationDesc)throws JAXBException, MessageException, XMLStreamException{
+    private Message createMessage(Object jaxbElement, OperationDescription operationDesc)throws JAXBException, WebServiceException, XMLStreamException{
             Block bodyBlock = null;
             
             Protocol protocol = null;
             try {
                 protocol = Protocol.getProtocolForBinding(operationDesc.getEndpointInterfaceDescription().getEndpointDescription().getBindingType()); //soap11;
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/MethodMarshallerImpl.java Fri Jan 19 19:25:43 2007
@@ -51,7 +51,6 @@
 import org.apache.axis2.jaxws.marshaller.MethodParameter;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.XMLFault;
 import org.apache.axis2.jaxws.message.XMLFaultReason;
@@ -609,7 +608,7 @@
 		return (objects!=null)? new ArrayList<T>(Arrays.asList(objects)):new ArrayList<T>();
 	}
 	
-	protected Block createJAXBBlock(Object jaxbObject, JAXBBlockContext context) throws MessageException{
+	protected Block createJAXBBlock(Object jaxbObject, JAXBBlockContext context) throws WebServiceException{
 		JAXBBlockFactory factory = (JAXBBlockFactory)FactoryRegistry.getFactory(JAXBBlockFactory.class);
 		return factory.createFrom(jaxbObject,context,null);
 		
@@ -618,7 +617,7 @@
 	protected Block createJAXBBlock(String name, 
 			Object jaxbObject, 
 			JAXBBlockContext context, 
-			String targetNamespace) throws MessageException, JAXBException {
+			String targetNamespace) throws WebServiceException, JAXBException {
 		
 		JAXBIntrospector i  = JAXBUtils.getJAXBIntrospector(context.getJAXBContext());
 		boolean isElement = i.isElement(jaxbObject);
@@ -751,7 +750,7 @@
 		return null;
 	}
 	
-	protected Message createMessage(ArrayList<MethodParameter> mps, OperationDescription operationDesc) throws JAXBException, MessageException, XMLStreamException{
+	protected Message createMessage(ArrayList<MethodParameter> mps, OperationDescription operationDesc) throws JAXBException, WebServiceException, XMLStreamException{
 		Block block = null;
 		Object object = null;
 		String objectName = null;
@@ -762,7 +761,7 @@
         Protocol protocol = null;
         try {
             protocol = Protocol.getProtocolForBinding(operationDesc.getEndpointInterfaceDescription().getEndpointDescription().getBindingType()); //soap11;
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO better handling than this?
             e.printStackTrace();
         }
@@ -822,17 +821,17 @@
 		return m;
 	}
 	
-	protected Message createFaultMessage(OMElement element) throws XMLStreamException, MessageException {
+	protected Message createFaultMessage(OMElement element) throws XMLStreamException, WebServiceException {
 		MessageFactory mf = (MessageFactory)FactoryRegistry.getFactory(MessageFactory.class);
 		return mf.createFrom(element);
 	}
 	
-	protected Message createEmptyMessage(OperationDescription operationDesc) throws JAXBException, MessageException, XMLStreamException {
+	protected Message createEmptyMessage(OperationDescription operationDesc) throws JAXBException, WebServiceException, XMLStreamException {
         
         Protocol protocol = null;
         try {
             protocol = Protocol.getProtocolForBinding(operationDesc.getEndpointInterfaceDescription().getEndpointDescription().getBindingType());
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO better handling than this?
             e.printStackTrace();
         }
@@ -842,7 +841,7 @@
 		return m;
 	}
 	
-	protected Object createBOFromHeaderBlock(Set<String> contextPackages, Message message, String targetNamespace, String localPart) throws JAXBException, MessageException, XMLStreamException{
+	protected Object createBOFromHeaderBlock(Set<String> contextPackages, Message message, String targetNamespace, String localPart) throws JAXBException, WebServiceException, XMLStreamException{
 		
 		JAXBBlockContext blockContext = createJAXBBlockContext(contextPackages);
 		
@@ -853,12 +852,12 @@
         return block.getBusinessObject(true);
 	}
 	
-	protected Object createBOFromBodyBlock(Set<String> contextPackages, Message message) throws JAXBException, MessageException, XMLStreamException{
+	protected Object createBOFromBodyBlock(Set<String> contextPackages, Message message) throws JAXBException, WebServiceException, XMLStreamException{
 		return createBusinessObject(contextPackages, message);
 	}
 
 	
-	protected Object createBusinessObject(Set<String> contextPackages, Message message) throws JAXBException, MessageException, XMLStreamException{
+	protected Object createBusinessObject(Set<String> contextPackages, Message message) throws JAXBException, WebServiceException, XMLStreamException{
 		JAXBBlockContext blockContext = createJAXBBlockContext(contextPackages);
 		
 		// Get a JAXBBlockFactory instance.  We'll need this to get the JAXBBlock
@@ -869,7 +868,7 @@
         return block.getBusinessObject(true);
 	}
 	
-	private JAXBBlockContext createJAXBBlockContext(Set<String> contextPackages) throws JAXBException, MessageException {
+	private JAXBBlockContext createJAXBBlockContext(Set<String> contextPackages) throws JAXBException, WebServiceException {
 		JAXBBlockContext blockContext = new JAXBBlockContext(contextPackages);
 		return blockContext;
 	}
@@ -879,11 +878,11 @@
 	 * @param block
 	 * @return
 	 * @throws JAXBException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 * @throws XMLStreamException
 	 */
 	protected Object createFaultBusinessObject(Block block, OperationDescription operationDesc)
-			throws JAXBException, MessageException, XMLStreamException {
+			throws JAXBException, WebServiceException, XMLStreamException {
 		JAXBBlockContext blockContext = new JAXBBlockContext(createContextPackageSet(operationDesc));		
 		// Get a JAXBBlockFactory instance. 
         JAXBBlockFactory factory = (JAXBBlockFactory)FactoryRegistry.getFactory(JAXBBlockFactory.class);
@@ -893,7 +892,7 @@
 	}
 	
     protected void assignHolderValues(ArrayList<MethodParameter> mps, ArrayList<Object> inputArgHolders, Message message, OperationDescription operationDesc)
-            throws JAXBException, MessageException, XMLStreamException{
+            throws JAXBException, WebServiceException, XMLStreamException{
 		Object bo = null;
 		int index = 0;
 		for(MethodParameter mp:mps){

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitBareMethodMarshaller.java Fri Jan 19 19:25:43 2007
@@ -30,7 +30,6 @@
 import org.apache.axis2.jaxws.description.ParameterDescription;
 import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
@@ -139,7 +138,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }
@@ -203,7 +202,7 @@
         Protocol protocol = null;
         try {
             protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID());
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO better handling than this?
             e.printStackTrace();
         }
@@ -259,7 +258,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/DocLitWrappedMethodMarshaller.java Fri Jan 19 19:25:43 2007
@@ -38,7 +38,6 @@
 import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
 import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
@@ -265,7 +264,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }
@@ -370,7 +369,7 @@
         Protocol protocol = null;
         try {
             protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID()); 
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO better handling than this?
             e.printStackTrace();
         }
@@ -463,7 +462,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java Fri Jan 19 19:25:43 2007
@@ -47,7 +47,6 @@
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.XMLFault;
 import org.apache.axis2.jaxws.message.XMLFaultReason;
@@ -146,7 +145,7 @@
             Message message, 
             Set<String> packages, 
             boolean isInput, 
-            boolean usePartName) throws MessageException, XMLStreamException {
+            boolean usePartName) throws XMLStreamException {
         
         List<PDElement> pvList = new ArrayList<PDElement>();
             
@@ -315,7 +314,7 @@
      * @param isRPC 
      * @throws MessageException
      */
-    static void toMessage(List<PDElement> pvList, Message message, Set<String> packages, boolean isRPC) throws MessageException {
+    static void toMessage(List<PDElement> pvList, Message message, Set<String> packages, boolean isRPC) throws WebServiceException {
         
         int index = message.getNumBodyBlocks();
         for (int i=0; i<pvList.size(); i++) {
@@ -368,7 +367,7 @@
             Set<String> packages, 
             Message message, 
             boolean isRPC) 
-            throws MessageException {
+            throws WebServiceException {
         
         // Create the JAXBBlockContext
         // RPC uses type marshalling, so recored the rpcType
@@ -396,11 +395,11 @@
      * @param message
      * @param rpcType RPC Declared Type class (only used for RPC processing
      * @return type enabled object
-     * @throws MessageException
+     * @throws WebService
      * @throws XMLStreamException
      */
     static Object getReturnValue(Set<String> packages, Message message, Class rpcType) 
-        throws MessageException, XMLStreamException {
+        throws WebServiceException, XMLStreamException {
         
         
         // The return object is the first block in the body
@@ -425,13 +424,13 @@
      * @param packages Packages needed to marshal the object
      * @param message Message
      * @param isRPC
-     * @throws MessageException
+     * @throws WebServiceException
      * @throws NoSuchMethodException
      * @throws InvocationTargetException
      * @throws IllegalAccessException
      */
     static void marshalFaultResponse(Throwable throwable, OperationDescription operationDesc,  Set<String> packages, Message message, boolean isRPC)
-     throws MessageException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+     throws WebServiceException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         
         // Get the root cause of the throwable object
         Throwable t = ClassUtils.getRootCause(throwable);
@@ -522,7 +521,7 @@
      * @param message
      * @param isRPC
      * @return Throwable
-     * @throws MessageException
+     * @throws WebServiceException
      * @throws ClassNotFoundException
      * @throws IllegalAccessException
      * @throws InstantiationException
@@ -531,7 +530,7 @@
      * @throws NoSuchMethodException
      */
     static Throwable demarshalFaultResponse(OperationDescription operationDesc, Set<String> packages,Message message, boolean isRPC) 
-        throws MessageException, ClassNotFoundException, IllegalAccessException,
+        throws WebServiceException, ClassNotFoundException, IllegalAccessException,
                InstantiationException, XMLStreamException, InvocationTargetException, NoSuchMethodException {
         
         Throwable exception = null;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/RPCLitMethodMarshaller.java Fri Jan 19 19:25:43 2007
@@ -33,7 +33,6 @@
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
@@ -55,7 +54,7 @@
         Protocol protocol = null;
         try {
             protocol = Protocol.getProtocolForBinding(endpointDesc.getClientBindingID()); 
-        } catch (MessageException e) {
+        } catch (WebServiceException e) {
             // TODO better handling than this?
             e.printStackTrace();
         }
@@ -191,7 +190,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }
@@ -328,7 +327,7 @@
         if (protocol == null) {
             try {
                 protocol = Protocol.getProtocolForBinding(endpointDesc.getBindingType());
-            } catch (MessageException e) {
+            } catch (WebServiceException e) {
                 // TODO better handling than this?
                 e.printStackTrace();
             }

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Block.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Block.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Block.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Block.java Fri Jan 19 19:25:43 2007
@@ -20,6 +20,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
@@ -53,9 +54,9 @@
 	 * @param consume true if this is the last request on the block.
 	 * @return Object (JAXB, String etc.)
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public Object getBusinessObject(boolean consume) throws XMLStreamException, MessageException;
+	public Object getBusinessObject(boolean consume) throws XMLStreamException, WebServiceException;
 	
 	/**
 	 * GetBusinesContext
@@ -70,25 +71,25 @@
 	 * @return XMLStreamReader
 	 * @throws XMLStreamException
 	 */
-	public XMLStreamReader getXMLStreamReader(boolean consume) throws XMLStreamException, MessageException;
+	public XMLStreamReader getXMLStreamReader(boolean consume) throws XMLStreamException, WebServiceException;
 	
 	/**
 	 * Get the OMElement represented by this Block.
 	 * This call always consumes the block because you are taking control of the underlying OM
 	 * @return
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public OMElement getOMElement() throws XMLStreamException, MessageException;
+	public OMElement getOMElement() throws XMLStreamException, WebServiceException;
 	
     /**
      * Write out the Block
      * @param writer XMLStreamWriter
      * @param consume true if this is the last request on the block.
      * @throws XMLStreamException
-     * @trhows MessageException
+     * @trhows WebServiceException
      */
-    public void outputTo(XMLStreamWriter writer, boolean consume) throws XMLStreamException, MessageException;	
+    public void outputTo(XMLStreamWriter writer, boolean consume) throws XMLStreamException, WebServiceException;	
         
     /**
      * isConsumed
@@ -119,9 +120,9 @@
 	 * Asking for the QName can cause a performant hit.
 	 * @see isQNameAvailable
 	 * @return QName of the block
-	 * @throw MessageException
+	 * @throw WebServiceException
 	 */
-	public QName getQName() throws MessageException;
+	public QName getQName() throws WebServiceException;
     
 	/**
 	 * Get BlockFactory 

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Message.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Message.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Message.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Message.java Fri Jan 19 19:25:43 2007
@@ -21,6 +21,7 @@
 import javax.activation.DataHandler;
 import javax.xml.soap.MimeHeaders;
 import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
 
 /**
  * Message
@@ -47,7 +48,7 @@
 	 * Get the xml part as a read/write SOAPEnvelope
 	 * @return SOAPEnvelope
 	 */
-	public SOAPMessage getAsSOAPMessage() throws MessageException;
+	public SOAPMessage getAsSOAPMessage() throws WebServiceException;
 	
     /**
      * Adds an attachment part to the message

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Protocol.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Protocol.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Protocol.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/Protocol.java Fri Jan 19 19:25:43 2007
@@ -18,6 +18,7 @@
  */
 package org.apache.axis2.jaxws.message;
 
+import javax.xml.ws.WebServiceException;
 import javax.xml.ws.soap.SOAPBinding;
 
 import org.apache.axis2.jaxws.ExceptionFactory;
@@ -47,7 +48,7 @@
      * @param url
      * @return
      */
-    public static Protocol getProtocolForBinding(String url) throws MessageException {
+    public static Protocol getProtocolForBinding(String url) throws WebServiceException {
         boolean debug = log.isDebugEnabled();
         if (debug) {
             log.debug("Configuring message protocol for binding [" + url + "]");
@@ -70,7 +71,7 @@
             return Protocol.soap12;
         }
         else {
-            throw ExceptionFactory.makeMessageException(Messages.getMessage("protoNotFound00", url));
+            throw ExceptionFactory.makeWebServiceException(Messages.getMessage("protoNotFound00", url));
         }
     }
     

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/XMLPart.java Fri Jan 19 19:25:43 2007
@@ -22,6 +22,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
@@ -63,18 +64,18 @@
 	 * Write out the Message
 	 * @param writer XMLStreamWriter
 	 * @param consume true if this is the last request on the block.
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public void outputTo(XMLStreamWriter writer, boolean consume) throws XMLStreamException, MessageException;	
+	public void outputTo(XMLStreamWriter writer, boolean consume) throws XMLStreamException, WebServiceException;	
 	
 	/**
 	 * Get the XMLStreamReader represented by this Message for the xml part
 	 * @param consume true if this is the last request on the Message
 	 * @return XMLStreamReader
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 * @throws XMLStreamException
 	 */
-	public XMLStreamReader getXMLStreamReader(boolean consume) throws MessageException;
+	public XMLStreamReader getXMLStreamReader(boolean consume) throws WebServiceException;
 	
     /**
      * @return the Style (document or rpc)
@@ -85,19 +86,19 @@
      * Set the Style. 
      * @param style Style
      */
-    public void setStyle(Style style) throws MessageException;
+    public void setStyle(Style style) throws WebServiceException;
 
     /**
      * @return the QName of the operation element if Style.rpc.  Otherwise null
      */
-    public QName getOperationElement() throws MessageException;
+    public QName getOperationElement() throws WebServiceException;
     
     /**
      * Set the operation element qname.  The operation qname is only used if
      * Style.rpc
      * @param operationQName
      */
-    public void setOperationElement(QName operationQName) throws MessageException;
+    public void setOperationElement(QName operationQName) throws WebServiceException;
     
 	/**
 	 * isConsumed
@@ -111,7 +112,7 @@
 	 * Determines whether the XMLPart represents a Fault
 	 * @return true if the message represents a fault
 	 */
-	public boolean isFault() throws MessageException;
+	public boolean isFault() throws WebServiceException;
 	
 	/**
 	 * If the XMLPart represents a fault, an XMLFault is returned
@@ -119,7 +120,7 @@
 	 * @return the XMLFault object or null
      * @see XMLFault
 	 */
-	public XMLFault getXMLFault() throws MessageException;
+	public XMLFault getXMLFault() throws WebServiceException;
 	
 	/**
 	 * Change the XMLPart so that it represents the fault described
@@ -127,7 +128,7 @@
 	 * @param xmlfault
      * @see XMLFault
 	 */
-	public void setXMLFault(XMLFault xmlFault) throws MessageException;
+	public void setXMLFault(XMLFault xmlFault) throws WebServiceException;
 	
     /**
      * getParent
@@ -148,17 +149,17 @@
 	 * getAsEnvelope
 	 * Get the xml part as a read/write SOAPEnvelope
 	 * @return SOAPEnvelope
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public SOAPEnvelope getAsSOAPEnvelope() throws MessageException;
+	public SOAPEnvelope getAsSOAPEnvelope() throws WebServiceException;
 	
 	/**
 	 * getAsOMElement
 	 * Get the xml part as a read/write OM
 	 * @return OMElement (probably OM SOAPEnvelope)
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public OMElement getAsOMElement() throws MessageException;
+	public OMElement getAsOMElement() throws WebServiceException;
 	
 	/**
 	 * getAsBlock
@@ -167,19 +168,19 @@
 	 * proper kind of block.
 	 * 
 	 * @return Block
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	public Block getAsBlock(
 			Object context, 
 			BlockFactory blockFactory)  
-		throws MessageException, XMLStreamException;
+		throws WebServiceException, XMLStreamException;
 	
 	/**
 	 * getNumBodyBlocks
 	 * @return number of body blocks
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public int getNumBodyBlocks() throws MessageException;
+	public int getNumBodyBlocks() throws WebServiceException;
 	
 	/**
 	 * getBodyBlock
@@ -191,10 +192,10 @@
 	 * @param context
 	 * @param blockFactory
 	 * @return Block
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	public Block getBodyBlock(int index, Object context, BlockFactory blockFactory)  
-		throws MessageException;
+		throws WebServiceException;
 	
 	/**
 	 * setBodyBlock
@@ -203,25 +204,25 @@
 	 * use the getBodyBlock method to access it.
 	 * @param index
 	 * @param block
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public void setBodyBlock(int index, Block block) throws MessageException;
+	public void setBodyBlock(int index, Block block) throws WebServiceException;
 	
 	/**
 	 * removePayload
 	 * Removes the indicated BodyBlock
 	 * @param index
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public void removeBodyBlock(int index) throws MessageException;
+	public void removeBodyBlock(int index) throws WebServiceException;
 	
 	
 	/**
 	 * getNumHeaderBlocks
 	 * @return number of header blocks
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public int getNumHeaderBlocks() throws MessageException;
+	public int getNumHeaderBlocks() throws WebServiceException;
 	
 	/**
 	 * getHeaderBlock
@@ -234,12 +235,12 @@
 	 * @param context
 	 * @param blockFactory
 	 * @return Block
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	public Block getHeaderBlock(String namespace, String localPart, 
 			Object context, 
 			BlockFactory blockFactory)  
-		throws MessageException;
+		throws WebServiceException;
 	
 	/**
 	 * appendHeaderBlock
@@ -249,20 +250,20 @@
 	 * @param namespace
 	 * @param localPart
 	 * @param block
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	public void setHeaderBlock(String namespace, String localPart, Block block) 
-		throws MessageException;
+		throws WebServiceException;
 	
 	/**
 	 * removePayload
 	 * Removes the indicated block
 	 * @param namespace
 	 * @param localPart
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	public void removeHeaderBlock(String namespace, String localPart) 
-		throws MessageException;
+		throws WebServiceException;
 	
 	
 	/**

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockFactoryImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockFactoryImpl.java Fri Jan 19 19:25:43 2007
@@ -19,12 +19,12 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.Block;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
 import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
 import org.apache.axis2.jaxws.message.impl.BlockFactoryImpl;
@@ -47,7 +47,7 @@
 	/* (non-Javadoc)
 	 * @see org.apache.axis2.jaxws.message.BlockFactory#createFrom(org.apache.axiom.om.OMElement, java.lang.Object, javax.xml.namespace.QName)
 	 */
-	public Block createFrom(OMElement omElement, Object context, QName qName) throws XMLStreamException, MessageException {
+	public Block createFrom(OMElement omElement, Object context, QName qName) throws XMLStreamException, WebServiceException {
 		// The context for a JAXBFactory must be non-null and should be a JAXBBlockContext.
 		if (context == null) {
 		    // JAXWS spec 4.3.4 conformance requires a WebServiceException whose cause is JAXBException
@@ -64,7 +64,7 @@
 	/* (non-Javadoc)
 	 * @see org.apache.axis2.jaxws.message.BlockFactory#createFrom(java.lang.Object, java.lang.Object, javax.xml.namespace.QName)
 	 */
-	public Block createFrom(Object businessObject, Object context, QName qName) throws MessageException {
+	public Block createFrom(Object businessObject, Object context, QName qName) throws WebServiceException {
 		
 		// The context must be non-null and should be a JAXBBlockContext.
 		// For legacy reasons, a JAXBContext is also supported (and wrapped into a JAXBBlockContext)
@@ -93,7 +93,7 @@
 		try {
 			return new JAXBBlockImpl(businessObject, (JAXBBlockContext) context, qName, this);
 		} catch (JAXBException e) {
-			throw ExceptionFactory.makeMessageException(e);
+			throw ExceptionFactory.makeWebServiceException(e);
 		}
 	}
 

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java Fri Jan 19 19:25:43 2007
@@ -28,13 +28,12 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
-import org.apache.axis2.jaxws.message.XMLPart;
 import org.apache.axis2.jaxws.message.attachments.JAXBAttachmentMarshaller;
 import org.apache.axis2.jaxws.message.attachments.JAXBAttachmentUnmarshaller;
 import org.apache.axis2.jaxws.message.databinding.JAXBBlock;
@@ -83,7 +82,7 @@
 	}
 
 	@Override
-	protected Object _getBOFromReader(XMLStreamReader reader, Object busContext) throws XMLStreamException, MessageException {
+	protected Object _getBOFromReader(XMLStreamReader reader, Object busContext) throws XMLStreamException, WebServiceException {
 	    // Get the JAXBBlockContext.  All of the necessry information is recorded on it
         JAXBBlockContext ctx = (JAXBBlockContext) busContext;
         try {
@@ -128,12 +127,12 @@
                 } catch (Exception e) {
                 }
             }
-			throw ExceptionFactory.makeMessageException(je);
+			throw ExceptionFactory.makeWebServiceException(je);
 		}
 	}
 
 	@Override
-	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, MessageException {
+	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, WebServiceException {
 		// TODO Review and determine if there is a better solution
 		
 		// This is hard because JAXB does not expose a reader from the business object.
@@ -157,7 +156,7 @@
 	}
 
 	@Override
-	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, MessageException {
+	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, WebServiceException {
         JAXBBlockContext ctx = (JAXBBlockContext) busContext;
         try {
 			// Very easy, use the Context to get the Marshaller.
@@ -195,7 +194,7 @@
                 } catch (Exception e) {
                 }
             }
-			throw ExceptionFactory.makeMessageException(je);
+			throw ExceptionFactory.makeWebServiceException(je);
 		}
 	}
 
@@ -203,7 +202,7 @@
 	 * Get the QName from the jaxb object
 	 * @param jaxb
 	 * @param jbc
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
 	private static QName getQName(Object jaxb, JAXBBlockContext ctx) throws JAXBException {
 		JAXBIntrospector jbi = JAXBUtils.getJAXBIntrospector(ctx.getJAXBContext());
@@ -226,12 +225,12 @@
      * @param m Marshaller
      * @param writer XMLStreamWriter
      */
-    private static void marshalByElement(Object b, Marshaller m, XMLStreamWriter writer) throws MessageException {
+    private static void marshalByElement(Object b, Marshaller m, XMLStreamWriter writer) throws WebServiceException {
         // TODO Log and trace here would be helpful
         try {
             m.marshal(b, writer);
         } catch (Exception e) {
-            throw ExceptionFactory.makeMessageException(e);
+            throw ExceptionFactory.makeWebServiceException(e);
         }
     }
     
@@ -240,14 +239,14 @@
      * @param u Unmarshaller
      * @param reader XMLStreamReader
      * @return Object that represents an element 
-     * @throws MessageException
+     * @throws WebServiceException
      */
-    private static Object unmarshalByElement(Unmarshaller u, XMLStreamReader reader) throws MessageException {
+    private static Object unmarshalByElement(Unmarshaller u, XMLStreamReader reader) throws WebServiceException {
         // TODO Log and trace here would be helpful
         try {
             return u.unmarshal(reader);
         } catch (Exception e) {
-            throw ExceptionFactory.makeMessageException(e);
+            throw ExceptionFactory.makeWebServiceException(e);
         }
     }
     
@@ -258,7 +257,7 @@
      * @param writer XMLStreamWriter
      * @param type
      */
-    private static void marshalByType(Object b, Marshaller m, XMLStreamWriter writer, Class type) throws MessageException {
+    private static void marshalByType(Object b, Marshaller m, XMLStreamWriter writer, Class type) throws WebServiceException {
         // TODO Log and trace here would be helpful
         try {
             
@@ -294,7 +293,7 @@
             }
             m.marshal(b, writer);
         } catch (Exception e) {
-            throw ExceptionFactory.makeMessageException(e);
+            throw ExceptionFactory.makeWebServiceException(e);
         }
     }
     
@@ -306,9 +305,9 @@
      * @param reader XMLStreamReader
      * @param type Class
      * @return Object 
-     * @throws MessageException
+     * @throws WebServiceException
      */
-    private static Object unmarshalByType(Unmarshaller u, XMLStreamReader reader, Class type) throws MessageException {
+    private static Object unmarshalByType(Unmarshaller u, XMLStreamReader reader, Class type) throws WebServiceException {
         // TODO Log and trace here would be helpful
         try {
             // Unfortunately RPC is type based.  Thus a
@@ -335,7 +334,7 @@
             } 
             return jaxb;
         } catch (Exception e) {
-            throw ExceptionFactory.makeMessageException(e);
+            throw ExceptionFactory.makeWebServiceException(e);
         }
     }
     

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java Fri Jan 19 19:25:43 2007
@@ -19,9 +19,9 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.databinding.OMBlock;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.impl.BlockImpl;
@@ -46,19 +46,19 @@
 	}
 	
 	@Override
-	protected Object _getBOFromReader(XMLStreamReader reader, Object busContext) throws XMLStreamException, MessageException {
+	protected Object _getBOFromReader(XMLStreamReader reader, Object busContext) throws XMLStreamException, WebServiceException {
 		// Take a shortcut and return the OMElement 
 		return this.getOMElement();
 	}
 
 	@Override
-	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, MessageException {
+	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, WebServiceException {
 		OMElement om = (OMElement) busObj;
 		return om.getXMLStreamReader();
 	}
 
 	@Override
-	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, MessageException {
+	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, WebServiceException {
 		OMElement om = (OMElement) busObject;
 		om.serialize(writer);
 	}

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockFactoryImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockFactoryImpl.java Fri Jan 19 19:25:43 2007
@@ -6,10 +6,10 @@
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPEnvelope;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.message.Block;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.factory.SOAPEnvelopeBlockFactory;
 import org.apache.axis2.jaxws.message.impl.BlockFactoryImpl;
 
@@ -38,7 +38,7 @@
 	 * @see org.apache.axis2.jaxws.message.factory.BlockFactory#createFrom(java.lang.Object, java.lang.Object, javax.xml.namespace.QName)
 	 */
 	public Block createFrom(Object businessObject, Object context, QName qName)
-			throws MessageException {
+			throws WebServiceException {
 		return new SOAPEnvelopeBlockImpl((SOAPEnvelope) businessObject, null, qName, this);
 	}
 

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java Fri Jan 19 19:25:43 2007
@@ -9,10 +9,10 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.databinding.SOAPEnvelopeBlock;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
@@ -58,7 +58,7 @@
 	 */
 	@Override
 	protected Object _getBOFromReader(XMLStreamReader reader, Object busContext)
-			throws XMLStreamException, MessageException {
+			throws XMLStreamException, WebServiceException {
 		
 		// TODO Temporary solution.  The better way is to get an OM
 		// and convert with the SAAJConverter
@@ -74,7 +74,7 @@
 	 */
 	@Override
 	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext)
-			throws XMLStreamException, MessageException {
+			throws XMLStreamException, WebServiceException {
 		return new SOAPElementReader((SOAPElement)busObj);
 	}
 
@@ -83,7 +83,7 @@
 	 */
 	@Override
 	protected void _outputFromBO(Object busObject, Object busContext,
-			XMLStreamWriter writer) throws XMLStreamException, MessageException {
+			XMLStreamWriter writer) throws XMLStreamException, WebServiceException {
 		XMLStreamReader reader = _getReaderFromBO(busObject, busContext);
 		_outputFromReader(reader, writer);	
 	}

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockFactoryImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockFactoryImpl.java Fri Jan 19 19:25:43 2007
@@ -19,10 +19,10 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.message.Block;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.factory.SourceBlockFactory;
 import org.apache.axis2.jaxws.message.impl.BlockFactoryImpl;
 
@@ -43,7 +43,7 @@
 	/* (non-Javadoc)
 	 * @see org.apache.axis2.jaxws.message.BlockFactory#createFrom(java.lang.Object, java.lang.Object, javax.xml.namespace.QName)
 	 */
-	public Block createFrom(Object businessObject, Object context, QName qName) throws MessageException {
+	public Block createFrom(Object businessObject, Object context, QName qName) throws WebServiceException {
 		return new SourceBlockImpl((Source) businessObject, qName, this);
 	}
 

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java Fri Jan 19 19:25:43 2007
@@ -36,12 +36,12 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.i18n.Messages;
-import org.apache.axis2.jaxws.message.MessageException;
 import org.apache.axis2.jaxws.message.databinding.SourceBlock;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.impl.BlockImpl;
@@ -87,7 +87,7 @@
 	 * @param qName
 	 * @param factory
 	 */
-	SourceBlockImpl(Source busObject, QName qName, BlockFactory factory) throws MessageException {
+	SourceBlockImpl(Source busObject, QName qName, BlockFactory factory) throws WebServiceException {
 		super(busObject, null, qName, factory);
 
 		// Check validity of Source
@@ -98,7 +98,7 @@
 			busObject instanceof JAXBSource) {
 			// Okay, these are supported Source objects
 		} else {
-			throw ExceptionFactory.makeMessageException(Messages.getMessage("SourceNotSupported", busObject.getClass().getName()));
+			throw ExceptionFactory.makeWebServiceException(Messages.getMessage("SourceNotSupported", busObject.getClass().getName()));
 		}
 	}
 	
@@ -135,7 +135,7 @@
 	}
 
 	@Override
-	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, MessageException  {
+	protected XMLStreamReader _getReaderFromBO(Object busObj, Object busContext) throws XMLStreamException, WebServiceException  {
 	    try {
 	        // TODO not sure if this is always the most performant way to do this.
 	        if (busObj instanceof DOMSource) {
@@ -153,7 +153,7 @@
 	            // We had some problems with testers producing DOMSources w/o Namespaces.  
 	            // It's easy to catch this here.
 	            if (element.getLocalName() == null) {
-	                throw new XMLStreamException(ExceptionFactory.makeMessageException(Messages.getMessage("JAXBSourceNamespaceErr")));
+	                throw new XMLStreamException(ExceptionFactory.makeWebServiceException(Messages.getMessage("JAXBSourceNamespaceErr")));
 	            }
 	            
 	            return new DOMReader(element);
@@ -174,7 +174,7 @@
 	        return _slow_getReaderFromSource((Source)busObj);
 	    } catch (Exception e) {
             String className = (busObj == null) ? "none" : busObj.getClass().getName();
-	        throw ExceptionFactory.makeMessageException(Messages.getMessage("SourceReadErr", className), e);
+	        throw ExceptionFactory.makeWebServiceException(Messages.getMessage("SourceReadErr", className), e);
 	    }
 	}
 	
@@ -196,7 +196,7 @@
    }
 
 	@Override
-	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, MessageException {
+	protected void _outputFromBO(Object busObject, Object busContext, XMLStreamWriter writer) throws XMLStreamException, WebServiceException {
 		// There is no fast way to output the Source to a writer, so get the reader
 		// and pass use the default reader->writer.
 		XMLStreamReader reader = _getReaderFromBO(busObject, busContext);
@@ -210,7 +210,7 @@
 			return busObject;
 		} else {
 			// TODO Missing Impl
-			throw ExceptionFactory.makeMessageInternalException(Messages.getMessage("SourceMissingSupport", busObject.getClass().getName()), null);
+			throw ExceptionFactory.makeWebServiceException(Messages.getMessage("SourceMissingSupport", busObject.getClass().getName()));
 		}
 	}
 	

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/BlockFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/BlockFactory.java?view=diff&rev=498056&r1=498055&r2=498056
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/BlockFactory.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/factory/BlockFactory.java Fri Jan 19 19:25:43 2007
@@ -19,10 +19,10 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.ws.WebServiceException;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.jaxws.message.Block;
-import org.apache.axis2.jaxws.message.MessageException;
 
 /**
  * BlockFactory
@@ -46,9 +46,9 @@
 	 * @param context Associated Context or null
 	 * @param QName if known...if null the Block will determine the QName
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public Block createFrom(XMLStreamReader reader, Object context, QName qName) throws XMLStreamException, MessageException;
+	public Block createFrom(XMLStreamReader reader, Object context, QName qName) throws XMLStreamException, WebServiceException;
 	
 	/**
 	 * createBlock from XMLStreamReader
@@ -56,9 +56,9 @@
 	 * @param context Associated Context or null
 	 * @param QName if known...if null the Block will determine the QName
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public Block createFrom(OMElement omElement, Object context, QName qName) throws XMLStreamException, MessageException;
+	public Block createFrom(OMElement omElement, Object context, QName qName) throws XMLStreamException, WebServiceException;
 	
 	/**
 	 * createBlock from another Block
@@ -69,9 +69,9 @@
 	 * @param other Block
 	 * @param context Associated Context or null
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public Block createFrom(Block other, Object context) throws XMLStreamException, MessageException;
+	public Block createFrom(Block other, Object context) throws XMLStreamException, WebServiceException;
 	
 	/**
 	 * Create from business object
@@ -79,7 +79,7 @@
 	 * @param context Associated Context or null
 	 * @param QName if known...if null the Block will determine the QName
 	 * @throws XMLStreamException
-	 * @throws MessageException
+	 * @throws WebServiceException
 	 */
-	public Block createFrom(Object businessObject, Object context, QName qName) throws MessageException;
+	public Block createFrom(Object businessObject, Object context, QName qName) throws WebServiceException;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message