Author: damitha
Date: Wed Mar 7 21:25:54 2007
New Revision: 515928
URL: http://svn.apache.org/viewvc?view=rev&rev=515928
Log:
replaced macro calls
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/property_mgr.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/wsrm/address.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Mar
7 21:25:54 2007
@@ -636,8 +636,8 @@
is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
- if((!to_epr || !AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)
- || 0 == AXIS2_STRLEN(AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ if((!to_epr || !axis2_endpoint_ref_get_address(to_epr, env)
+ || 0 == AXIS2_STRLEN(axis2_endpoint_ref_get_address(
to_epr, env))) && !is_svr_side)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "to epr is not set - a"
@@ -699,7 +699,7 @@
axis2_char_t *seq_key = NULL;
axis2_char_t *last_app_msg = NULL;
- to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY, AXIS2_FALSE);
if(property)
@@ -906,7 +906,7 @@
axis2_endpoint_ref_t *acks_to_epr = NULL;
acks_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
- acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ acks_to = (axis2_char_t*)axis2_endpoint_ref_get_address(
acks_to_epr, env);
}
else if(!acks_to)
@@ -929,7 +929,7 @@
sandesha2_seq_property_bean_get_value(reply_to_epr_bean,
env));
if(acks_epr)
- acks_to =
(axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ acks_to =
(axis2_char_t*)axis2_endpoint_ref_get_address(
acks_epr, env);
}
}
@@ -976,7 +976,7 @@
op_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(AXIS2_OP_CTX_GET_OP(
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
if (to_epr)
- to_addr = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
/* test code */
/*if(!AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, axis2_strcat(env, to_addr,
@@ -1306,7 +1306,7 @@
reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);
}
if(reply_to)
- new_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ new_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(
reply_to, env);
}
if(new_to_str)
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
Wed Mar 7 21:25:54 2007
@@ -298,7 +298,7 @@
acks_to = sandesha2_address_get_epr(sandesha2_acks_to_get_address(
sandesha2_create_seq_get_acks_to(create_seq_part, env),
env), env);
- if(!acks_to || !AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to,
+ if(!acks_to || !axis2_endpoint_ref_get_address(acks_to,
env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null"
@@ -309,7 +309,7 @@
}
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
- (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to,
env));
+ (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to,
env));
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
@@ -332,7 +332,7 @@
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if(0 == AXIS2_STRCMP(anon_uri, AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr,
+ if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr,
env)))
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
else
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Wed Mar 7 21:25:54 2007
@@ -317,7 +317,7 @@
sandesha2_seq_property_bean_set_seq_id(acks_to_bean, env,
offered_seq_id);
sandesha2_seq_property_bean_set_value(acks_to_bean, env,
- (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ (axis2_char_t*)axis2_endpoint_ref_get_address(
acks_to_epr, env));
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
Wed Mar 7 21:25:54 2007
@@ -220,7 +220,7 @@
axis2_char_t *epr_address = NULL;
epr = sandesha2_address_get_epr(address, env);
if(epr)
- epr_address = (axis2_char_t *) AXIS2_ENDPOINT_REF_GET_ADDRESS(epr,
+ epr_address = (axis2_char_t *) axis2_endpoint_ref_get_address(epr,
env);
if(epr_address)
sandesha2_sender_bean_set_wsrm_anon_uri(find_sender_bean, env,
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Wed Mar 7 21:25:54 2007
@@ -437,7 +437,7 @@
to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if(0 == AXIS2_STRCMP(anon_uri, AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr,
env)))
+ if(0 == AXIS2_STRCMP(anon_uri, axis2_endpoint_ref_get_address(to_epr,
env)))
{
axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
}
@@ -487,7 +487,7 @@
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr,
env);
- to_address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ to_address = (axis2_char_t*)axis2_endpoint_ref_get_address(
AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY,
AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Wed Mar 7 21:25:54
2007
@@ -358,7 +358,7 @@
if(to)
{
axis2_char_t *address = (axis2_char_t *)
- AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ axis2_endpoint_ref_get_address(
(const axis2_endpoint_ref_t *) to, env);
sandesha2_sender_bean_set_to_address(make_conn_sender_bean,
env,
address);
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
Wed Mar 7 21:25:54 2007
@@ -723,13 +723,13 @@
to = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
if(to)
{
- address = (axis2_char_t *) AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
+ address = (axis2_char_t *) axis2_endpoint_ref_get_address(to, env);
sandesha2_msg_store_bean_set_to_url(bean, env, address);
}
reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(msg_ctx, env);
if(reply_to)
{
- address = (axis2_char_t *) AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to,
env);
+ address = (axis2_char_t *) axis2_endpoint_ref_get_address(reply_to,
env);
sandesha2_msg_store_bean_set_reply_to(bean, env, address);
}
/*property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL,
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
Wed Mar 7 21:25:54 2007
@@ -133,7 +133,7 @@
if(module_desc)
{
axis2_param_t *db_param = NULL;
- db_param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
SANDESHA2_DB);
+ db_param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_DB);
if(db_param)
{
path = (axis2_char_t *) axis2_param_get_value(db_param, env);
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Mar 7 21:25:54 2007
@@ -72,7 +72,7 @@
sandesha2_seq_property_bean_get_value(acks_to_bean,
env));
if(acks_to)
- acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to,
env);
+ acks_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to,
env);
if(!acks_to_str)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR,
AXIS2_FAILURE);
@@ -415,7 +415,7 @@
to = sandesha2_msg_ctx_get_to(rm_msg_ctx, env);
if(to)
- to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
+ to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(to, env);
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
find_bean);
@@ -439,7 +439,7 @@
sender_bean, env);
msg_ctx1 = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
msg_ctx_ref_key, conf_ctx);
- to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ to = (axis2_char_t*)axis2_endpoint_ref_get_address(
AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
if(0 == AXIS2_STRCMP(to, to_str))
continue;
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Mar 7 21:25:54 2007
@@ -447,7 +447,7 @@
epr = sandesha2_address_get_epr(sandesha2_acks_to_get_address(
sandesha2_create_seq_get_acks_to(create_seq, env),
env), env);
- acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+ acks_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(epr, env);
}
else
{
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Mar 7 21:25:54 2007
@@ -173,7 +173,7 @@
if(property)
{
temp_to = AXIS2_PROPERTY_GET_VALUE(property, env);
- to_epr = axis2_endpoint_ref_create(env, AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ to_epr = axis2_endpoint_ref_create(env, axis2_endpoint_ref_get_address(
temp_to, env));
}
if (!to_epr)
@@ -181,7 +181,7 @@
temp_to = sandesha2_msg_ctx_get_to(application_rm_msg, env);
if (temp_to)
{
- to_epr = axis2_endpoint_ref_create(env,
AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ to_epr = axis2_endpoint_ref_create(env,
axis2_endpoint_ref_get_address(
temp_to, env));
}
}
@@ -1090,7 +1090,7 @@
axis2_char_t *address = NULL;
/* Setting the addressing properties */
to = AXIS2_MSG_CTX_GET_TO(ref_msg_ctx, env);
- address = (axis2_char_t *) AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ address = (axis2_char_t *) axis2_endpoint_ref_get_address(
(const axis2_endpoint_ref_t *) to, env);
to = axis2_endpoint_ref_create(env, address);
AXIS2_MSG_CTX_SET_TO(make_conn_msg_ctx, env, to);
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Wed Mar 7 21:25:54
2007
@@ -134,7 +134,7 @@
property_bean = sandesha2_property_bean_create(env);
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_EXP_BACKOFF);
if(param)
{
@@ -143,7 +143,7 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_RETRANSMISSION_INTERVAL);
if(param)
{
@@ -152,7 +152,7 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_ACK_INTERVAL);
if(param)
{
@@ -161,14 +161,14 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_INACTIVETIMEOUT);
if(param)
{
axis2_char_t *inactive_to_measure_str = NULL;
inactive_timeout_str = axis2_param_get_value(param, env);
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_INACTIVETIMEOUT_MEASURE);
if(param)
inactive_to_measure_str = axis2_param_get_value(param, env);
@@ -179,7 +179,7 @@
inactive_to_measure_str, property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_IN_MEMORY_STORAGE_MGR);
if(param)
{
@@ -188,7 +188,7 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_PERM_STORAGE_MGR);
if(param)
{
@@ -197,7 +197,7 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_INORDER_INVOCATION);
if(param)
{
@@ -206,7 +206,7 @@
in_order_invoker_str, property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_MSG_TYPES_TO_DROP);
if(param)
{
@@ -215,7 +215,7 @@
property_bean);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_STORAGE_MGR);
if(param)
{
@@ -224,7 +224,7 @@
sandesha2_property_bean_set_storage_mgr(property_bean, env,
storage_mgr);
}
- param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env,
+ param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_MAX_RETRANS_COUNT);
if(param)
{
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Mar 7 21:25:54 2007
@@ -130,7 +130,7 @@
/* If no replyTo value. Send responses as sync. */
if(reply_to)
{
- reply_to_addr =
(axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
+ reply_to_addr =
(axis2_char_t*)axis2_endpoint_ref_get_address(reply_to, env);
to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_TO_EPR, reply_to_addr);
}
@@ -139,10 +139,10 @@
to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_TO_EPR, anonymous_uri);
}
- address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
+ address = (axis2_char_t*)axis2_endpoint_ref_get_address(to, env);
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, address);
- address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
+ address = (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, env);
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR, address);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, received_msg_bean);
@@ -394,7 +394,7 @@
{
to_bean = sandesha2_seq_property_bean_create_with_data(env, int_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR,
- (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr,
+ (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr,
env));
}
@@ -420,7 +420,7 @@
if(reply_to_epr)
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env,
int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR,
- (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ (axis2_char_t*)axis2_endpoint_ref_get_address(
reply_to_epr, env));
else
{
@@ -437,7 +437,7 @@
{
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env,
int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR,
- (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ (axis2_char_t*)axis2_endpoint_ref_get_address(
reply_to_epr, env));
}
@@ -494,7 +494,7 @@
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id, storage_mgr);
epr = AXIS2_MSG_CTX_GET_TO(first_app_msg, env);
if(epr)
- addr = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ addr = (axis2_char_t*)axis2_endpoint_ref_get_address(
epr, env);
if(!AXIS2_MSG_CTX_GET_SERVER_SIDE(first_app_msg, env) ||
!sandesha2_utils_is_anon_uri(env, addr))
Modified: webservices/sandesha/trunk/c/src/wsrm/address.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/address.c?view=diff&rev=515928&r1=515927&r2=515928
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/address.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/address.c Wed Mar 7 21:25:54 2007
@@ -206,9 +206,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
address_impl = SANDESHA2_INTF_TO_IMPL(address);
- if(!address_impl->epr || !AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ if(!address_impl->epr || !axis2_endpoint_ref_get_address(
address_impl->epr, env) || 0 == AXIS2_STRLEN(
- AXIS2_ENDPOINT_REF_GET_ADDRESS(address_impl->epr, env)))
+ axis2_endpoint_ref_get_address(address_impl->epr, env)))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
AXIS2_FAILURE);
@@ -227,7 +227,7 @@
return NULL;
}
AXIOM_ELEMENT_SET_TEXT(addr_element, env,
- AXIS2_ENDPOINT_REF_GET_ADDRESS(address_impl->epr, env),
+ axis2_endpoint_ref_get_address(address_impl->epr, env),
addr_node);
AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, addr_node);
return (axiom_node_t*)om_node;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
