axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r395141 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/description/ core/src/org/apache/axis2/e...
Date Wed, 19 Apr 2006 05:42:32 GMT
Author: chinthaka
Date: Tue Apr 18 22:42:31 2006
New Revision: 395141

URL: http://svn.apache.org/viewcvs?rev=395141&view=rev
Log:
- Adding + getRelatesTo():RelatesTo and
- renaming + getRelatesTo():RelatesTo[] to  + getRelationships():RelatesTo[] as earlier name
conflicts with the above method name.


Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/MessageContext.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java

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=395141&r1=395140&r2=395141&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
Tue Apr 18 22:42:31 2006
@@ -187,7 +187,7 @@
     private void processRelatesTo(SOAPEnvelope envelope, Options messageContextOptions, OMNamespace
addressingNamespaceObject) {
         if (!isAddressingHeaderAlreadyAvailable(WSA_RELATES_TO, envelope, addressingNamespaceObject))
         {
-            RelatesTo[] relatesTo = messageContextOptions.getRelatesTo();
+            RelatesTo[] relatesTo = messageContextOptions.getRelationships();
 
             if (relatesTo != null) {
                 for (int i = 0; i < relatesTo.length; i++) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java?rev=395141&r1=395140&r2=395141&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/Options.java Tue
Apr 18 22:42:31 2006
@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Collections;
 import java.util.Arrays;
 import java.util.List;
 
@@ -210,9 +209,17 @@
         return null;
     }
 
-    public RelatesTo[] getRelatesTo() {
+    /**
+     *
+     * @return the relates to which has the type http://www.w3.org/2005/08/addressing/reply
+     */
+    public RelatesTo getRelatesTo() {
+       return this.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE);
+    }
+
+    public RelatesTo[] getRelationships() {
         if (relationships == null && parent != null) {
-            return parent.getRelatesTo();
+            return parent.getRelationships();
         }
         if(relationships == null) {
             return null;

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=395141&r1=395140&r2=395141&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
Tue Apr 18 22:42:31 2006
@@ -22,6 +22,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.AxisOperation;
@@ -479,8 +480,8 @@
     /**
      * @return Returns RelatesTo array.
      */
-    public RelatesTo[] getRelatesTo() {
-        return options.getRelatesTo();
+    public RelatesTo[] getRelationships() {
+        return options.getRelationships();
     }
 
     /**
@@ -488,6 +489,13 @@
      */
     public RelatesTo getRelatesTo(String type) {
         return options.getRelatesTo(type);
+    }
+
+    /**
+     * @return Returns RelatesTo.
+     */
+    public RelatesTo getRelatesTo() {
+        return options.getRelatesTo();
     }
 
     /**

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=395141&r1=395140&r2=395141&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
Tue Apr 18 22:42:31 2006
@@ -271,11 +271,11 @@
             ConfigurationContext configContext = msgContext.getConfigurationContext();
 
             operationContext =
-                    configContext.getOperationContext(msgContext.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue());
+                    configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
                 throw new AxisFault(Messages.getMessage("cannotCorrealteMsg",
-                        this.getName().toString(), msgContext.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue()));
+                        this.getName().toString(), msgContext.getRelatesTo().getValue()));
             }
         }
 
@@ -308,7 +308,7 @@
             throws AxisFault {
         OperationContext operationContext;
 
-        if (null == msgContext.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE))
{
+        if (null == msgContext.getRelatesTo()) {
 
             // Its a new incoming message so get the factory to create a new
             // one
@@ -319,11 +319,11 @@
             ConfigurationContext configContext = msgContext.getConfigurationContext();
 
             operationContext =
-                    configContext.getOperationContext(msgContext.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue());
+                    configContext.getOperationContext(msgContext.getRelatesTo().getValue());
 
             if (null == operationContext) {
                 throw new AxisFault(Messages.getMessage("cannotCorrelateMsg",
-                        this.getName().toString(), msgContext.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue()));
+                        this.getName().toString(), msgContext.getRelatesTo().getValue()));
             }
         }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java?rev=395141&r1=395140&r2=395141&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AddressingBasedDispatcher.java
Tue Apr 18 22:42:31 2006
@@ -111,10 +111,10 @@
 
         // first check we can dispatch using the relates to
         if (msgctx.getRelatesTo() != null) {
-            log.debug(Messages.getMessage("checkingrelatesto",
-                    msgctx.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue()));
+            String relatesTo = msgctx.getRelatesTo().getValue();
 
-            String relatesTo = msgctx.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE).getValue();
+            log.debug(Messages.getMessage("checkingrelatesto",
+                    relatesTo));
 
             if ((relatesTo != null) || "".equals(relatesTo)) {
                 OperationContext operationContext =

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java?rev=395141&r1=395140&r2=395141&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/CallbackReceiver.java
Tue Apr 18 22:42:31 2006
@@ -28,7 +28,7 @@
     }
 
     public void receive(MessageContext messageCtx) throws AxisFault {
-        RelatesTo relatesTO = messageCtx.getOptions().getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE);
+        RelatesTo relatesTO = messageCtx.getOptions().getRelatesTo();
         String messageID = relatesTO.getValue();
         Callback callback = (Callback) callbackStore.get(messageID);
         AsyncResult result = new AsyncResult(messageCtx);

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=395141&r1=395140&r2=395141&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
(original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
Tue Apr 18 22:42:31 2006
@@ -55,7 +55,7 @@
         assertNull(msgctx.getFrom());
 
         msgctx.setRelatesTo(null);
-        assertNull(msgctx.getRelatesTo(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE));
+        assertNull(msgctx.getRelatesTo());
 
         msgctx.setReplyTo(null);
         assertNull(msgctx.getReplyTo());



Mime
View raw message