axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davidills...@apache.org
Subject svn commit: r487151 - in /webservices/axis2/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java kernel/src/org/apache/axis2/addressing/EndpointReference.java
Date Thu, 14 Dec 2006 09:49:36 GMT
Author: davidillsley
Date: Thu Dec 14 01:49:36 2006
New Revision: 487151

URL: http://svn.apache.org/viewvc?view=rev&rev=487151
Log:
Fix for AXIS2-1870
Changes to some addressing code to add support for WS-RM Anon URI
Short term fix, need to look for a better long-term solution.

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?view=diff&rev=487151&r1=487150&r2=487151
==============================================================================
--- 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 Dec 14 01:49:36 2006
@@ -302,9 +302,9 @@
         else if (!isFinalAddressingNamespace && eprCopy.hasNoneAddress()) {
             return; //Omit the header.
         }
-        else if (eprCopy.hasAnonymousAddress()) {
-            eprCopy.setAddress(anonymous);
-        }
+//        else if (eprCopy.hasAnonymousAddress()) {
+//            eprCopy.setAddress(anonymous);
+//        }
 
         OMElement soapHeaderBlock = EndpointReferenceHelper.toOM(envelope.getOMFactory(),

                                         eprCopy, 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?view=diff&rev=487151&r1=487150&r2=487151
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
Thu Dec 14 01:49:36 2006
@@ -125,8 +125,11 @@
      * @return true if address is 'Anonymous URI' from either supported addressing version
      */
     public boolean hasAnonymousAddress(){
+        // TODO davidillsley 2006-12-14 Find a way of supporting the WS-RM Anon when
+        // Sandesha is engaged and not supporting it when it's not.
         boolean result  = (AddressingConstants.Final.WSA_ANONYMOUS_URL.equals(address) ||
-                           AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(address));
+                           AddressingConstants.Submission.WSA_ANONYMOUS_URL.equals(address)
||
+                           (address != null && address.startsWith("http://docs.oasis-open.org/ws-rx/wsrm/200608/anonymous?id=")));
         if(log.isTraceEnabled()){
             log.trace("hasAnonymousAddress: "+address+" is Anonymous: "+result);
         }



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


Mime
View raw message