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/09/05 13:21:04 UTC
svn commit: r440319 - in /webservices/axis2/trunk/c: include/
modules/core/addr/ modules/core/clientapi/ modules/core/engine/
modules/core/transport/http/sender/ modules/mod_addr/
Author: samisa
Date: Tue Sep 5 04:21:02 2006
New Revision: 440319
URL: http://svn.apache.org/viewvc?view=rev&rev=440319
Log:
Fixed endpoint reference API and related structs. Also fixed API doc comments
Modified:
webservices/axis2/trunk/c/include/axis2_any_content_type.h
webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
webservices/axis2/trunk/c/include/axis2_rest_sender.h
webservices/axis2/trunk/c/include/axis2_svc_client.h
webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
Modified: webservices/axis2/trunk/c/include/axis2_any_content_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_any_content_type.h?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_any_content_type.h (original)
+++ webservices/axis2/trunk/c/include/axis2_any_content_type.h Tue Sep 5 04:21:02 2006
@@ -62,7 +62,7 @@
*/
axis2_status_t (AXIS2_CALL *
add_value)(
- struct axis2_any_content_type *any_content_type,
+ axis2_any_content_type_t *any_content_type,
const axis2_env_t *env,
const axis2_qname_t *qname,
const axis2_char_t *value);
@@ -101,7 +101,7 @@
*/
axis2_status_t (AXIS2_CALL *
free)(
- struct axis2_any_content_type *any_content_type,
+ axis2_any_content_type_t *any_content_type,
const axis2_env_t *env);
};
Modified: webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_endpoint_ref.h?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_endpoint_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_endpoint_ref.h Tue Sep 5 04:21:02 2006
@@ -20,12 +20,16 @@
/**
* @defgroup axis2_endpoint_ref endpoint reference
* @ingroup axis2_addr
+ * endpoint reference represent an endpoint address in WS-Addressing.
+ * In addition to the endpoint address, it also encapsulates meta data,
+ * reference attributes and the service hosted at the given endpoint.
+ * In addition to the addressing related implementation, the endpoint reference
+ * struct is used across core code-base to represent endpoints.
* @{
*/
/**
* @file axis2_endpoint_ref.h
- * @brief Axis2 core addressing interface
*/
#include <axis2_defines.h>
@@ -49,77 +53,75 @@
/**
- * Dispatcher ops struct
+ * endpoint reference ops struct.
+ * Encapsulator struct for operations of axis2_endpoint_ref.
*/
struct axis2_endpoint_ref_ops
{
/**
- * Method get_address
- * @param endpoint_ref pointer to endpoint ref
+ * Gets endpoint address. Address URI identifies the endpoint.
+ * This may be a network address or a logical address.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return endpoint address string
*/
- axis2_char_t *(AXIS2_CALL *
+ const axis2_char_t *(AXIS2_CALL *
get_address)(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Sets endpoint address. Address URI identifies the endpoint.
+ * This may be a network address or a logical address.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param address pointer to address
+ * @param address address string
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_address)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_char_t *address);
+ const axis2_char_t *address);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets interface QName. QName represents the primary portType of
+ * the endpoint being conveyed.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to interface QName, returns a reference, not a cloned
+ * copy
*/
- axis2_qname_t *(AXIS2_CALL *
+ const axis2_qname_t *(AXIS2_CALL *
get_interface_qname)(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
+
/**
- * Method set_interface_qname
- * @param endpoint_ref pointer to endpoint ref
+ * Sets interface QName. QName represents the primary portType of
+ * the endpoint being conveyed.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param interface_name pointer to interface name
+ * @param interface_name pointer to interface QName, this method creates
+ * a clone of the QName
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_interface_qname)(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_qname_t *interface_qname);
- /**
- * Method get_ref_properties
- * @param endpoint_ref pointer to endpoint ref
- * @param env pointer to environment struct
- */
- axis2_any_content_type_t *(AXIS2_CALL *
- get_ref_properties)(
- const axis2_endpoint_ref_t *endpoint_ref,
- const axis2_env_t *env);
- /**
- * Method set_ref_properties
- * @param endpoint_ref pointer to endpoint ref
- * @param env pointer to environment struct
- * @param ref_properties ref properties
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_ref_properties)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_any_content_type_t *ref_properties);
+ const axis2_qname_t *interface_qname);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets reference parameter list. A reference may contain a number
+ * of individual parameters which are associated with the endpoint
+ * to facilitate a particular interaction. Reference parameters
+ * are element information items that are named by QName and are
+ * required to properly interact with the endpoint.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to array list containing all reference parameters,
+ * returns a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
get_ref_param_list)(
@@ -127,17 +129,24 @@
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets the list of metadata. An endpoint can have different associated
+ * metadata such as WSDL, XML Schema, and WS-Policy policies.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to array list containing metadata, returns a
+ * reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_meta_data_list)(
+ get_metadata_list)(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets the list of reference attributes.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to array list containing reference attributes,
+ * returns a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
get_ref_attribute_list)(
@@ -145,17 +154,24 @@
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets the list of metadata attributes.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to array list containing metadata attributes,
+ * returns a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
- get_meta_attribute_list)(
+ get_metadata_attribute_list)(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Gets the list of extensions. Extensions are a mechanism to allow
+ * additional elements to be specified in association with the endpoint.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to array list containing extensions,
+ * returns a reference, not a cloned copy
*/
axis2_array_list_t *(AXIS2_CALL *
get_extension_list)(
@@ -163,268 +179,226 @@
const axis2_env_t *env);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Adds a reference parameter in the form of an AXIOM node.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param ref_param_node ref param node
+ * @param ref_param_node pointer to AXIOM node representing reference
+ * parameter, endpoint reference does not assume the ownership of
+ * the node
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
add_ref_param)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *ref_param_node);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Adds metadata in the form of an AXIOM node. An endpoint can have
+ * different associated metadata such as WSDL, XML Schema and
+ * WS-Policy policies.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param meta_deta_node meta data node
+ * @param metadata_node AXIOM node representing metadata,
+ * endpoint reference does not assume the ownership of the node
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- add_meta_data)(
- struct axis2_endpoint_ref *endpoint_ref,
+ add_metadata)(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axiom_node_t *meta_data_node);
+ axiom_node_t *metadata_node);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Adds a reference attribute in the form of an AXIOM attribute.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param attr attribute
+ * @param attr AXIOM attribute representing reference attribute,
+ * endpoint reference does not assume the ownership of the attribute
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
add_ref_attribute)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Adds a meta attribute in the form of an AXIOM attribute.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param attr attribute
+ * @param attr AXIOM attribute representing meta attribute,
+ * endpoint reference does not assume the ownership of the attribute
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- add_meta_attribute)(
- struct axis2_endpoint_ref *endpoint_ref,
+ add_metadata_attribute)(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr);
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Adds an extension in the form of an AXIOM node.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param extension_node pointer to extension node
+ * @param extension_node pointer to AXIOM node representing extension,
+ * endpoint reference does not assume the ownership of the node
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
add_extension)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *extension_node);
/**
- * Method get_ref_params
- */
- /* axis2_any_content_type_t *(AXIS2_CALL *
- get_ref_params)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);*/
- /**
- * Method set_ref_params
- */
- /* axis2_status_t (AXIS2_CALL *
- set_ref_params)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *any_content_type);*/
- /**
- * Method get_svc_name
- * @param endpoint_ref pointer to endpoint ref
+ * Gets service name. An endpoint in WS-Addressing has a QName
+ * identifying the WSDL service element that contains the definition
+ * of the endpoint being conveyed. The service name provides a link
+ * to a full description of the service endpoint.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
+ * @return pointer to service name struct, returns a reference, not
+ * a cloned copy
*/
axis2_svc_name_t *(AXIS2_CALL *
get_svc_name)(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
+
/**
- * Method set_svc_name
- * @param endpoint_ref pointer to endpoint ref
+ * Sets service name. An endpoint in WS-Addressing has a QName
+ * identifying the WSDL service element that contains the definition
+ * of the endpoint being conveyed. The service name provides a link
+ * to a full description of the service endpoint.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
- * @param svc_name pointer to service name
+ * @param svc_name pointer to service name struct, endpoint assumes
+ * ownership of the struct
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
set_svc_name)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axis2_svc_name_t *svc_name);
- /* axiom_node_t *(AXIS2_CALL *
- get_policies)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_policies)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axiom_node_t *policies);
- */
- /* axis2_any_content_type_t *(AXIS2_CALL *
- get_metadata)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
- axis2_status_t (AXIS2_CALL *
- set_metadata)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *metadata);
- **/
- /*
- axis2_status_t (AXIS2_CALL *
- add_ref_param)(struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_qname_t *qname,
- axis2_char_t *value);
- */
-
/**
- * @param endpoint_ref pointer to endpoint ref
+ * Frees endpoint reference struct.
+ * @param endpoint_ref pointer to endpoint reference struct
* @param env pointer to environment struct
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
free)(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
};
/**
- * Dispatcher struct
+ * endpoint reference struct.
*/
struct axis2_endpoint_ref
{
- /** Dispatcher related ops */
+ /** endpoint reference related ops */
axis2_endpoint_ref_ops_t *ops;
};
/**
- * creates endpoint_ref struct
+ * Creates endpoint reference struct.
* @param env pointer to environment struct
- * @param address pointer to address
+ * @param address endpoint address string
+ * @return pointer to newly created endpoint reference
*/
AXIS2_EXTERN axis2_endpoint_ref_t *AXIS2_CALL
axis2_endpoint_ref_create(
const axis2_env_t *env,
const axis2_char_t *address);
-/** Get address.
+/** Gets address.
@sa axis2_endpoint_ref_ops#get_address */
#define AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env) \
((endpoint_ref)->ops->get_address(endpoint_ref, env))
-/** Set address.
+/** Sets address.
@sa axis2_endpoint_ref_ops#set_address */
#define AXIS2_ENDPOINT_REF_SET_ADDRESS(endpoint_ref, env, address) \
((endpoint_ref)->ops->set_address(endpoint_ref, env, address))
-/** Get interface name.
+/** Gets interface name.
@sa axis2_endpoint_ref_ops#get_interface_name */
#define AXIS2_ENDPOINT_REF_GET_INTERFACE_NAME(endpoint_ref, env) \
((endpoint_ref)->ops->get_interface_qname(endpoint_ref, env))
-/** Set interface name.
+/** Sets interface name.
@sa axis2_endpoint_ref_ops#set_interface_name */
#define AXIS2_ENDPOINT_REF_SET_INTERFACE_NAME(endpoint_ref, env, interface_qname)\
((endpoint_ref)->ops->set_interface_qname(endpoint_ref, env, interface_qname))
-/** Get reference properties.
- @sa axis2_endpoint_ref_ops#get_ref_properties */
-#define AXIS2_ENDPOINT_REF_GET_REF_PROPERTIES(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_ref_properties(endpoint_ref, env))
-
-/** Set reference properties.
- @sa axis2_endpoint_ref_ops#set_ref_properties */
-#define AXIS2_ENDPOINT_REF_SET_REF_PROPERTIES(endpoint_ref, env, ref_properties)\
- ((endpoint_ref)->ops->set_ref_properties(endpoint_ref, env, ref_properties))
-
-/*#define AXIS2_ENDPOINT_REF_GET_REF_PARAMS(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_ref_params(endpoint_ref, env))
-
-#define AXIS2_ENDPOINT_REF_SET_REF_PARAMS(endpoint_ref, env, any_content_type) \
- ((endpoint_ref)->ops->set_ref_params(endpoint_ref, env, any_content_type))*/
-
-/** Gets the service name.
+/** Gets service name.
@sa axis2_endpoint_ref_ops#get_svc_name */
#define AXIS2_ENDPOINT_REF_GET_SVC_NAME(endpoint_ref, env) \
((endpoint_ref)->ops->get_svc_name(endpoint_ref, env))
-/** Sets the service name.
+/** Sets service name.
@sa axis2_endpoint_ref_ops#set_svc_name */
#define AXIS2_ENDPOINT_REF_SET_SVC_NAME(endpoint_ref, env, svc_name) \
((endpoint_ref)->ops->set_svc_name(endpoint_ref, env, svc_name))
-/*#define AXIS2_ENDPOINT_REF_GET_POLICIES(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_policies(endpoint_ref, env))
-
-#define AXIS2_ENDPOINT_REF_SET_POLICIES(endpoint_ref, env, policies) \
- ((endpoint_ref)->ops->set_policies(endpoint_ref, env, policies))*/
-
-/*#define AXIS2_ENDPOINT_REF_GET_METADATA(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_metadata(endpoint_ref, env))
-
-#define AXIS2_ENDPOINT_REF_SET_METADATA(endpoint_ref, env, metadata) \
- ((endpoint_ref)->ops->set_metadata(endpoint_ref, env, metadata))*/
-
-/** Gets the reference parameter list.
+/** Gets reference parameter list.
@sa axis2_endpoint_ref_ops#get_ref_param_list */
#define AXIS2_ENDPOINT_REF_GET_REF_PARAM_LIST(endpoint_ref, env) \
((endpoint_ref)->ops->get_ref_param_list(endpoint_ref, env))
-/** Get the meta data list.
- @sa axis2_endpoint_ref_ops#get_meta_data_list */
-#define AXIS2_ENDPOINT_REF_GET_META_DATA_LIST(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_meta_data_list(endpoint_ref, env))
+/** Gets metadata list.
+ @sa axis2_endpoint_ref_ops#get_metadata_list */
+#define AXIS2_ENDPOINT_REF_GET_METADATA_LIST(endpoint_ref, env) \
+ ((endpoint_ref)->ops->get_metadata_list(endpoint_ref, env))
-/** Add reference param.
+/** Adds reference parameter.
@sa axis2_endpoint_ref_ops#add_ref_param */
#define AXIS2_ENDPOINT_REF_ADD_REF_PARAM(endpoint_ref, env, node) \
((endpoint_ref)->ops->add_ref_param(endpoint_ref, env, node))
-/** Add meta data.
- @sa axis2_endpoint_ref_ops#add_meta_data */
-#define AXIS2_ENDPOINT_REF_ADD_META_DATA(endpoint_ref, env, node) \
- ((endpoint_ref)->ops->add_meta_data(endpoint_ref, env, node))
+/** Adds metadata.
+ @sa axis2_endpoint_ref_ops#add_metadata */
+#define AXIS2_ENDPOINT_REF_ADD_METADATA(endpoint_ref, env, node) \
+ ((endpoint_ref)->ops->add_metadata(endpoint_ref, env, node))
-/** Frees the endpoint reference.
+/** Frees endpoint reference.
@sa axis2_endpoint_ref_ops#free */
#define AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env) \
((endpoint_ref)->ops->free(endpoint_ref, env))
-/** Gets the reference attribute list.
+/** Gets reference attribute list.
@sa axis2_endpoint_ref_ops#get_ref_attribute_list */
#define AXIS2_ENDPOINT_REF_GET_REF_ATTRIBUTE_LIST(endpoint_ref, env) \
((endpoint_ref)->ops->get_ref_attribute_list(endpoint_ref, env))
-/** Gets the meta attribute list.
- @sa axis2_endpoint_ref_ops#get_meta_attribute_list */
+/** Gets metadata attribute list.
+ @sa axis2_endpoint_ref_ops#get_metadata_attribute_list */
#define AXIS2_ENDPOINT_REF_GET_META_ATTRIBUTE_LIST(endpoint_ref, env) \
- ((endpoint_ref)->ops->get_meta_attribute_list(endpoint_ref, env))
+ ((endpoint_ref)->ops->get_metadata_attribute_list(endpoint_ref, env))
-/** Get reference extension list.
+/** Gets reference extension list.
@sa axis2_endpoint_ref_ops#get_ref_extension_list */
#define AXIS2_ENDPOINT_REF_GET_REF_EXTENSION_LIST(endpoint_ref, env) \
((endpoint_ref)->ops->get_extension_list(endpoint_ref, env))
-/** Add reference attribute.
+/** Adds reference attribute.
@sa axis2_endpoint_ref_ops#add_ref_attribute */
#define AXIS2_ENDPOINT_REF_ADD_REF_ATTRIBUTE(endpoint_ref, env, attr) \
((endpoint_ref)->ops->add_ref_attribute(endpoint_ref, env, attr))
-/** Add meta attribute.
- @sa axis2_endpoint_ref_ops#add_meta_attribute */
+/** Adds metadata attribute.
+ @sa axis2_endpoint_ref_ops#add_metadata_attribute */
#define AXIS2_ENDPOINT_REF_ADD_META_ATTRIBUTE(endpoint_ref, env, attr) \
- ((endpoint_ref)->ops->add_meta_attribute(endpoint_ref, env, attr))
+ ((endpoint_ref)->ops->add_metadata_attribute(endpoint_ref, env, attr))
-/** Add extension.
+/** Adds extension.
@sa axis2_endpoint_ref_ops#add_extension */
#define AXIS2_ENDPOINT_REF_ADD_EXTENSION(endpoint_ref, env, node) \
((endpoint_ref)->ops->add_extension(endpoint_ref, env, node))
Modified: webservices/axis2/trunk/c/include/axis2_rest_sender.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_rest_sender.h?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_rest_sender.h (original)
+++ webservices/axis2/trunk/c/include/axis2_rest_sender.h Tue Sep 5 04:21:02 2006
@@ -54,7 +54,7 @@
(axis2_rest_sender_t *sender,
const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
axiom_node_t *out,
- axis2_char_t *str_url);
+ const axis2_char_t *str_url);
axis2_status_t (AXIS2_CALL *set_chunked)
(axis2_rest_sender_t *sender,
Modified: webservices/axis2/trunk/c/include/axis2_svc_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc_client.h?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_client.h Tue Sep 5 04:21:02 2006
@@ -78,7 +78,7 @@
/**
* service client ops struct.
- * Encapsulator struct for operations of axis2_svc_client
+ * Encapsulator struct for operations of axis2_svc_client.
*/
struct axis2_svc_client_ops
{
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Tue Sep 5 04:21:02 2006
@@ -14,8 +14,6 @@
* limitations under the License.
*/
- /** <wsa:RelatesTo RelationshipType="..."?>xs:anyURI</wsa:RelatesTo> */
-
#include <axis2_endpoint_ref.h>
#include <axis2_string.h>
#include <axis2_array_list.h>
@@ -27,14 +25,10 @@
axis2_char_t *address;
/** interface qname */
axis2_qname_t *interface_qname;
- /** reference properties */
- /*axis2_any_content_type_t *ref_properties;*/
- /** reference parameters */
- /*axis2_any_content_type_t *ref_params;*/
/** reference parameters */
axis2_array_list_t *ref_param_list;
/** meta data */
- axis2_array_list_t *meta_data_list;
+ axis2_array_list_t *metadata_list;
/** reference parameter attribute list */
axis2_array_list_t *ref_attribute_list;
/** meta data attribute list */
@@ -43,59 +37,42 @@
axis2_array_list_t *extension_list;
/** service name */
axis2_svc_name_t *svc_name;
- /** policies represented as an OM node */
- /*axiom_node_t *policies;*/
- /** meta data */
- /*axis2_any_content_type_t *metadata;*/
-}
-axis2_endpoint_ref_impl_t;
+} axis2_endpoint_ref_impl_t;
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(endpoint_ref) ((axis2_endpoint_ref_impl_t *)endpoint_ref)
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_endpoint_ref_get_address(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_address(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_char_t *address);
+ const axis2_char_t *address);
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
axis2_endpoint_ref_get_interface_qname(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_interface_qname(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_qname_t *interface_qname);
+ const axis2_qname_t *interface_qname);
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_properties(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_ref_properties(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *ref_properties);
-*/
-
axis2_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_ref_param_list(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_meta_data_list(
+axis2_endpoint_ref_get_metadata_list(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
@@ -105,7 +82,7 @@
const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_meta_attribute_list(
+axis2_endpoint_ref_get_metadata_attribute_list(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
@@ -114,44 +91,33 @@
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_params(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_ref_params(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *any_content_type);
-*/
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_ref_param(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *ref_param_node);
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_meta_data(
- struct axis2_endpoint_ref *endpoint_ref,
+axis2_endpoint_ref_add_metadata(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *meta_data_node);
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_ref_attribute(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr);
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_meta_attribute(
- struct axis2_endpoint_ref *endpoint_ref,
+axis2_endpoint_ref_add_metadata_attribute(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr);
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_extension(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *extension_node);
@@ -162,43 +128,13 @@
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_svc_name(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axis2_svc_name_t *svc_name);
-/*axiom_node_t *AXIS2_CALL
-axis2_endpoint_ref_get_policies(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_policies(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axiom_node_t *policies);
-*/
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_metadata(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_metadata(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *metadata);
-*/
-/*axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_ref_param(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_qname_t *qname,
- axis2_char_t *value);
-*/
-
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_free(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
axis2_endpoint_ref_t *AXIS2_CALL
@@ -221,16 +157,12 @@
endpoint_ref_impl->endpoint_ref.ops = NULL;
endpoint_ref_impl->address = NULL;
endpoint_ref_impl->interface_qname = NULL;
- /*endpoint_ref_impl->ref_properties = NULL;*/
- /*endpoint_ref_impl->ref_params = NULL;*/
endpoint_ref_impl->ref_param_list = NULL;
- endpoint_ref_impl->meta_data_list = NULL;
+ endpoint_ref_impl->metadata_list = NULL;
endpoint_ref_impl->ref_attribute_list = NULL;
endpoint_ref_impl->meta_attribute_list = NULL;
endpoint_ref_impl->extension_list = NULL;
endpoint_ref_impl->svc_name = NULL;
- /*endpoint_ref_impl->policies = NULL;*/
- /*endpoint_ref_impl->metadata = NULL;*/
if (address)
{
@@ -251,8 +183,8 @@
return NULL;
}
- endpoint_ref_impl->meta_data_list = axis2_array_list_create(env, 0);
- if (!(endpoint_ref_impl->meta_data_list))
+ endpoint_ref_impl->metadata_list = axis2_array_list_create(env, 0);
+ if (!(endpoint_ref_impl->metadata_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_endpoint_ref_free(&(endpoint_ref_impl->endpoint_ref), env);
@@ -308,8 +240,8 @@
endpoint_ref_impl->endpoint_ref.ops->get_ref_attribute_list =
axis2_endpoint_ref_get_ref_attribute_list;
- endpoint_ref_impl->endpoint_ref.ops->get_meta_attribute_list =
- axis2_endpoint_ref_get_meta_attribute_list;
+ endpoint_ref_impl->endpoint_ref.ops->get_metadata_attribute_list =
+ axis2_endpoint_ref_get_metadata_attribute_list;
endpoint_ref_impl->endpoint_ref.ops->get_extension_list =
axis2_endpoint_ref_get_extension_list;
@@ -317,53 +249,29 @@
endpoint_ref_impl->endpoint_ref.ops->add_ref_attribute =
axis2_endpoint_ref_add_ref_attribute;
- endpoint_ref_impl->endpoint_ref.ops->add_meta_attribute =
- axis2_endpoint_ref_add_meta_attribute;
+ endpoint_ref_impl->endpoint_ref.ops->add_metadata_attribute =
+ axis2_endpoint_ref_add_metadata_attribute;
endpoint_ref_impl->endpoint_ref.ops->add_extension =
axis2_endpoint_ref_add_extension;
-/* endpoint_ref_impl->endpoint_ref.ops->get_ref_properties =
- axis2_endpoint_ref_get_ref_properties;
-
- endpoint_ref_impl->endpoint_ref.ops->set_ref_properties =
- axis2_endpoint_ref_set_ref_properties;
-*/
-/* endpoint_ref_impl->endpoint_ref.ops->get_ref_params =
- axis2_endpoint_ref_get_ref_params;
-
- endpoint_ref_impl->endpoint_ref.ops->set_ref_params =
- axis2_endpoint_ref_set_ref_params;
-*/
endpoint_ref_impl->endpoint_ref.ops->get_svc_name =
axis2_endpoint_ref_get_svc_name;
endpoint_ref_impl->endpoint_ref.ops->set_svc_name =
axis2_endpoint_ref_set_svc_name;
-/* endpoint_ref_impl->endpoint_ref.ops->get_policies =
- axis2_endpoint_ref_get_policies;
-
- endpoint_ref_impl->endpoint_ref.ops->set_policies =
- axis2_endpoint_ref_set_policies;
-*/
-/* endpoint_ref_impl->endpoint_ref.ops->get_metadata =
- axis2_endpoint_ref_get_metadata;
-
- endpoint_ref_impl->endpoint_ref.ops->set_metadata =
- axis2_endpoint_ref_set_metadata;*/
-
endpoint_ref_impl->endpoint_ref.ops->get_ref_param_list =
axis2_endpoint_ref_get_ref_param_list;
- endpoint_ref_impl->endpoint_ref.ops->get_meta_data_list =
- axis2_endpoint_ref_get_meta_data_list;
+ endpoint_ref_impl->endpoint_ref.ops->get_metadata_list =
+ axis2_endpoint_ref_get_metadata_list;
endpoint_ref_impl->endpoint_ref.ops->add_ref_param =
axis2_endpoint_ref_add_ref_param;
- endpoint_ref_impl->endpoint_ref.ops->add_meta_data =
- axis2_endpoint_ref_add_meta_data;
+ endpoint_ref_impl->endpoint_ref.ops->add_metadata =
+ axis2_endpoint_ref_add_metadata;
endpoint_ref_impl->endpoint_ref.ops->free =
axis2_endpoint_ref_free;
@@ -373,10 +281,7 @@
}
-/**
- * Method get_address
- */
-axis2_char_t *AXIS2_CALL
+const axis2_char_t *AXIS2_CALL
axis2_endpoint_ref_get_address(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
@@ -385,16 +290,11 @@
return AXIS2_INTF_TO_IMPL(endpoint_ref)->address;
}
-/**
- * Method set_address
- *
- * @param address
- */
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_address(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_char_t *address)
+ const axis2_char_t *address)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(endpoint_ref)->address)
@@ -407,10 +307,7 @@
return AXIS2_SUCCESS;
}
-/**
- * Method get_interface_qname
- */
-axis2_qname_t *AXIS2_CALL
+const axis2_qname_t *AXIS2_CALL
axis2_endpoint_ref_get_interface_qname(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
@@ -419,76 +316,18 @@
return AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname;
}
-/**
- * Method set_interface_qname
- *
- * @param interface_qname
- */
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_interface_qname(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
- axis2_qname_t *interface_qname)
+ const axis2_qname_t *interface_qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname = interface_qname;
+ AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname =
+ AXIS2_QNAME_CLONE(interface_qname, env);
return AXIS2_SUCCESS;
}
-/**
- * Method get_ref_properties
- */
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_properties(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env)
-{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties;
-}*/
-
-/**
- * Method set_ref_properties
- *
- * @param ref_properties
- */
-/*axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_ref_properties(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *ref_properties)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties = ref_properties;
- return AXIS2_SUCCESS;
-}*/
-
-/**
- * Method get_ref_params
- */
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_params(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env)
-{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params;
-}
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_ref_params(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *any_content_type)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params = any_content_type;
- return AXIS2_SUCCESS;
-}*/
-
-/**
- * Method get_svc_name
- */
axis2_svc_name_t *AXIS2_CALL
axis2_endpoint_ref_get_svc_name(
const axis2_endpoint_ref_t *endpoint_ref,
@@ -498,14 +337,9 @@
return AXIS2_INTF_TO_IMPL(endpoint_ref)->svc_name;
}
-/**
- * Method set_svc_name
- *
- * @param svc_name
- */
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_svc_name(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axis2_svc_name_t *svc_name)
{
@@ -514,72 +348,9 @@
return AXIS2_SUCCESS;
}
-/*axiom_node_t *AXIS2_CALL
-axis2_endpoint_ref_get_policies(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env)
-{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(endpoint_ref)->policies;
-}
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_policies(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axiom_node_t *policies)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(endpoint_ref)->policies = policies;
- return AXIS2_SUCCESS;
-}*/
-
-/*axis2_any_content_type_t *AXIS2_CALL
-axis2_endpoint_ref_get_metadata(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env)
-{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata;
-}
-
-axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_metadata(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_any_content_type_t *metadata)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata = metadata;
- return AXIS2_SUCCESS;
-}*/
-
-/*axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_ref_param(
- struct axis2_endpoint_ref *endpoint_ref,
- const axis2_env_t *env,
- axis2_qname_t *qname,
- axis2_char_t *value)
-{
- axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- endpoint_ref_impl = AXIS2_INTF_TO_IMPL(endpoint_ref);
-
- if (!(endpoint_ref_impl->ref_params))
- {
- endpoint_ref_impl->ref_params = axis2_any_content_type_create(env);
- if (!(endpoint_ref_impl->ref_params ))
- return AXIS2_FAILURE;
- }
-
- return AXIS2_ANY_CONTENT_TYPE_ADD_VALUE(endpoint_ref_impl->ref_params, env, qname, value);
-}*/
-
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_free(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
@@ -600,22 +371,16 @@
endpoint_ref_impl->address = NULL;
}
- /*if (endpoint_ref_impl->ref_params)
- {
- AXIS2_ANY_CONTENT_TYPE_FREE(endpoint_ref_impl->ref_params, env);
- endpoint_ref_impl->ref_params = NULL;
- }*/
-
if (endpoint_ref_impl->ref_param_list)
{
AXIS2_ARRAY_LIST_FREE(endpoint_ref_impl->ref_param_list, env);
endpoint_ref_impl->ref_param_list = NULL;
}
- if (endpoint_ref_impl->meta_data_list)
+ if (endpoint_ref_impl->metadata_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref_impl->meta_data_list, env);
- endpoint_ref_impl->meta_data_list = NULL;
+ AXIS2_ARRAY_LIST_FREE(endpoint_ref_impl->metadata_list, env);
+ endpoint_ref_impl->metadata_list = NULL;
}
if (endpoint_ref_impl->ref_attribute_list)
@@ -658,7 +423,7 @@
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_meta_data_list(
+axis2_endpoint_ref_get_metadata_list(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
@@ -668,13 +433,13 @@
endpoint_ref_impl = AXIS2_INTF_TO_IMPL(endpoint_ref);
- return endpoint_ref_impl->meta_data_list;
+ return endpoint_ref_impl->metadata_list;
}
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_ref_param(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *ref_param_node)
{
@@ -693,8 +458,8 @@
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_meta_data(
- struct axis2_endpoint_ref *endpoint_ref,
+axis2_endpoint_ref_add_metadata(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *meta_data_node)
{
@@ -704,9 +469,9 @@
endpoint_ref_impl = AXIS2_INTF_TO_IMPL(endpoint_ref);
- if (endpoint_ref_impl->meta_data_list && meta_data_node)
+ if (endpoint_ref_impl->metadata_list && meta_data_node)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref_impl->meta_data_list, env, meta_data_node);
+ return AXIS2_ARRAY_LIST_ADD(endpoint_ref_impl->metadata_list, env, meta_data_node);
}
return AXIS2_FAILURE;
@@ -728,7 +493,7 @@
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_meta_attribute_list(
+axis2_endpoint_ref_get_metadata_attribute_list(
const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
@@ -757,7 +522,7 @@
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_ref_attribute(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr)
{
@@ -776,8 +541,8 @@
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_meta_attribute(
- struct axis2_endpoint_ref *endpoint_ref,
+axis2_endpoint_ref_add_metadata_attribute(
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr)
{
@@ -797,7 +562,7 @@
axis2_status_t AXIS2_CALL
axis2_endpoint_ref_add_extension(
- struct axis2_endpoint_ref *endpoint_ref,
+ axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *extension_node)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Tue Sep 5 04:21:02 2006
@@ -97,7 +97,7 @@
axis2_char_t *AXIS2_CALL
axis2_get_transport_from_url(
- axis2_char_t *url,
+ const axis2_char_t *url,
const axis2_env_t *env);
axis2_svc_ctx_t *AXIS2_CALL
@@ -332,7 +332,7 @@
if (epr)
{
- axis2_char_t *to_url = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+ const axis2_char_t *to_url = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
transport = axis2_get_transport_from_url(to_url, env);
}
@@ -522,12 +522,12 @@
axis2_char_t *AXIS2_CALL
axis2_get_transport_from_url(
- axis2_char_t *url,
+ const axis2_char_t *url,
const axis2_env_t *env)
{
axis2_char_t *transport = NULL;
- axis2_char_t *start = NULL;
- axis2_char_t *end = NULL;
+ const axis2_char_t *start = NULL;
+ const axis2_char_t *end = NULL;
AXIS2_PARAM_CHECK(env->error, url, AXIS2_FAILURE);
start = url;
end = url;
@@ -536,7 +536,7 @@
if ((*end) == ':')
{
- axis2_char_t *c = NULL;
+ const axis2_char_t *c = NULL;
transport = AXIS2_MALLOC( env->allocator, (end - start + 1 ) * sizeof(char) );
if (!transport)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Tue Sep 5 04:21:02 2006
@@ -447,7 +447,7 @@
{
axis2_msg_ctx_t *response_mc = NULL;
axis2_char_t *address = NULL;
- axis2_char_t *epr_address = NULL;
+ const axis2_char_t *epr_address = NULL;
axis2_property_t *property = NULL;
/* Usual Request-Response Sync implementation */
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Tue Sep 5 04:21:02 2006
@@ -90,7 +90,7 @@
if (endpoint_ref)
{
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
if (address)
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Tue Sep 5 04:21:02 2006
@@ -217,7 +217,7 @@
axis2_svc_t *svc = NULL;
axis2_svc_ctx_t *svc_ctx = NULL;
axis2_endpoint_ref_t *endpoint_ref = NULL;
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Sep 5 04:21:02 2006
@@ -586,7 +586,7 @@
fault_to = AXIS2_MSG_CTX_GET_FAULT_TO(processing_context, env);
if (fault_to)
{
- axis2_char_t *address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_to, env);
+ const axis2_char_t *address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_to, env);
if (!address)
{
fault_to = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Tue Sep 5 04:21:02 2006
@@ -92,7 +92,7 @@
if (endpoint_ref)
{
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
if (address)
@@ -148,7 +148,7 @@
if (endpoint_ref)
{
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
if (address)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Tue Sep 5 04:21:02 2006
@@ -570,7 +570,7 @@
axiom_output_t *om_output)
{
const axis2_char_t *soap_action = NULL;
- axis2_char_t *url = NULL;
+ const axis2_char_t *url = NULL;
axiom_soap_over_http_sender_t *sender = NULL;
axis2_status_t status = AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c Tue Sep 5 04:21:02 2006
@@ -70,7 +70,8 @@
axis2_status_t AXIS2_CALL
axis2_rest_sender_send(axis2_rest_sender_t *sender,
const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
- axiom_node_t *out, axis2_char_t *str_url);
+ axiom_node_t *out,
+ const axis2_char_t *str_url);
axis2_status_t AXIS2_CALL
axis2_rest_sender_set_chunked(axis2_rest_sender_t *sender,
@@ -166,7 +167,8 @@
axis2_status_t AXIS2_CALL
axis2_rest_sender_send(axis2_rest_sender_t *sender,
const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
- axiom_node_t *out, axis2_char_t *str_url)
+ axiom_node_t *out,
+ const axis2_char_t *str_url)
{
axis2_http_simple_request_t *request = NULL;
axis2_http_request_line_t *request_line = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=440319&r1=440318&r2=440319
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Tue Sep 5 04:21:02 2006
@@ -219,7 +219,7 @@
if (soap_header)
{
axis2_char_t *action = NULL;
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
const axis2_char_t *svc_group_context_id = NULL;
axis2_char_t *message_id = NULL;
axis2_relates_to_t *relates_to = NULL;
@@ -247,7 +247,7 @@
axis2_endpoint_ref_t *fault_epr = AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO (msg_info_headers, env);
if (fault_epr)
{
- axis2_char_t *fault_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_epr, env);
+ const axis2_char_t *fault_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_epr, env);
if (fault_address)
{
if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL, fault_address) != 0 &&
@@ -530,7 +530,7 @@
const axis2_char_t * addr_ns)
{
axiom_soap_header_block_t *header_block = NULL;
- axis2_char_t *address = NULL;
+ const axis2_char_t *address = NULL;
axis2_array_list_t *ref_param_list = NULL;
axis2_array_list_t *meta_data_list = NULL;
axis2_array_list_t *extension_list = NULL;
@@ -633,7 +633,7 @@
}
- meta_data_list = AXIS2_ENDPOINT_REF_GET_META_DATA_LIST(endpoint_ref, env);
+ meta_data_list = AXIS2_ENDPOINT_REF_GET_METADATA_LIST(endpoint_ref, env);
if (meta_data_list && AXIS2_ARRAY_LIST_SIZE(meta_data_list, env) > 0)
{
axiom_node_t *reference_node = NULL;
@@ -692,7 +692,7 @@
if (AXIS2_STRCMP (AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns) == 0)
{
- axis2_any_content_type_t *referece_properties = NULL;
+ /* axis2_any_content_type_t *referece_properties = NULL;
axiom_element_t *reference_ele = NULL;
axiom_node_t *reference_node = NULL;
referece_properties =
@@ -717,6 +717,7 @@
addr_ns_obj = NULL;
}
}
+ */
}
return AXIS2_SUCCESS;
@@ -729,7 +730,7 @@
const axis2_char_t * addr_ns)
{
axiom_node_t *parent_node = NULL;
- axis2_qname_t *interface_qname = NULL;
+ const axis2_qname_t *interface_qname = NULL;
axiom_node_t *interface_node = NULL;
axiom_element_t *interface_ele = NULL;
const axis2_char_t *element_localname = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org