axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r637161 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing: AddressingConstants.java EndpointReferenceHelper.java metadata/InterfaceName.java metadata/ServiceName.java
Date Fri, 14 Mar 2008 17:11:18 GMT
Author: pradine
Date: Fri Mar 14 10:11:18 2008
New Revision: 637161

URL: http://svn.apache.org/viewvc?rev=637161&view=rev
Log:
Tolerate the namespace of the older WS-Addressing WSDL Binding Spec.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/InterfaceName.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/ServiceName.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java?rev=637161&r1=637160&r2=637161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
Fri Mar 14 10:11:18 2008
@@ -158,6 +158,7 @@
         static final String WSA_POLICIES = "Policies";
         static final String WSA_METADATA = "Metadata";
         static final String WSA_DEFAULT_METADATA_PREFIX = "wsam";
+        static final String WSA_ORIGINAL_METADATA_PREFIX = "wsaw";
 
         static final String WSA_INTERFACE_NAME = "InterfaceName";
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?rev=637161&r1=637160&r2=637161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
Fri Mar 14 10:11:18 2008
@@ -473,7 +473,7 @@
             epr.addExtensibleElement(omElement);
         }
         else {
-            OMElement omElement = serviceName.toOM(factory, ServiceName.finalQName);
+            OMElement omElement = serviceName.toOM(factory, ServiceName.wsamQName);
             epr.addMetaData(omElement);
         }
     }
@@ -496,7 +496,7 @@
             epr.addExtensibleElement(omElement);
         }
         else {
-            OMElement omElement = interfaceName.toOM(factory, InterfaceName.finalQName);
+            OMElement omElement = interfaceName.toOM(factory, InterfaceName.wsamQName);
             epr.addMetaData(omElement);
         }
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/InterfaceName.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/InterfaceName.java?rev=637161&r1=637160&r2=637161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/InterfaceName.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/InterfaceName.java
Fri Mar 14 10:11:18 2008
@@ -30,7 +30,8 @@
 
 public class InterfaceName {
     public static final QName subQName = new QName(Submission.WSA_NAMESPACE, Submission.WSA_INTERFACE_NAME,
AddressingConstants.WSA_DEFAULT_PREFIX);
-    public static final QName finalQName = new QName(Final.WSAM_NAMESPACE, Final.WSA_INTERFACE_NAME,
Final.WSA_DEFAULT_METADATA_PREFIX);
+    public static final QName wsamQName = new QName(Final.WSAM_NAMESPACE, Final.WSA_INTERFACE_NAME,
Final.WSA_DEFAULT_METADATA_PREFIX);
+    public static final QName wsawQName = new QName(Final.WSAW_NAMESPACE, Final.WSA_INTERFACE_NAME,
Final.WSA_ORIGINAL_METADATA_PREFIX);
     
     /**
      * Field name
@@ -128,7 +129,7 @@
     public void fromOM(OMElement omElement) throws AxisFault {
         QName qname = omElement.getQName();
         
-        if (!finalQName.equals(qname) && !subQName.equals(qname)) {
+        if (!wsamQName.equals(qname) && !wsawQName.equals(qname) && !subQName.equals(qname))
{
             throw new AxisFault("Unrecognized element.");
         }
 
@@ -148,7 +149,7 @@
         boolean result = false;
         QName qname = omElement.getQName();
         
-        if (finalQName.equals(qname) || subQName.equals(qname))
+        if (wsamQName.equals(qname) || wsawQName.equals(qname) || subQName.equals(qname))
             result = true;
         
         return result;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/ServiceName.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/ServiceName.java?rev=637161&r1=637160&r2=637161&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/ServiceName.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/metadata/ServiceName.java
Fri Mar 14 10:11:18 2008
@@ -30,7 +30,8 @@
 
 public class ServiceName {
     public static final QName subQName = new QName(Submission.WSA_NAMESPACE, AddressingConstants.EPR_SERVICE_NAME,
AddressingConstants.WSA_DEFAULT_PREFIX);
-    public static final QName finalQName = new QName(Final.WSAM_NAMESPACE, AddressingConstants.EPR_SERVICE_NAME,
Final.WSA_DEFAULT_METADATA_PREFIX);
+    public static final QName wsamQName = new QName(Final.WSAM_NAMESPACE, AddressingConstants.EPR_SERVICE_NAME,
Final.WSA_DEFAULT_METADATA_PREFIX);
+    public static final QName wsawQName = new QName(Final.WSAW_NAMESPACE, AddressingConstants.EPR_SERVICE_NAME,
Final.WSA_ORIGINAL_METADATA_PREFIX);
     
     /**
      * Field name
@@ -166,7 +167,7 @@
     public void fromOM(OMElement omElement) throws AxisFault {
         QName qname = omElement.getQName();
         String attributeName = null;
-        if (finalQName.equals(qname)) {
+        if (wsamQName.equals(qname) || wsawQName.equals(qname)) {
             attributeName = Final.WSA_SERVICE_NAME_ENDPOINT_NAME;
         }
         else if (subQName.equals(qname)) {
@@ -193,7 +194,7 @@
         boolean result = false;
         QName qname = omElement.getQName();
         
-        if (finalQName.equals(qname) || subQName.equals(qname))
+        if (wsamQName.equals(qname) || wsawQName.equals(qname) || subQName.equals(qname))
             result = true;
         
         return 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