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 di...@apache.org on 2005/11/17 16:11:48 UTC

svn commit: r345258 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ addressing/test/org/apache/axis2/handlers/addressing/ codegen/src/org/apache/axis2/databinding/extensions/ codegen/src/org/apache/axis2...

Author: dims
Date: Thu Nov 17 07:11:25 2005
New Revision: 345258

URL: http://svn.apache.org/viewcvs?rev=345258&view=rev
Log:
code refactoring (reviewing javadocs)

- move XMLBeansSchemaUtility to org\apache\axis2\databinding\extensions
- move RelatesTo to org\apache\axis2\addressing
- Get rid of unnecessary SOAPFaultException interface. Used ONLY in 1 place inside AxisEngine.

Please expect more changes and holler if i mess up :)


Added:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeansSchemaUtility.java
      - copied, changed from r345239, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/XMLBeansSchemaUtility.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java   (contents, props changed)
      - copied, changed from r345239, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/miheaders/RelatesTo.java
Removed:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/XMLBeansSchemaUtility.java
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/SOAPFaultException.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/miheaders/RelatesTo.java
Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
    webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
    webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPProcessingException.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Nov 17 07:11:25 2005
@@ -22,7 +22,7 @@
 import org.apache.axis2.addressing.AnyContentType;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceGroupContext;
 import org.apache.axis2.handlers.AbstractHandler;

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Thu Nov 17 07:11:25 2005
@@ -23,7 +23,6 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.addressing.ServiceName;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -160,7 +159,7 @@
             processStringInfo(messageID, WSA_MESSAGE_ID, soapHeader);
         }
 
