You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/07/27 10:08:21 UTC
svn commit: r225478 [4/4] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
common/src/org/apache/axis2/ common/src/org/apache/axis2/i18n/
core/src/org/...
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,12 +20,12 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.AxisFault;
/**
* Builds the MessageContext as called by AsynchronousClient
Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/GUIHandler.java Wed Jul 27 00:57:39 2005
@@ -16,7 +16,7 @@
package sample.amazon.search;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
import javax.swing.*;
import java.awt.*;
Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java Wed Jul 27 00:57:39 2005
@@ -1,12 +1,12 @@
package sample.google.search;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.engine.AxisFault;
import sample.google.common.util.PropertyLoader;
import javax.xml.namespace.QName;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,13 +20,13 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.engine.AxisFault;
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.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.AxisFault;
/**
* Builds the MessageContext as called by AsynchronousClient
Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/GUIHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/GUIHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/GUIHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/GUIHandler.java Wed Jul 27 00:57:39 2005
@@ -16,7 +16,6 @@
package sample.google.search;
-import org.apache.axis2.engine.AxisFault;
import sample.google.common.util.PropertyLoader;
import javax.swing.*;
@@ -27,6 +26,8 @@
import java.awt.event.KeyListener;
import java.io.File;
import java.io.IOException;
+
+import org.apache.axis2.AxisFault;
/**
* Build and desplay the GUI
Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Wed Jul 27 00:57:39 2005
@@ -5,13 +5,13 @@
import org.apache.axis2.clientapi.AsyncResult;
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.AxisFault;
import sample.google.common.util.PropertyLoader;
import javax.xml.namespace.QName;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -2,7 +2,6 @@
import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.ServiceDescription;
@@ -16,6 +15,7 @@
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
import org.codehaus.groovy.control.CompilationFailedException;
import javax.xml.stream.XMLOutputFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java Wed Jul 27 00:57:39 2005
@@ -1,10 +1,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java Wed Jul 27 00:57:39 2005
@@ -1,10 +1,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import javax.xml.stream.XMLOutputFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java Wed Jul 27 00:57:39 2005
@@ -1,10 +1,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import javax.xml.namespace.QName;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java Wed Jul 27 00:57:39 2005
@@ -1,12 +1,12 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Wed Jul 27 00:57:39 2005
@@ -1,12 +1,12 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.OMOutputImpl;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java Wed Jul 27 00:57:39 2005
@@ -16,10 +16,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.MessageSender;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java Wed Jul 27 00:57:39 2005
@@ -1,10 +1,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.MessageSender;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
/**
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java Wed Jul 27 00:57:39 2005
@@ -16,10 +16,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java Wed Jul 27 00:57:39 2005
@@ -16,10 +16,10 @@
package userguide.clients;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LogHandler.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
package userguide.loggingmodule;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java Wed Jul 27 00:57:39 2005
@@ -1,8 +1,8 @@
package userguide.loggingmodule;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.modules.Module;
+import org.apache.axis2.AxisFault;
/**
* Created by IntelliJ IDEA.
Modified: webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/ReplyMessages/test.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/ReplyMessages/test.xml?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/ReplyMessages/test.xml (original)
+++ webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/ReplyMessages/test.xml Wed Jul 27 00:57:39 2005
@@ -5,7 +5,7 @@
<soapenv:Node></soapenv:Node>
<soapenv:Role></soapenv:Role>
<soapenv:Detail>
- <soapenv:Exception>org.apache.axis2.engine.AxisFault: Intentional Failure from SOAP 1.2 testing ...; nested exception is:org.apache.axis2.engine.AxisFault: Intentional Failure from SOAP 1.2 testing ...at org.apache.axis2.engine.AxisEngine.handleFault(AxisEngine.java:186)at org.apache.axis2.engine.AxisEngine.receive(AxisEngine.java:127)at org.apache.axis2.transport.http.HTTPTransportUtils.processHTTPPostRequest(HTTPTransportUtils.java:102)at org.apache.axis2.transport.http.HTTPWorker.doWork(HTTPWorker.java:110)at org.apache.axis2.util.threadpool.ThreadWorker.run(ThreadWorker.java:34)Caused by: org.apache.axis2.engine.AxisFault: Intentional Failure from SOAP 1.2 testing ...at org.apache.axis2.soap12testing.handlers.SOAP12InFlowHandlerDefaultC.invoke(SOAP12InFlowHandlerDefaultC.java:120)at org.apache.axis2.engine.Phase.invoke(Phase.java:161)at org.apache.axis2.engine.AxisEngine.invokePhases(AxisEngine.java:252)at org.apache.axis2.engine.AxisEngine.receive(AxisEngine.java:118)... 3 more</soapenv:Exception>
+ <soapenv:Exception>org.apache.axis2.AxisFault: Intentional Failure from SOAP 1.2 testing ...; nested exception is:org.apache.axis2.AxisFault: Intentional Failure from SOAP 1.2 testing ...at org.apache.axis2.engine.AxisEngine.handleFault(AxisEngine.java:186)at org.apache.axis2.engine.AxisEngine.receive(AxisEngine.java:127)at org.apache.axis2.transport.http.HTTPTransportUtils.processHTTPPostRequest(HTTPTransportUtils.java:102)at org.apache.axis2.transport.http.HTTPWorker.doWork(HTTPWorker.java:110)at org.apache.axis2.util.threadpool.ThreadWorker.run(ThreadWorker.java:34)Caused by: org.apache.axis2.AxisFault: Intentional Failure from SOAP 1.2 testing ...at org.apache.axis2.soap12testing.handlers.SOAP12InFlowHandlerDefaultC.invoke(SOAP12InFlowHandlerDefaultC.java:120)at org.apache.axis2.engine.Phase.invoke(Phase.java:161)at org.apache.axis2.engine.AxisEngine.invokePhases(AxisEngine.java:252)at org.apache.axis2.engine.AxisEngine.receive(AxisEngine.java:118)... 3 more</soapenv:Exception>
</soapenv:Detail>
<soapenv:Code>
<soapenv:Value>env:MustUnderstand</soapenv:Value>
Modified: webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java (original)
+++ webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java Wed Jul 27 00:57:39 2005
@@ -32,7 +32,7 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
import java.util.Iterator;
Modified: webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java (original)
+++ webservices/axis/trunk/java/modules/samples/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java Wed Jul 27 00:57:39 2005
@@ -31,7 +31,7 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
import java.util.Iterator;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.Call;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.MessageSender;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -18,6 +18,7 @@
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;
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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -21,6 +21,7 @@
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;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/util/MyInOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/util/MyInOutMEPClient.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/util/MyInOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/engine/util/MyInOutMEPClient.java Wed Jul 27 00:57:39 2005
@@ -3,9 +3,9 @@
import org.apache.axis2.clientapi.Call;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilServer.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilServer.java Wed Jul 27 00:57:39 2005
@@ -23,9 +23,9 @@
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.description.ModuleDescription;
import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.io.File;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/integration/UtilsTCPServer.java Wed Jul 27 00:57:39 2005
@@ -19,8 +19,8 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.transport.tcp.TCPServer;
+import org.apache.axis2.AxisFault;
import javax.xml.namespace.QName;
import java.io.File;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Wed Jul 27 00:57:39 2005
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.MessageSender;
@@ -31,7 +32,6 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Wed Jul 27 00:57:39 2005
@@ -20,6 +20,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
@@ -34,7 +35,6 @@
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.om.OMAbstractFactory;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Wed Jul 27 00:57:39 2005
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
@@ -33,7 +34,6 @@
import org.apache.axis2.description.OperationDescription;
import org.apache.axis2.description.ServiceDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.om.OMAbstractFactory;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/UtilsMailServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/UtilsMailServer.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/UtilsMailServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/mail/UtilsMailServer.java Wed Jul 27 00:57:39 2005
@@ -22,9 +22,9 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.transport.mail.server.MailConstants;
import org.apache.axis2.transport.mail.server.MailServer;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Wed Jul 27 00:57:39 2005
@@ -19,6 +19,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
@@ -26,7 +27,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsTCPServer;
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Wed Jul 27 00:57:39 2005
@@ -19,6 +19,7 @@
import junit.framework.TestCase;
import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.clientapi.AsyncResult;
@@ -26,7 +27,6 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilsTCPServer;
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Wed Jul 27 00:57:39 2005
@@ -17,7 +17,7 @@
public class <xsl:value-of select="@name"/> extends <xsl:value-of select="@basereceiver"/>{
public void invokeBusinessLogic(org.apache.axis2.context.MessageContext msgContext, org.apache.axis2.context.MessageContext newMsgContext)
- throws org.apache.axis2.engine.AxisFault{
+ throws org.apache.axis2.AxisFault{
try {
@@ -30,7 +30,7 @@
//Find the operation that has been set by the Dispatch phase.
org.apache.axis2.description.OperationDescription op = msgContext.getOperationContext().getAxisOperation();
if (op == null) {
- throw new org.apache.axis2.engine.AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
+ throw new org.apache.axis2.AxisFault("Operation is not located, if this is doclit style the SOAP-ACTION should specified via the SOAP Action to use the RawXMLProvider");
}
String methodName;
@@ -66,7 +66,7 @@
org.apache.axis2.om.OMElement firstChild = (org.apache.axis2.om.OMElement)msgContext.getEnvelope().getBody().getFirstChild();
if(null == firstChild)
- throw new org.apache.axis2.engine.AxisFault("Wrapper Element Not Found for the operation of RPC style");
+ throw new org.apache.axis2.AxisFault("Wrapper Element Not Found for the operation of RPC style");
java.util.Iterator children = firstChild.getChildren();
org.apache.xmlbeans.XmlObject[] params = new org.apache.xmlbeans.XmlObject[<xsl:value-of select="$inputparamcount"/>];
int count = 0;
@@ -75,7 +75,7 @@
count++;
}
if(count!= <xsl:value-of select="$inputparamcount"/>)
- throw new org.apache.axis2.engine.AxisFault("Parts mismatch in the message");
+ throw new org.apache.axis2.AxisFault("Parts mismatch in the message");
</xsl:if>
</xsl:for-each>
@@ -134,7 +134,7 @@
} catch (Exception e) {
- throw org.apache.axis2.engine.AxisFault.makeFault(e);
+ throw org.apache.axis2.AxisFault.makeFault(e);
}
<xsl:for-each select="method"/>
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java Wed Jul 27 00:57:39 2005
@@ -73,7 +73,14 @@
public static final String SOAP_FAULT_DETAIL_EXCEPTION_ENTRY = "Exception";
- // -------- SOAP Exceptions ------------------------------
+ // -------- SOAP Fault Codes ------------------------------
+ public static final String FAULT_CODE_VERSION_MISMATCH = "env:VersionMismatch";
+ public static final String FAULT_CODE_MUST_UNDERSTAND = "env:MustUnderstand";
+ public static final String FAULT_CODE_DATA_ENCODING_UNKNOWN = "env:DataEncodingUnknown";
+
+ // Followings are different in SOAP 1.1 and 1.2 specifications
+ public static final String FAULT_CODE_SENDER = "";
+ public static final String FAULT_CODE_RECEIVER = "";
+
-
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPProcessingException.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPProcessingException.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPProcessingException.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPProcessingException.java Wed Jul 27 00:57:39 2005
@@ -19,14 +19,38 @@
* <p/>
*/
public class SOAPProcessingException extends OMException {
+
+ private String soapFaultCode;
+
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
public SOAPProcessingException(String message) {
- super(message); //To change body of overridden methods use File | Settings | File Templates.
+ super(message);
}
public SOAPProcessingException(Throwable cause) {
super(cause);
+ }
+
+ /**
+ *
+ * @param messageText - this will appear as the Text in the Reason information item of SOAP Fault
+ * @param faultCode - this will appear as the Value in the Code information item of SOAP Fault
+ * @param cause - this will appear under the Detail information item of SOAP Fault
+ */
+ public SOAPProcessingException(String messageText, String faultCode, Throwable cause) {
+ super(messageText, cause);
+ this.soapFaultCode = faultCode;
+ }
+
+ /**
+ *
+ * @param messageText - this will appear as the Text in the Reason information item of SOAP Fault
+ * @param faultCode - this will appear as the Value in the Code information item of SOAP Fault
+ */
+ public SOAPProcessingException(String messageText, String faultCode) {
+ super(messageText);
+ this.soapFaultCode = faultCode;
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Wed Jul 27 00:57:39 2005
@@ -1,25 +1,21 @@
/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package org.apache.axis2.soap.impl.llom.builder;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMException;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.*;
import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
import org.apache.axis2.om.impl.llom.exception.OMBuilderException;
import org.apache.axis2.soap.SOAPBody;
@@ -31,6 +27,7 @@
import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
+import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -73,10 +70,6 @@
private boolean processingFault = false;
- //added
- /*This is used to notice whether all mandatory fault elements are present
- */
- private boolean processingMandatoryFaultElements = false;
//added
@@ -85,6 +78,9 @@
private boolean processingDetailElements = false;
private SOAPBuilderHelper builderHelper;
+ private String senderfaultCode;
+ private String receiverfaultCode;
+ private boolean processingMandatoryFaultElements;
/**
* Constructor StAXSOAPModelBuilder
@@ -93,7 +89,6 @@
* here is to check whether actually the soap message contained also of that version.
* If one is not creating the builder from the transport he can just pass null for this.
*
- *
* @param parser
*/
public StAXSOAPModelBuilder(XMLStreamReader parser, String soapVersion) {
@@ -104,13 +99,13 @@
}
/**
- *
* @param parser
* @param factory
- * @param soapVersion parameter is to give the soap version from the transport. For example, in HTTP case
- * you can identify the version of the soap message u have recd by looking at the HTTP headers. By passing that
- * here is to check whether actually the soap message contained also of that version.
- * If one is not creating the builder from the transport he can just pass null for this.
+ * @param soapVersion parameter is to give the soap version from the transport. For example, in
+ * HTTP case you can identify the version of the soap message u have recd by looking at
+ * the HTTP headers. By passing that here is to check whether actually the soap message
+ * contained also of that version. If one is not creating the builder from the transport
+ * he can just pass null for this.
*/
public StAXSOAPModelBuilder(XMLStreamReader parser, SOAPFactory factory, String soapVersion) {
super(parser);
@@ -124,45 +119,31 @@
SOAPEnvelope soapEnvelope = getSOAPEnvelope();
if (soapEnvelope == null) {
- throw new OMException("env:VersionMismatch");
+ throw new SOAPProcessingException("SOAP Message does not contain an Envelope",
+ SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
}
envelopeNamespace = soapEnvelope.getNamespace();
String namespaceName = envelopeNamespace.getName();
if ((soapVersionURIFromTransport != null) && !(soapVersionURIFromTransport.equals(namespaceName))) {
- throw new OMException("env:VersionMismatch");
+ throw new SOAPProcessingException("Transport level information does not match with SOAP" +
+ " Message namespace URI", SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
+
}
if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceName)) {
soapFactory = OMAbstractFactory.getSOAP12Factory();
+ log.info("Starting Process SOAP 1.2 message");
} else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(namespaceName)) {
soapFactory = OMAbstractFactory.getSOAP11Factory();
+ log.info("Starting Process SOAP 1.1 message");
+
} else {
- throw new OMException("env:VersionMismatch");
+ throw new SOAPProcessingException("Only SOAP 1.1 or SOAP 1.2 messages are supported in the" +
+ " system", SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
}
}
-// envelopeNamespace =
-// soapEnvelope.getNamespace().getName()
-
-
-// if (envelopeNamespace == null) {
-// envelopeNamespace =
-// getSOAPEnvelope().findNamespace(
-// SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
-// if (envelopeNamespace == null ) {
-// throw new OMException(
-// "Invalid SOAP message. Doesn't have proper namespace declaration !!");
-// } else {
-// log.info("SOAP 1.1 message received ..");
-// soapFactory = OMAbstractFactory.getSOAP11Factory();
-// }
-// } else {
-// log.info("SOAP 1.2 message received ..");
-// soapFactory = OMAbstractFactory.getSOAP12Factory();
-// }
-
-
private void parseHeaders() {
// by the time execution comes here the nullity of SOAPEnvelope has been cheched in the
// identifySOAPVersion() method. So not checking getSOAPEnvelope() == null here
@@ -234,8 +215,8 @@
OMElement element = null;
if (parent == null) {
if (!elementName.equalsIgnoreCase(SOAPConstants.SOAPENVELOPE_LOCAL_NAME)) {
- throw new OMException("First Element must contain the local name, "
- + SOAPConstants.SOAPENVELOPE_LOCAL_NAME);
+ throw new SOAPProcessingException("First Element must contain the local name, "
+ + SOAPConstants.SOAPENVELOPE_LOCAL_NAME, SOAPConstants.FAULT_CODE_VERSION_MISMATCH);
}
envelope =
(SOAPEnvelopeImpl) soapFactory.createSOAPEnvelope(this);
@@ -249,10 +230,10 @@
// this is either a header or a body
if (elementName.equals(SOAPConstants.HEADER_LOCAL_NAME)) {
if (headerPresent) {
- throw new OMBuilderException("Multiple headers encountered!");
+ throw new SOAPProcessingException("Multiple headers encountered!", getSenderFaultCode());
}
if (bodyPresent) {
- throw new OMBuilderException("Header Body wrong order!");
+ throw new SOAPProcessingException("Header Body wrong order!", getSenderFaultCode());
}
headerPresent = true;
element =
@@ -265,7 +246,7 @@
} else if (elementName.equals(SOAPConstants.BODY_LOCAL_NAME)) {
if (bodyPresent) {
- throw new OMBuilderException("Multiple body elements encountered");
+ throw new SOAPProcessingException("Multiple body elements encountered", getSenderFaultCode());
}
bodyPresent = true;
element =
@@ -277,9 +258,9 @@
processAttributes(element);
} else {
- throw new OMBuilderException(elementName
+ throw new SOAPProcessingException(elementName
+
- " is not supported here. Envelope can not have elements other than Header and Body.");
+ " is not supported here. Envelope can not have elements other than Header and Body.", getSenderFaultCode());
}
} else if ((elementLevel == 3)
&&
@@ -291,7 +272,7 @@
soapFactory.createSOAPHeaderBlock(elementName, null,
(SOAPHeader) parent, this);
} catch (SOAPProcessingException e) {
- throw new OMBuilderException(e);
+ throw new SOAPProcessingException("Can not create SOAPHeader block", getReceiverFaultCode(), e);
}
processNamespaceData(element, false);
processAttributes(element);
@@ -330,6 +311,20 @@
return element;
}
+ private String getSenderFaultCode() {
+ if(senderfaultCode == null){
+ senderfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName()) ? SOAP12Constants.FAULT_CODE_SENDER : SOAP11Constants.FAULT_CODE_SENDER;
+ }
+ return senderfaultCode;
+ }
+
+ private String getReceiverFaultCode() {
+ if(receiverfaultCode == null){
+ receiverfaultCode = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(envelopeNamespace.getName()) ? SOAP12Constants.FAULT_CODE_RECEIVER : SOAP11Constants.FAULT_CODE_RECEIVER;
+ }
+ return receiverfaultCode;
+ }
+
/**
* Method next
*
@@ -385,7 +380,8 @@
next();
break;
default :
- throw new OMException();
+ throw new SOAPProcessingException("SOAP Message contains not allowed information" +
+ " item", getSenderFaultCode());
}
return token;
} catch (OMException e) {
@@ -432,9 +428,7 @@
namespace = node.findNamespace(namespaceURI, prefix);
}
node.setNamespace(namespace);
- } else {
-
- }
+ }
@@ -447,7 +441,7 @@
if (node.getNamespace() != null &&
!node.getNamespace().getName().equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI) &&
!node.getNamespace().getName().equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- throw new OMBuilderException("invalid SOAP namespace URI");
+ throw new SOAPProcessingException("invalid SOAP namespace URI", getSenderFaultCode());
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11Constants.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11Constants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11Constants.java Wed Jul 27 00:57:39 2005
@@ -46,6 +46,10 @@
//SOAP 1.2 Content Type
public static final String SOAP_11_CONTENT_TYPE = "text/xml";
-
+
+ // -------- SOAP Fault Codes ------------------------------
+ public static final String FAULT_CODE_SENDER = "Client";
+ public static final String FAULT_CODE_RECEIVER = "Server";
+
public static final String SOAP_ACTOR_NEXT = "http://schemas.xmlsoap.org/soap/actor/next";
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12Constants.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12Constants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap12/SOAP12Constants.java Wed Jul 27 00:57:39 2005
@@ -59,7 +59,11 @@
//SOAP 1.2 Content Type
public static final String SOAP_12_CONTENT_TYPE = "application/soap+xml";
-
+
+ // -------- SOAP Fault Codes ------------------------------
+ public static final String FAULT_CODE_SENDER = "Sender";
+ public static final String FAULT_CODE_RECEIVER = "Receiver";
+
public static final String SOAP_ROLE_NEXT = "http://www.w3.org/2003/05/soap-envelope/role/next";
public static final String SOAP_ROLE_NONE = "http://www.w3.org/2003/05/soap-envelope/role/next";
public static final String SOAP_ROLE_ULTIMATE_RECEIVER = "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";