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 pr...@apache.org on 2006/09/28 14:40:25 UTC

svn commit: r450839 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java kernel/src/org/apache/axis2/client/Options.java

Author: pradine
Date: Thu Sep 28 05:40:24 2006
New Revision: 450839

URL: http://svn.apache.org/viewvc?view=rev&rev=450839
Log:
Update deprecated constants.

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?view=diff&rev=450839&r1=450838&r2=450839
==============================================================================
--- 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 Sep 28 05:40:24 2006
@@ -204,8 +204,8 @@
                         new QName(AddressingConstants.WSA_RELATES_TO_RELATIONSHIP_TYPE));
         String relationshipTypeDefaultValue =
                 Submission.WSA_NAMESPACE.equals(addressingNamespace)
-                        ? Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE
-                        : Final.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE;
+                        ? Submission.WSA_DEFAULT_RELATIONSHIP_TYPE
+                        : Final.WSA_DEFAULT_RELATIONSHIP_TYPE;
         RelatesTo relatesTo =
                 new RelatesTo(
                         address,

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java?view=diff&rev=450839&r1=450838&r2=450839
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java Thu Sep 28 05:40:24 2006
@@ -263,10 +263,11 @@
     }
 
     /**
-     * Get WS-Addressing RelatesTo item which has the specific type
-     * "http://www.w3.org/2005/08/addressing/reply"
+     * Return a single instance of WS-Addressing RelatesTo that has a relationship
+     * type of either "http://www.w3.org/2005/08/addressing/reply" or "wsa:Reply".
+     * If no such instance of RelatesTo can be found then return <code>null</code>.
      *
-     * @return item
+     * @return an instance of {@link RelatesTo}
      */
     public RelatesTo getRelatesTo() {
         if (relationships == null && parent != null) {
@@ -276,7 +277,7 @@
             RelatesTo relatesTo = (RelatesTo) relationships.get(i);
             String relationshipType = relatesTo.getRelationshipType();
             if (relationshipType.equals(AddressingConstants.Final.WSA_DEFAULT_RELATIONSHIP_TYPE)
-                    || relationshipType.equals(AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE))
+                    || relationshipType.equals(AddressingConstants.Submission.WSA_DEFAULT_RELATIONSHIP_TYPE))
             {
                 return relatesTo;
             }



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