-        RelatesTo relatesTo = messageInformationHeaders.getRelatesTo();
+        org.apache.axis2.addressing.RelatesTo relatesTo = messageInformationHeaders.getRelatesTo();
         OMElement relatesToHeader = null;
 
         if (relatesTo != null) {

Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Thu Nov 17 07:11:25 2005
@@ -22,7 +22,6 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.MessageInformationHeaders;
 import org.apache.axis2.addressing.ServiceName;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.handlers.util.TestUtil;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -132,7 +131,7 @@
         mIHeaders.setMessageId("123456-7890");
         mIHeaders.setAction("http://www.actions.org/action");
 
-        RelatesTo relatesTo = new RelatesTo(
+        org.apache.axis2.addressing.RelatesTo relatesTo = new org.apache.axis2.addressing.RelatesTo(
                 "http://www.relatesTo.org/service/", "TestRelation");
         mIHeaders.setRelatesTo(relatesTo);
 

Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeansSchemaUtility.java (from r345239, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/XMLBeansSchemaUtility.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeansSchemaUtility.java?p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeansSchemaUtility.java&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/XMLBeansSchemaUtility.java&r1=345239&r2=345258&rev=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeans/XMLBeansSchemaUtility.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/extensions/XMLBeansSchemaUtility.java Thu Nov 17 07:11:25 2005
@@ -1,4 +1,4 @@
-package org.apache.axis2.databinding.extensions.XMLBeans;
+package org.apache.axis2.databinding.extensions;
 
 import com.ibm.wsdl.DefinitionImpl;
 import com.ibm.wsdl.InputImpl;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/AxisFault.java Thu Nov 17 07:11:25 2005
@@ -31,7 +31,7 @@
  * </ol>
  */
 
-public class AxisFault extends RemoteException implements SOAPFaultException{
+public class AxisFault extends RemoteException {
     private String soapFaultCode;
 
     public AxisFault(Throwable arg1) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/MessageInformationHeaders.java Thu Nov 17 07:11:25 2005
@@ -15,7 +15,6 @@
  */
 package org.apache.axis2.addressing;
 
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.soap.SOAPHeader;
 
@@ -207,7 +206,7 @@
      *
      * @return
      */
-    public RelatesTo getRelatesTo() {
+    public org.apache.axis2.addressing.RelatesTo getRelatesTo() {
 
         return relatesTo;
     }
@@ -217,7 +216,7 @@
      *
      * @param relatesTo
      */
-    public void setRelatesTo(RelatesTo relatesTo) {
+    public void setRelatesTo(org.apache.axis2.addressing.RelatesTo relatesTo) {
 
         this.relatesTo = relatesTo;
     }

Copied: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java (from r345239, webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/miheaders/RelatesTo.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java?p2=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java&p1=webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/miheaders/RelatesTo.java&r1=345239&r2=345258&rev=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/miheaders/RelatesTo.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java Thu Nov 17 07:11:25 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.axis2.addressing.miheaders;
+package org.apache.axis2.addressing;
 
 import java.io.Serializable;
 

Propchange: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/RelatesTo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/CallbackReceiver.java Thu Nov 17 07:11:25 2005
@@ -1,7 +1,7 @@
 package org.apache.axis2.clientapi;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.MessageReceiver;
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/MEPClient.java Thu Nov 17 07:11:25 2005
@@ -19,7 +19,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.AxisOperation;
@@ -313,7 +312,7 @@
     /**
      * @param relatesTo
      */
-    public void setRelatesTo(RelatesTo relatesTo) {
+    public void setRelatesTo(org.apache.axis2.addressing.RelatesTo relatesTo) {
         messageInformationHeaders.setRelatesTo(relatesTo);
     }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java Thu Nov 17 07:11:25 2005
@@ -19,7 +19,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisConfigurationImpl;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisEngine.java Thu Nov 17 07:11:25 2005
@@ -17,7 +17,6 @@
 package org.apache.axis2.engine;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.SOAPFaultException;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
@@ -338,7 +337,7 @@
             MessageContext context,
             SOAPFault fault,
             Throwable e) {
-        SOAPFaultException soapException = null;
+        SOAPProcessingException soapException = null;
         String soapNamespaceURI = "";
 
         // get the current SOAP version
@@ -354,9 +353,7 @@
         } else if (e instanceof AxisFault) {
             if (e.getCause() instanceof SOAPProcessingException) {
                 soapException = (SOAPProcessingException) e.getCause();
-            } else {
-                soapException = (SOAPFaultException) e;
-            }
+            } 
         } else {
             // we have recd an instance of just the Exception class
         }
@@ -368,15 +365,17 @@
             fault.setCode((SOAPFaultCode) faultCode);
         } else if (soapException != null) {
             soapFaultCode = soapException.getFaultCode();
-
-            // defaulting to fault code Sender, if no message is available
-            soapFaultCode =
-                    ("".equals(soapFaultCode) || soapFaultCode == null)
-                            ? getSenderFaultCode(soapNamespaceURI)
-                            : soapFaultCode;
-            fault.getCode().getValue().setText(soapFaultCode);
+        } else if (e instanceof AxisFault) {
+            soapFaultCode = ((AxisFault)e).getFaultCode();
         }
 
+        // defaulting to fault code Sender, if no message is available
+        soapFaultCode =
+                ("".equals(soapFaultCode) || soapFaultCode == null)
+                        ? getSenderFaultCode(soapNamespaceURI)
+                        : soapFaultCode;
+        fault.getCode().getValue().setText(soapFaultCode);
+
         Object faultReason =
                 context.getProperty(SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME);
         String message = "";
@@ -384,12 +383,14 @@
             fault.setReason((SOAPFaultReason) faultReason);
         } else if (soapException != null) {
             message = soapException.getMessage();
-
-            // defaulting to reason, unknown, if no reason is available
-            message =
-                    ("".equals(message) || message == null) ? "unknown" : message;
-            fault.getReason().getSOAPText().setText(message);
+        } else if (e instanceof AxisFault) {
+            message = ((AxisFault)e).getMessage();
         }
+
+        // defaulting to reason, unknown, if no reason is available
+        message =
+                ("".equals(message) || message == null) ? "unknown" : message;
+        fault.getReason().getSOAPText().setText(message);
 
         Object faultRole =
                 context.getProperty(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Thu Nov 17 07:11:25 2005
@@ -20,7 +20,6 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.MessageInformationHeaders;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
@@ -69,7 +68,7 @@
                 oldMessageInfoHeaders.getFaultTo());
         messageInformationHeaders.setFrom(oldMessageInfoHeaders.getTo());
         messageInformationHeaders.setRelatesTo(
-                new RelatesTo(oldMessageInfoHeaders.getMessageId(),
+                new org.apache.axis2.addressing.RelatesTo(oldMessageInfoHeaders.getMessageId(),
                         AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
         messageInformationHeaders.setAction(oldMessageInfoHeaders.getAction());
         newmsgCtx.setMessageInformationHeaders(messageInformationHeaders);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/addressing/miheaders/RelatesToTest.java Thu Nov 17 07:11:25 2005
@@ -17,6 +17,7 @@
 package org.apache.axis2.addressing.miheaders;
 
 import junit.framework.TestCase;
+import org.apache.axis2.addressing.RelatesTo;
 
 
 public class RelatesToTest extends TestCase {
@@ -35,7 +36,7 @@
     }
 
     public void testGetAddress() {
-        relatesTo = new RelatesTo(address, relationshipType);
+        relatesTo = new org.apache.axis2.addressing.RelatesTo(address, relationshipType);
 
         assertEquals(
                 "RelatesTo address has not been set properly in the constructor",

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerailzationWithEngine.java Thu Nov 17 07:11:25 2005
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextSerializationTest.java Thu Nov 17 07:11:25 2005
@@ -18,7 +18,6 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
@@ -98,7 +97,7 @@
         MessageContext outMessage = new MessageContext(configurationContext);
         inMessage.setMessageID(MSG1_ID);
         outMessage.setMessageID(MSG2_ID);
-        outMessage.setRelatesTo(new RelatesTo (MSG1_ID));
+        outMessage.setRelatesTo(new org.apache.axis2.addressing.RelatesTo (MSG1_ID));
         inMessage.setServiceGroupContextId(SERVICE_GROUP_CONTEXT_ID);
         outMessage.setServiceGroupContextId(SERVICE_GROUP_CONTEXT_ID);
         inMessage.setServiceGroupContext(serviceGroupContext);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Thu Nov 17 07:11:25 2005
@@ -18,7 +18,7 @@
 
 import org.apache.axis2.AbstractTestCase;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.miheaders.RelatesTo;
+import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.InOutAxisOperation;

Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPProcessingException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPProcessingException.java?rev=345258&r1=345257&r2=345258&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPProcessingException.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPProcessingException.java Thu Nov 17 07:11:25 2005
@@ -16,10 +16,9 @@
 
 package org.apache.axis2.soap;
 
-import org.apache.axis2.SOAPFaultException;
 import org.apache.axis2.om.OMException;
 
-public class SOAPProcessingException extends OMException implements SOAPFaultException{
+public class SOAPProcessingException extends OMException {
 
     private String soapFaultCode;