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 sa...@apache.org on 2006/02/06 06:47:04 UTC

svn commit: r375193 - in /webservices/axis2/trunk/c/modules: mod_addr/Makefile.am mod_addr/addr_in_handler.c mod_addr/addr_out_handler.c wsdl/axis2_wsdl.h

Author: samisa
Date: Sun Feb  5 21:47:03 2006
New Revision: 375193

URL: http://svn.apache.org/viewcvs?rev=375193&view=rev
Log:
Added initial version of addressing out handler and also changed others to work with it

Added:
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
Modified:
    webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/wsdl/axis2_wsdl.h

Modified: webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/Makefile.am?rev=375193&r1=375192&r2=375193&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am Sun Feb  5 21:47:03 2006
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libaxis2_mod_addr.la
 AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_mod_addr_la_SOURCES = addr_in_handler.c
+libaxis2_mod_addr_la_SOURCES = addr_in_handler.c addr_out_handler.c
 
 libaxis2_mod_addr_la_LIBADD = 
 INCLUDES = -I$(top_builddir)/include \

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=375193&r1=375192&r2=375193&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Sun Feb  5 21:47:03 2006
@@ -132,77 +132,6 @@
 }
 
 
-/*axis2_status_t AXIS2_CALL 
-axis2_ctx_handler_invoke(struct axis2_handler *handler, 
-                         axis2_env_t **env,
-                         struct axis2_msg_ctx *msg_ctx)
-{
-    axis2_op_t *op = NULL;
-    axis2_svc_ctx_t *svc_ctx = NULL;
-    axis2_op_ctx_t *op_ctx = NULL;
-    axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
-    
-    AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
-    
-    op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
-    svc_ctx = AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env);
-    
-    if (op_ctx && svc_ctx)
-    {
-        svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env);
-        if (svc_grp_ctx)
-        {
-            AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, 
-                AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env));
-        }
-        return AXIS2_SUCCESS;
-    }
-    
-    op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
-    
-    
-    op_ctx = AXIS2_OP_FIND_FOR_EXISTING_OP_CTX(op, env, msg_ctx);
-    
-    if (op_ctx)
-    {
-        AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx);
-        svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
-        if (svc_ctx)
-        {
-            svc_grp_ctx = AXIS2_SVC_CTX_GET_PARENT(svc_ctx, env);
-            AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx);
-            AXIS2_MSG_CTX_SET_SVC_GRP_CTX(msg_ctx, env, svc_grp_ctx);
-            AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, 
-                AXIS2_SVC_GRP_CTX_GET_ID(svc_grp_ctx, env));
-        }
-        return AXIS2_SUCCESS;
-    }
-    else 
-    {
-        axis2_conf_ctx_t *conf_ctx = NULL;
-        op_ctx = axis2_op_ctx_create(env, op, NULL);
-        if (!op_ctx)
-        {
-            return AXIS2_FAILURE;
-        }
-
-        AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
-        
-        AXIS2_OP_REGISTER_OP_CTX(op, env, msg_ctx, op_ctx);
-        
-        conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
-        if (conf_ctx)
-        {
-            svc_grp_ctx = AXIS2_CONF_CTX_FILL_CTXS(conf_ctx, env, msg_ctx);
-            if (svc_grp_ctx)
-                return AXIS2_SUCCESS;
-        }
-    }
-    return AXIS2_FAILURE;    
-}
-*/
-
 axis2_status_t 
 axis2_addr_in_handler_invoke(struct axis2_handler *handler, 
                          axis2_env_t **env,

Added: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?rev=375193&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (added)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Sun Feb  5 21:47:03 2006
@@ -0,0 +1,661 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <axis2_handler_desc.h>
+#include <axis2_qname.h>
+#include <axis2_svc.h>
+#include <axis2_soap_header.h>
+#include <axis2_addr.h>
+#include <axis2_soap_header_block.h>
+#include <axis2_endpoint_ref.h>
+
+axis2_status_t AXIS2_CALL
+axis2_addr_out_handler_invoke (struct axis2_handler *handler,
+                               axis2_env_t ** env,
+                               struct axis2_msg_ctx *msg_ctx);
+
+
+axis2_status_t
+axis2_addr_out_handler_add_to_soap_header (axis2_env_t ** env,
+                                           axis2_endpoint_ref_t *
+                                           endpoint_ref, axis2_char_t * type,
+                                           axis2_soap_header_t * soap_header,
+                                           axis2_char_t * addr_ns);
+
+
+axis2_status_t
+axis2_addr_out_handler_add_to_header (axis2_env_t ** env,
+                                      axis2_endpoint_ref_t * epr,
+                                      axis2_om_node_t ** parent_node,
+                                      axis2_char_t * addr_ns);
+
+axis2_status_t
+axis2_addr_out_handler_process_any_content_type (axis2_env_t ** env,
+                                                 axis2_any_content_type_t *
+                                                 reference_values,
+                                                 axis2_om_node_t *
+                                                 parent_ele_node,
+                                                 axis2_char_t * addr_ns);
+
+axis2_om_node_t *axis2_addr_out_handler_process_string_info (axis2_env_t **
+                                                             env,
+                                                             axis2_char_t *
+                                                             value,
+                                                             axis2_char_t *
+                                                             type,
+                                                             axis2_soap_header_t
+                                                             ** soap_header,
+                                                             axis2_char_t *
+                                                             addr_ns);
+
+
+AXIS2_DECLARE (axis2_handler_t *)
+axis2_addr_out_handler_create (axis2_env_t ** env, axis2_qname_t * qname)
+{
+    axis2_handler_t *handler = NULL;
+    axis2_handler_desc_t *handler_desc = NULL;
+    axis2_qname_t *handler_qname = NULL;
+
+    AXIS2_ENV_CHECK (env, NULL);
+
+    if (qname)
+    {
+        handler_qname = AXIS2_QNAME_CLONE (qname, env);
+        if (!(handler_qname))
+        {
+            AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY,
+                             AXIS2_FAILURE);
+            return NULL;
+        }
+    }
+    else
+    {
+        /* create default qname */
+        handler_qname = axis2_qname_create (env, "addr_out_handler",
+                                            "http://axis.ws.apache.org",
+                                            NULL);
+        if (!handler_qname)
+        {
+            return NULL;
+        }
+    }
+
+    handler = axis2_handler_create (env);
+    if (!handler)
+    {
+        return NULL;
+    }
+
+    /* handler desc of base handler */
+    handler_desc = axis2_handler_desc_create_with_qname (env, handler_qname);
+    if (!handler_desc)
+    {
+        AXIS2_HANDLER_FREE (handler, env);
+        return NULL;
+    }
+
+    AXIS2_HANDLER_INIT (handler, env, handler_desc);
+
+    /* set the base struct's invoke op */
+    if (handler->ops)
+        handler->ops->invoke = axis2_addr_out_handler_invoke;
+
+    return handler;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_addr_out_handler_invoke (struct axis2_handler * handler,
+                               axis2_env_t ** env, axis2_msg_ctx_t * msg_ctx)
+{
+    axis2_char_t *addressing_version_from_msg_ctx = NULL;
+    axis2_char_t *addr_ns = NULL;
+    axis2_msg_info_headers_t *msg_info_headers = NULL;
+    axis2_ctx_t *ctx = NULL;
+
+    AXIS2_FUNC_PARAM_CHECK (handler, env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, msg_ctx, AXIS2_FAILURE);
+
+    msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS (msg_ctx, env);
+    if (!msg_info_headers)
+        return AXIS2_FAILURE;
+
+    ctx = AXIS2_MSG_CTX_GET_BASE (msg_ctx, env);
+    addressing_version_from_msg_ctx =
+        AXIS2_MSG_CTX_GET_PROPERTY (ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
+
+    if (addressing_version_from_msg_ctx)
+    {
+        if (AXIS2_STRCMP
+            (AXIS2_WSA_NAMESPACE, addressing_version_from_msg_ctx) == 0)
+        {
+            addr_ns = AXIS2_WSA_NAMESPACE;
+        }
+        else
+        {
+            addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;
+        }
+    }
+    else if (AXIS2_MSG_CTX_GET_OP_CTX (msg_ctx, env) != NULL)
+    {
+        axis2_op_ctx_t *op_ctx = NULL;
+        axis2_msg_ctx_t *in_msg_ctx = NULL;
+        op_ctx = AXIS2_MSG_CTX_GET_OP_CTX (msg_ctx, env);
+        if (op_ctx)
+        {
+            in_msg_ctx =
+                AXIS2_OP_CTX_GET_MSG_CTX (op_ctx, env,
+                                          AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+        }
+
+        if (!in_msg_ctx)
+        {
+            addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;   /* setting Submission version as the default addressing namespace */
+        }
+        else
+        {
+            axis2_ctx_t *in_ctx = NULL;
+            in_ctx = AXIS2_MSG_CTX_GET_BASE (in_msg_ctx, env);
+
+            addr_ns =
+                AXIS2_CTX_GET_PROPERTY (in_ctx, env, AXIS2_WSA_VERSION,
+                                        AXIS2_FALSE);
+
+            if (!addr_ns)
+            {
+                addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;   /* Addressing version has not been set in the IN path */
+            }
+        }
+    }
+
+    if (!addr_ns || AXIS2_STRCMP ("", addr_ns) == 0)
+    {
+        addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;
+    }
+
+    axis2_om_namespace_t *addring_namespace =
+        axis2_om_namespace_create (env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+    msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS (msg_ctx, env);
+    axis2_soap_envelope_t *soap_envelope =
+        AXIS2_MSG_CTX_GET_SOAP_ENVELOPE (msg_ctx, env);
+    axis2_soap_header_t *soap_header =
+        AXIS2_SOAP_ENVELOPE_GET_HEADER (soap_envelope, env);
+    axis2_om_node_t *soap_header_node = NULL;
+    axis2_om_element_t *soap_header_ele = NULL;
+
+    /* by this time, we definitely have some addressing information to be sent. This is because,
+       // we have tested at the start of this whether msg_info_headers are null or not.
+       // So rather than declaring addressing namespace in each and every addressing header, lets
+       // define that in the Header itself. */
+
+    soap_header_node = AXIS2_SOAP_HEADER_GET_BASE_NODE (soap_header, env);
+    soap_header_ele =
+        (axis2_om_element_t *)
+        AXIS2_OM_NODE_GET_DATA_ELEMENT (soap_header_node, env);
+    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (soap_header_ele, env,
+                                        soap_header_node, addring_namespace);
+
+    axis2_endpoint_ref_t *epr =
+        AXIS2_MSG_INFO_HEADERS_GET_TO (msg_info_headers, env);
+    if (epr)
+    {
+        axis2_char_t *address = AXIS2_ENDPOINT_REF_GET_ADDRESS (epr, env);
+        if (address && AXIS2_STRCMP (address, "") != 0)
+        {
+            axis2_soap_header_block_t *to_header_block =
+                AXIS2_SOAP_HEADER_ADD_HEADER_BLOCK (soap_header, env,
+                                                    AXIS2_WSA_TO,
+                                                    addring_namespace);
+            axis2_om_node_t *to_header_block_node = NULL;
+            to_header_block_node =
+                AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE (to_header_block, env);
+        }
+
+
+        axis2_any_content_type_t *reference_parameters =
+            AXIS2_ENDPOINT_REF_GET_REF_PARAMS (epr, env);
+        if (reference_parameters)
+        {
+
+            axis2_addr_out_handler_process_any_content_type (env,
+                                                             reference_parameters,
+                                                             soap_header_node,
+                                                             addr_ns);
+            axis2_addr_out_handler_add_to_header (env, epr, &soap_header_node,
+                                                  addr_ns);
+        }
+
+        axis2_char_t *action = NULL;
+
+        action = AXIS2_MSG_INFO_HEADERS_GET_ACTION (msg_info_headers, env);
+        if (action)
+        {
+            axis2_addr_out_handler_process_string_info (env, action,
+                                                        AXIS2_WSA_ACTION,
+                                                        &soap_header,
+                                                        addr_ns);
+        }
+
+        epr = AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO (msg_info_headers, env);
+        if (!epr)
+        {
+            axis2_char_t *anonymous_uri = NULL;
+            if (AXIS2_STRCMP (addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+            {
+                anonymous_uri = AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
+            }
+
+            epr = axis2_endpoint_ref_create (env, anonymous_uri);
+
+        }
+        /* add the service group id as a reference parameter */
+        axis2_char_t *svc_group_context_id =
+            AXIS2_MSG_CTX_GET_SVC_GRP_CTX_ID (msg_ctx, env);
+        if (svc_group_context_id
+            && AXIS2_STRCMP (svc_group_context_id, "") != 0)
+        {
+            axis2_any_content_type_t *any_content = NULL;
+            if (!AXIS2_ENDPOINT_REF_GET_REF_PARAMS (epr, env))
+            {
+                axis2_any_content_type_t *any_content_type =
+                    axis2_any_content_type_create (env);
+                AXIS2_ENDPOINT_REF_SET_REF_PARAMS (epr, env,
+                                                   any_content_type);
+            }
+            any_content = AXIS2_ENDPOINT_REF_GET_REF_PARAMS (epr, env);
+            axis2_qname_t *svc_qn =
+                axis2_qname_create (env, AXIS2_SVC_GRP_ID,
+                                    AXIS2_NAMESPACE_URI,
+                                    AXIS2_NAMESPACE_PREFIX);
+            AXIS2_ANY_CONTENT_TYPE_ADD_VALUE (any_content, env, svc_qn,
+                                              svc_group_context_id);
+        }
+
+        axis2_addr_out_handler_add_to_soap_header (env, epr,
+                                                   AXIS2_WSA_REPLY_TO,
+                                                   soap_header, addr_ns);
+
+        epr = AXIS2_MSG_INFO_HEADERS_GET_FROM (msg_info_headers, env);
+
+        if (epr)
+        {
+            axis2_addr_out_handler_add_to_soap_header (env, epr,
+                                                       AXIS2_WSA_FROM,
+                                                       soap_header, addr_ns);
+
+        }
+
+        epr = AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO (msg_info_headers, env);
+
+        if (epr)
+        {
+            /* optional */
+            axis2_addr_out_handler_add_to_soap_header (env, epr,
+                                                       AXIS2_WSA_FAULT_TO,
+                                                       soap_header, addr_ns);
+        }
+
+        axis2_char_t *message_id =
+            AXIS2_MSG_INFO_HEADERS_GET_MESSAGE_ID (msg_info_headers, env);
+        if (message_id)
+        {
+            axis2_addr_out_handler_process_string_info (env, message_id,
+                                                        AXIS2_WSA_MESSAGE_ID,
+                                                        &soap_header,
+                                                        addr_ns);
+        }
+
+
+        axis2_relates_to_t *relates_to =
+            AXIS2_MSG_INFO_HEADERS_GET_RELATES_TO (msg_info_headers, env);
+        axis2_om_node_t *relates_to_header_node = NULL;
+        axis2_om_element_t *relates_to_header_ele = NULL;
+        if (relates_to)
+        {
+            axis2_char_t *value = NULL;
+            value = AXIS2_RELATES_TO_GET_VALUE (relates_to, env);
+            relates_to_header_node =
+                axis2_addr_out_handler_process_string_info (env, value,
+                                                            AXIS2_WSA_RELATES_TO,
+                                                            &soap_header,
+                                                            addr_ns);
+        }
+
+        if (relates_to_header_node)
+        {
+            axis2_char_t *relationship_type = NULL;
+            relationship_type =
+                AXIS2_RELATES_TO_GET_RELATIONSHIP_TYPE (relates_to, env);
+            if (AXIS2_STRCMP (relationship_type, "") != 0)
+            {
+                axis2_om_attribute_t *om_attr = NULL;
+                axis2_om_namespace_t *addr_ns_obj = NULL;
+                addr_ns_obj =
+                    axis2_om_namespace_create (env, addr_ns,
+                                               AXIS2_WSA_DEFAULT_PREFIX);
+                relates_to_header_ele =
+                    (axis2_om_element_t *)
+                    AXIS2_OM_NODE_GET_DATA_ELEMENT (relates_to_header_node,
+                                                    env);
+                om_attr =
+                    axis2_om_attribute_create (env,
+                                               AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE,
+                                               AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE_SUBMISSION,
+                                               addr_ns_obj);
+                AXIS2_OM_ELEMENT_ADD_ATTRIBUTE (relates_to_header_ele, env,
+                                                om_attr,
+                                                relates_to_header_node);
+            }
+        }
+    }
+    return AXIS2_SUCCESS;
+}
+
+
+axis2_om_node_t *
+axis2_addr_out_handler_process_string_info (axis2_env_t ** env,
+                                            axis2_char_t * value,
+                                            axis2_char_t * type,
+                                            axis2_soap_header_t **
+                                            soap_header_p,
+                                            axis2_char_t * addr_ns)
+{
+    axis2_soap_header_t *soap_header = NULL;
+    axis2_soap_header_block_t *header_block = NULL;
+    axis2_om_node_t *header_block_node = NULL;
+    axis2_om_element_t *header_block_ele = NULL;
+
+    AXIS2_ENV_CHECK (env, NULL);
+    AXIS2_PARAM_CHECK ((*env)->error, value, NULL);
+    AXIS2_PARAM_CHECK ((*env)->error, type, NULL);
+    AXIS2_PARAM_CHECK ((*env)->error, soap_header_p, NULL);
+    AXIS2_PARAM_CHECK ((*env)->error, addr_ns, NULL);
+
+    soap_header = *(soap_header_p);
+
+    if (value && AXIS2_STRCMP (value, "") != 0)
+    {
+        axis2_om_namespace_t *addr_ns_obj = NULL;
+        addr_ns_obj =
+            axis2_om_namespace_create (env, addr_ns,
+                                       AXIS2_WSA_DEFAULT_PREFIX);
+        header_block =
+            AXIS2_SOAP_HEADER_ADD_HEADER_BLOCK (soap_header, env, type,
+                                                addr_ns_obj);
+        header_block_node =
+            AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE (header_block, env);
+        header_block_ele =
+            (axis2_om_element_t *)
+            AXIS2_OM_NODE_GET_DATA_ELEMENT (header_block_node, env);
+        AXIS2_OM_ELEMENT_SET_TEXT (header_block_ele, env, value,
+                                   header_block_node);
+    }
+    return header_block_node;
+}
+
+axis2_status_t
+axis2_addr_out_handler_add_to_soap_header (axis2_env_t ** env,
+                                           axis2_endpoint_ref_t *
+                                           endpoint_ref, axis2_char_t * type,
+                                           axis2_soap_header_t * soap_header,
+                                           axis2_char_t * addr_ns)
+{
+    axis2_soap_header_block_t *header_block = NULL;
+    axis2_char_t *address = NULL;
+    axis2_any_content_type_t *reference_param = NULL;
+    axis2_om_node_t *header_block_node = NULL;
+    axis2_om_node_t *header_node = NULL;
+
+    AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, endpoint_ref, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, type, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, soap_header, AXIS2_FAILURE);
+
+    header_node = AXIS2_SOAP_HEADER_GET_BASE_NODE (soap_header, env);
+    axis2_om_namespace_t *addr_ns_obj = NULL;
+    addr_ns_obj =
+        axis2_om_namespace_create (env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+    header_block =
+        AXIS2_SOAP_HEADER_ADD_HEADER_BLOCK (soap_header, env, type,
+                                            addr_ns_obj);
+
+    address = AXIS2_ENDPOINT_REF_GET_ADDRESS (endpoint_ref, env);
+    if (address && AXIS2_STRCMP ("", address) != 0)
+    {
+        axis2_om_node_t *hb_node = NULL;
+        axis2_om_element_t *hb_ele = NULL;
+        axis2_om_node_t *address_node = NULL;
+        axis2_om_element_t *address_ele = NULL;
+        hb_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE (header_block, env);
+        hb_ele =
+            (axis2_om_element_t *) AXIS2_OM_NODE_GET_DATA_ELEMENT (hb_node,
+                                                                   env);
+        address_ele =
+            axis2_om_element_create (env, hb_node, EPR_ADDRESS, addr_ns_obj,
+                                     &address_node);
+        AXIS2_OM_ELEMENT_SET_TEXT (address_ele, env, address, address_node);
+    }
+
+    header_block_node =
+        AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE (header_block, env);
+    axis2_addr_out_handler_add_to_header (env, endpoint_ref,
+                                          &header_block_node, addr_ns);
+
+    reference_param = AXIS2_ENDPOINT_REF_GET_REF_PARAMS (endpoint_ref, env);
+
+    if (reference_param)
+    {
+        axis2_om_node_t *reference_node = NULL;
+        axis2_om_element_t *reference_ele = NULL;
+        reference_ele = axis2_om_element_create (env,
+                                                 header_block_node,
+                                                 EPR_REFERENCE_PARAMETERS,
+                                                 addr_ns_obj,
+                                                 &reference_node);
+        axis2_addr_out_handler_process_any_content_type (env, reference_param,
+                                                         reference_node,
+                                                         addr_ns);
+    }
+
+    if (AXIS2_STRCMP (AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns) == 0)
+    {
+        axis2_any_content_type_t *referece_properties = NULL;
+        axis2_om_element_t *reference_ele = NULL;
+        axis2_om_node_t *reference_node = NULL;
+        referece_properties =
+            AXIS2_ENDPOINT_REF_GET_REF_PROPERTIES (endpoint_ref, env);
+
+        reference_ele =
+            axis2_om_element_create (env, header_node,
+                                     EPR_REFERENCE_PROPERTIES, addr_ns_obj,
+                                     &reference_node);
+        axis2_addr_out_handler_process_any_content_type (env,
+                                                         referece_properties,
+                                                         reference_node,
+                                                         addr_ns);
+    }
+    return AXIS2_SUCCESS;
+}
+
+axis2_status_t
+axis2_addr_out_handler_add_to_header (axis2_env_t ** env,
+                                      axis2_endpoint_ref_t * epr,
+                                      axis2_om_node_t ** parent_node_p,
+                                      axis2_char_t * addr_ns)
+{
+    axis2_om_node_t *parent_node = NULL;
+    axis2_qname_t *interface_qname = NULL;
+    axis2_om_node_t *interface_node = NULL;
+    axis2_om_element_t *interface_ele = NULL;
+    axis2_char_t *element_localname = NULL;
+    axis2_svc_name_t *service_name = NULL;
+    axis2_om_namespace_t *addr_ns_obj = NULL;
+
+    AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, epr, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK ((*env)->error, parent_node_p, AXIS2_FAILURE);
+
+    parent_node = *(parent_node_p);
+
+    addr_ns_obj =
+        axis2_om_namespace_create (env, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
+    interface_qname = AXIS2_ENDPOINT_REF_GET_INTERFACE_NAME (epr, env);
+
+    if (interface_qname)
+    {
+        axis2_char_t *text = NULL;
+        axis2_char_t *qname_prefix = NULL;
+        axis2_char_t *qname_localpart = NULL;
+
+        if (AXIS2_STRCMP (addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+        {
+            element_localname = EPR_PORT_TYPE;
+        }
+        else
+        {
+            element_localname = AXIS2_WSA_INTERFACE_NAME;
+        }
+
+        interface_ele = axis2_om_element_create (env, parent_node,
+                                                 element_localname,
+                                                 addr_ns_obj,
+                                                 &interface_node);
+        qname_prefix = AXIS2_QNAME_GET_PREFIX (interface_qname, env);
+        qname_localpart = AXIS2_QNAME_GET_LOCALPART (interface_qname, env);
+
+        text =
+            AXIS2_MALLOC ((*env)->allocator,
+                          sizeof (axis2_char_t) *
+                          (AXIS2_STRLEN (qname_prefix) +
+                           AXIS2_STRLEN (qname_localpart) + 2));
+        sprintf (text, "%s:%s", qname_prefix, qname_localpart);
+        AXIS2_OM_ELEMENT_SET_TEXT (interface_ele, env, text, interface_node);
+        AXIS2_FREE ((*env)->allocator, text);
+    }
+
+    service_name = AXIS2_ENDPOINT_REF_GET_SVC_NAME (epr, env);
+    if (service_name)
+    {
+        axis2_char_t *service_name_text = NULL;
+
+        axis2_qname_t *svc_qname = NULL;
+        axis2_char_t *svc_qn_prefix = NULL;
+        axis2_char_t *svc_qn_localpart = NULL;
+
+        axis2_om_node_t *service_name_node = NULL;
+        axis2_om_element_t *service_name_ele = NULL;
+
+        axis2_om_attribute_t *om_attr = NULL;
+        axis2_char_t *attr_localname = NULL;
+
+        service_name_ele =
+            axis2_om_element_create (env, NULL, EPR_SERVICE_NAME, addr_ns_obj,
+                                     &service_name_node);
+        if (AXIS2_STRCMP (addr_ns, AXIS2_WSA_NAMESPACE_SUBMISSION) == 0)
+        {
+            attr_localname = EPR_SERVICE_NAME_PORT_NAME;
+        }
+        else
+        {
+            attr_localname = AXIS2_WSA_SERVICE_NAME_ENDPOINT_NAME;
+        }
+        om_attr = axis2_om_attribute_create (env, attr_localname,
+                                             AXIS2_SVC_NAME_GET_ENDPOINT_NAME
+                                             (service_name, env),
+                                             addr_ns_obj);
+        AXIS2_OM_ELEMENT_ADD_ATTRIBUTE (service_name_ele, env, om_attr,
+                                        service_name_node);
+
+        svc_qname = AXIS2_SVC_NAME_GET_QNAME (service_name, env);
+        if (svc_qname)
+        {
+            svc_qn_localpart = AXIS2_QNAME_GET_LOCALPART (svc_qname, env);
+            svc_qn_prefix = AXIS2_QNAME_GET_PREFIX (svc_qname, env);
+
+            service_name_text = AXIS2_MALLOC ((*env)->allocator,
+                                              sizeof (axis2_char_t) *
+                                              (AXIS2_STRLEN (svc_qn_prefix) +
+                                               AXIS2_STRLEN (svc_qn_localpart)
+                                               + 2));
+            sprintf (service_name_text, "%s:%s", svc_qn_prefix,
+                     svc_qn_localpart);
+
+            AXIS2_OM_ELEMENT_SET_TEXT (service_name_ele, env,
+                                       service_name_text, service_name_node);
+            AXIS2_FREE ((*env)->allocator, service_name_text);
+
+        }
+
+    }
+    return AXIS2_SUCCESS;
+}
+
+
+axis2_status_t
+axis2_addr_out_handler_process_any_content_type (axis2_env_t ** env,
+                                                 axis2_any_content_type_t *
+                                                 reference_values,
+                                                 axis2_om_node_t *
+                                                 parent_ele_node,
+                                                 axis2_char_t * addr_ns)
+{
+    axis2_hash_t *value_ht = NULL;
+    axis2_hash_index_t *hash_index = NULL;
+
+    AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+
+    if (reference_values)
+    {
+        const void *k = NULL;
+        void *v = NULL;
+        axis2_ssize_t len = 0;
+        value_ht =
+            AXIS2_ANY_CONTENT_TYPE_GET_VALUE_MAP (reference_values, env);
+        if (!value_ht)
+            return AXIS2_FAILURE;
+
+        for (hash_index = axis2_hash_first (value_ht, env); hash_index;
+             hash_index = axis2_hash_next (env, hash_index))
+        {
+            axis2_hash_this (hash_index, &k, &len, &v);
+            if (k)
+            {
+                axis2_om_node_t *node = NULL;
+                axis2_om_element_t *ele = NULL;
+                ele =
+                    axis2_om_element_create (env, parent_ele_node, k, NULL,
+                                             &node);
+                if (ele)
+                {
+                    if (AXIS2_STRCMP (AXIS2_WSA_NAMESPACE, addr_ns) == 0)
+                    {
+                        axis2_om_namespace_t *addr_ns_obj = NULL;
+                        axis2_om_attribute_t *att = NULL;
+                        addr_ns_obj =
+                            axis2_om_namespace_create (env, addr_ns,
+                                                       AXIS2_WSA_DEFAULT_PREFIX);
+                        att =
+                            axis2_om_attribute_create (env,
+                                                       AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
+                                                       AXIS2_WSA_TYPE_ATTRIBUTE_VALUE,
+                                                       addr_ns_obj);
+                    }
+                    AXIS2_OM_ELEMENT_SET_TEXT (ele, env, v, node);
+                }
+            }
+        }
+    }
+    return AXIS2_SUCCESS;
+}

Modified: webservices/axis2/trunk/c/modules/wsdl/axis2_wsdl.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/axis2_wsdl.h?rev=375193&r1=375192&r2=375193&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/axis2_wsdl.h (original)
+++ webservices/axis2/trunk/c/modules/wsdl/axis2_wsdl.h Sun Feb  5 21:47:03 2006
@@ -124,7 +124,7 @@
  */
 #define AXIS2_MESSAGE_LABEL_IN 0
 
-#define AXIS2_MESSAGE_LABEL_IN_VALUE "In"
+#define AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE "In"
 
 /**
  * Constant to represent the message label "Out" which is used by the
@@ -133,7 +133,7 @@
  */
 #define AXIS2_MESSAGE_LABEL_OUT 1
 
-#define AXIS2_MESSAGE_LABEL_OUT_VALUE "Out"
+#define AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE "Out"
 
 /**
  *