You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ga...@apache.org on 2006/05/25 17:59:45 UTC

svn commit: r409409 - in /webservices/addressing/trunk/src/org/apache/axis/message/addressing: AddressingHeaders.java Constants.java EndpointReferenceType.java Relationship.java

Author: gawor
Date: Thu May 25 08:59:42 2006
New Revision: 409409

URL: http://svn.apache.org/viewvc?rev=409409&view=rev
Log:
updates so that things are serialized on the wire in the right way

Modified:
    webservices/addressing/trunk/src/org/apache/axis/message/addressing/AddressingHeaders.java
    webservices/addressing/trunk/src/org/apache/axis/message/addressing/Constants.java
    webservices/addressing/trunk/src/org/apache/axis/message/addressing/EndpointReferenceType.java
    webservices/addressing/trunk/src/org/apache/axis/message/addressing/Relationship.java

Modified: webservices/addressing/trunk/src/org/apache/axis/message/addressing/AddressingHeaders.java
URL: http://svn.apache.org/viewvc/webservices/addressing/trunk/src/org/apache/axis/message/addressing/AddressingHeaders.java?rev=409409&r1=409408&r2=409409&view=diff
==============================================================================
--- webservices/addressing/trunk/src/org/apache/axis/message/addressing/AddressingHeaders.java (original)
+++ webservices/addressing/trunk/src/org/apache/axis/message/addressing/AddressingHeaders.java Thu May 25 08:59:42 2006
@@ -426,10 +426,16 @@
      * @param refProp
      */
     public void addReferenceProperty(Element refProp) {
+        if (referenceProperties == null) {
+            referenceProperties = new ReferencePropertiesType();
+        }
         referenceProperties.add(refProp);
     }
 
     public void addReferenceProperty(MessageElement refProp) {
+        if (referenceProperties == null) {
+            referenceProperties = new ReferencePropertiesType();
+        }
         referenceProperties.add(refProp);
     }
 
@@ -460,7 +466,7 @@
                                         AddressingUtils.getAddressingNamespaceURI());
         }
 
-//        AddressingUtils.removeHeaders(env.getHeader(), actorURI);
+        AddressingUtils.removeHeaders(env.getHeader(), actorURI);
 
         SOAPHeaderElement header;
 
@@ -506,13 +512,17 @@
                 header.setMustUnderstand(setMustUnderstand);
             }
         }
-
-        List refProps = (List)JavaUtils.convert(referenceProperties.get_any(),
-                                                ArrayList.class);
-        serializeReferencePs(env,
-                             refProps,
-                             actorURI,
-                             false);
+        
+        if (referenceProperties != null && referenceProperties.size() > 0) {
+            List refProps = 
+                (List)JavaUtils.convert(referenceProperties.get_any(),
+                                        ArrayList.class);
+            serializeReferencePs(env,
+                                 refProps,
+                                 actorURI,
+                                 false);
+        }
+        
         if (referenceParameters != null && !referenceParameters.isEmpty()) {
             serializeReferencePs(env,
                                  referenceParameters,

Modified: webservices/addressing/trunk/src/org/apache/axis/message/addressing/Constants.java
URL: http://svn.apache.org/viewvc/webservices/addressing/trunk/src/org/apache/axis/message/addressing/Constants.java?rev=409409&r1=409408&r2=409409&view=diff
==============================================================================
--- webservices/addressing/trunk/src/org/apache/axis/message/addressing/Constants.java (original)
+++ webservices/addressing/trunk/src/org/apache/axis/message/addressing/Constants.java Thu May 25 08:59:42 2006
@@ -63,6 +63,13 @@
     public static final String NS_URI_ADDRESSING_DEFAULT =
         NS_URI_ADDRESSING_2004_08;
 
+    /**
+     * Default WSA namespace to use when serializing EPRs or WSA headers.
+     * @deprecated Use NS_URI_ADDRESSING_DEFAULT instead.
+     */
+    public static final String NS_URI_ADDRESSING =
+        NS_URI_ADDRESSING_DEFAULT;
+
     public static final String URI_ANONYMOUS_W3C_CR =
             "http://www.w3.org/2005/08/addressing/anonymous";
 

Modified: webservices/addressing/trunk/src/org/apache/axis/message/addressing/EndpointReferenceType.java
URL: http://svn.apache.org/viewvc/webservices/addressing/trunk/src/org/apache/axis/message/addressing/EndpointReferenceType.java?rev=409409&r1=409408&r2=409409&view=diff
==============================================================================
--- webservices/addressing/trunk/src/org/apache/axis/message/addressing/EndpointReferenceType.java (original)
+++ webservices/addressing/trunk/src/org/apache/axis/message/addressing/EndpointReferenceType.java Thu May 25 08:59:42 2006
@@ -70,7 +70,7 @@
     /**
      * Field properties
      */
-    private ReferencePropertiesType m_properties = new ReferencePropertiesType();
+    private ReferencePropertiesType m_properties;
 
     /**
      * Field parameters
@@ -388,6 +388,12 @@
         elemField.setFieldName("serviceName");
         elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "ServiceName"));
         elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "ServiceNameType"));
+        elemField.setMinOccurs(0);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("metadata");
+        elemField.setXmlName(new QName(AddressingUtils.getAddressingNamespaceURI(), "Metadata"));
+        elemField.setXmlType(new QName(AddressingUtils.getAddressingNamespaceURI(), "MetadataType"));
         elemField.setMinOccurs(0);
         typeDesc.addFieldDesc(elemField);
     }

Modified: webservices/addressing/trunk/src/org/apache/axis/message/addressing/Relationship.java
URL: http://svn.apache.org/viewvc/webservices/addressing/trunk/src/org/apache/axis/message/addressing/Relationship.java?rev=409409&r1=409408&r2=409409&view=diff
==============================================================================
--- webservices/addressing/trunk/src/org/apache/axis/message/addressing/Relationship.java (original)
+++ webservices/addressing/trunk/src/org/apache/axis/message/addressing/Relationship.java Thu May 25 08:59:42 2006
@@ -56,6 +56,17 @@
      * Constructor Relationship
      * 
      * @param uri  
+     * @throws URI.MalformedURIException 
+     */
+    public Relationship(String uri) 
+        throws URI.MalformedURIException {
+        this.uri = new URI(uri);
+    }
+
+    /**
+     * Constructor Relationship
+     * 
+     * @param uri  
      * @param type      
      * @throws URI.MalformedURIException 
      */



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