You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/03/05 12:46:51 UTC
svn commit: r514651 - in /webservices/sandesha/trunk/c/src:
handlers/sandesha2_global_in_handler.c handlers/sandesha2_in_handler.c
handlers/sandesha2_out_handler.c util/terminate_mgr.c
Author: damitha
Date: Mon Mar 5 03:46:42 2007
New Revision: 514651
URL: http://svn.apache.org/viewvc?view=rev&rev=514651
Log:
Some code cleaning
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=514651&r1=514650&r2=514651
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon Mar 5 03:46:42 2007
@@ -147,7 +147,7 @@
axis2_ctx_t *conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
axis2_property_t *property = axis2_property_create_with_args(env, 0, 0,
0, NULL);
- AXIS2_CTX_SET_PROPERTY(conf_ctx_base, env, SANDESHA2_IS_SVR_SIDE,
+ axis2_ctx_set_property(conf_ctx_base, env, SANDESHA2_IS_SVR_SIDE,
property, AXIS2_FALSE);
}
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
@@ -159,7 +159,7 @@
"is NULL");
return AXIS2_FAILURE;
}
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
+ property = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
AXIS2_FALSE);
if(property)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -177,7 +177,7 @@
"storage manager");
return AXIS2_FAILURE;
}
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ property = axis2_ctx_get_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
AXIS2_FALSE);
if(property)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
@@ -194,7 +194,7 @@
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
fault_part = AXIOM_SOAP_BODY_GET_FAULT(AXIOM_SOAP_ENVELOPE_GET_BODY(
@@ -208,7 +208,7 @@
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -251,7 +251,7 @@
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -268,7 +268,7 @@
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=514651&r1=514650&r2=514651
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Mon Mar 5 03:46:42 2007
@@ -109,7 +109,7 @@
return AXIS2_FAILURE;
}
ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ temp_prop = axis2_ctx_get_property(ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
@@ -120,7 +120,7 @@
"processing done");
return AXIS2_SUCCESS;
}
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
+ temp_prop = axis2_ctx_get_property(ctx, env, SANDESHA2_REINJECTED_MESSAGE,
AXIS2_FALSE);
if(temp_prop)
reinjected_msg = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop,
@@ -135,7 +135,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
temp_prop = NULL;
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ temp_prop = axis2_ctx_get_property(ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
@@ -150,7 +150,7 @@
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
prop = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
@@ -162,7 +162,7 @@
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
}
@@ -184,7 +184,7 @@
sandesha2_transaction_rollback(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -195,7 +195,7 @@
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -237,7 +237,7 @@
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_ctx_set_property(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_in_handler::invoke");
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=514651&r1=514650&r2=514651
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Mon Mar 5 03:46:42 2007
@@ -105,7 +105,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
+ svc = axis2_msg_ctx_get_svc(msg_ctx, env);
if(!svc)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Axis2 Service is NULL");
@@ -123,7 +123,7 @@
axis2_ctx_t *conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
axis2_property_t *property = axis2_property_create_with_args(env, 0, 0,
0, NULL);
- AXIS2_CTX_SET_PROPERTY(conf_ctx_base, env, SANDESHA2_IS_SVR_SIDE,
+ axis2_ctx_set_property(conf_ctx_base, env, SANDESHA2_IS_SVR_SIDE,
property, AXIS2_FALSE);
}
else
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=514651&r1=514650&r2=514651
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Mon Mar 5 03:46:42 2007
@@ -327,7 +327,6 @@
seq_prop_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
/*sandesha2_terminate_mgr_do_updates_if_needed(env, out_seq_id,
seq_prop_bean, seq_prop_mgr);*/
- /* test comment */
if(sandesha2_terminate_mgr_is_property_deletable(env,
sandesha2_seq_property_bean_get_name(seq_prop_bean, env)))
{
@@ -588,7 +587,6 @@
seq_prop_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
sandesha2_terminate_mgr_do_updates_if_needed(env, out_seq_id,
seq_prop_bean, seq_prop_mgr);
- /* test comment */
if(sandesha2_terminate_mgr_is_property_deletable(env,
sandesha2_seq_property_bean_get_name(seq_prop_bean, env)))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org