axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r375411 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: addressing/AddressingConstants.java deployment/AxisServiceBuilder.java
Date Mon, 06 Feb 2006 23:32:45 GMT
Author: dims
Date: Mon Feb  6 15:32:26 2006
New Revision: 375411

URL: http://svn.apache.org/viewcvs?rev=375411&view=rev
Log:
add a WSAW as per current editor's draft, pick up wsaw:Action from wsdl, consolidate the location
of the constants

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java?rev=375411&r1=375410&r2=375411&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/addressing/AddressingConstants.java
Mon Feb  6 15:32:26 2006
@@ -46,6 +46,8 @@
         // ====================== Addressing 1.0 Final Version Constants ====================
         public static final String WSA_NAMESPACE =
                 "http://www.w3.org/2005/08/addressing";
+        public static final String WSAW_NAMESPACE =
+                "http://www.w3.org/2005/08/addressing/wsdl";
         public static final String WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE =
                 "http://www.w3.org/2005/08/addressing/reply";
         public static final String WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE = "IsReferenceParameter";

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java?rev=375411&r1=375410&r2=375411&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisServiceBuilder.java
Mon Feb  6 15:32:26 2006
@@ -17,7 +17,7 @@
 package org.apache.axis2.deployment;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.util.Utils;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.description.*;
 import org.apache.axis2.util.XMLUtils;
 import org.apache.commons.logging.Log;
@@ -85,10 +85,6 @@
 
     private static final String XMLNS_AXIS2WRAPPED = "xmlns:axis2wrapped";
 
-    private static final String WSA_NS_URI = "http://schemas.xmlsoap.org/ws/2004/08/addressing";
-
-    private static final String WSA_ACTION = "Action";
-
     private Log logger = LogFactory.getLog(this.getClass().getName());
 
     private int nsCount = 1;
@@ -884,8 +880,12 @@
     }
 
     private String getWsaAction(Map extAttributes) {
-        Object wsaAction = extAttributes.get(new QName(WSA_NS_URI, WSA_ACTION));
-
+        Object wsaAction = extAttributes.get(new QName(AddressingConstants.Submission.WSA_NAMESPACE,
AddressingConstants.WSA_ACTION));
+        if (wsaAction != null) {
+            return ((QName) wsaAction).getLocalPart();
+        }
+        
+        wsaAction = extAttributes.get(new QName(AddressingConstants.Final.WSAW_NAMESPACE,
AddressingConstants.WSA_ACTION));
         if (wsaAction != null) {
             return ((QName) wsaAction).getLocalPart();
         }



Mime
View raw message