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/01/17 13:51:37 UTC
svn commit: r497010 [1/2] - in /webservices/sandesha/trunk/c:
samples/rm_1_1_echo/ samples/rm_echo/ samples/rm_ping/ src/client/
src/handlers/ src/msgprocessors/ src/polling/ src/storage/permanent/
src/transport/ src/util/ src/workers/
Author: damitha
Date: Wed Jan 17 04:51:35 2007
New Revision: 497010
URL: http://svn.apache.org/viewvc?view=rev&rev=497010
Log:
It is now working with the latest axis2c svn. Also one way module is
working with apache2 except a problem in terminate manager.
Modified:
webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c
webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
webservices/sandesha/trunk/c/samples/rm_ping/rm_ping_client.c
webservices/sandesha/trunk/c/src/client/client.c
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/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/close_seq_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/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_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/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_1_1_echo/rm_echo_client.c Wed Jan 17 04:51:35 2007
@@ -185,14 +185,14 @@
}
}
/* RM Version 1.1 */
- property = axis2_property_create_with_args(env, 3, 0,
+ property = axis2_property_create_with_args(env, 3, 0, 0,
SANDESHA2_SPEC_VERSION_1_1);
if(property)
{
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
- property = axis2_property_create_with_args(env, 3, 0, "sequence1");
+ property = axis2_property_create_with_args(env, 3, 0, 0, "sequence1");
if(property)
{
AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY,
Modified: webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo/rm_echo_client.c Wed Jan 17 04:51:35 2007
@@ -128,8 +128,7 @@
AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
if(target_epr)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, target_epr);
+ property = axis2_property_create_with_args(env, 0, 0, 0, target_epr);
AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_TARGET_EPR, property);
}
AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);
@@ -182,33 +181,31 @@
if(offer)
{
offered_seq_id = axis2_uuid_gen(env);
- property = axis2_property_create(env);
+ property = axis2_property_create_with_args(env, 0, 0, 0, offered_seq_id);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(offered_seq_id, env));
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_OFFERED_SEQ_ID,
- property);
+ AXIS2_OPTIONS_SET_PROPERTY(options, env,
+ SANDESHA2_CLIENT_OFFERED_SEQ_ID, property);
}
}
/* RM Version 1.1 */
if(version == 1)
{
- property = axis2_property_create(env);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_SPEC_VERSION_1_1);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_SPEC_VERSION_1_1, env));
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
- property = axis2_property_create_with_args(env, 3, 0, "sequence1");
+ property = axis2_property_create_with_args(env, 3, 0, 0, "sequence1");
if(property)
{
AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY,
property);
}
}
- payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
+ /*payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
callback = axis2_callback_create(env);
AXIS2_CALLBACK_SET_ON_COMPLETE(callback, rm_echo_callback_on_complete);
AXIS2_CALLBACK_SET_ON_ERROR(callback, rm_echo_callback_on_error);
@@ -223,7 +220,7 @@
AXIS2_CALLBACK_SET_ON_ERROR(callback2, rm_echo_callback_on_error);
sandesha2_client_send_non_blocking(env, svc_client, options, NULL, callback2, payload,
listener_manager);
- wait_on_callback(env, callback2);
+ wait_on_callback(env, callback2);*/
callback3 = axis2_callback_create(env);
AXIS2_CALLBACK_SET_ON_COMPLETE(callback3, rm_echo_callback_on_complete);
@@ -231,9 +228,7 @@
payload = build_om_payload_for_echo_svc(env, "echo3", "sequence1");
if(version == 0)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage",
property);
}
Modified: webservices/sandesha/trunk/c/samples/rm_ping/rm_ping_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping/rm_ping_client.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping/rm_ping_client.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping/rm_ping_client.c Wed Jan 17 04:51:35 2007
@@ -96,8 +96,7 @@
AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
if(target_epr)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, target_epr);
+ property = axis2_property_create_with_args(env, 0, 0, 0, target_epr);
AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_TARGET_EPR, property);
}
/*AXIS2_OPTIONS_SET_ACTION(options, env, "urn:wsrm:Ping");*/
@@ -135,11 +134,10 @@
/* RM Version 1.1 */
if(version == 1)
{
- property = axis2_property_create(env);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_SPEC_VERSION_1_1);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_SPEC_VERSION_1_1, env));
AXIS2_OPTIONS_SET_PROPERTY(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
@@ -157,8 +155,7 @@
printf("\nping client invoke SUCCESSFUL!\n");
payload = NULL;
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage",
property);
payload = build_om_programatically(env, "ping3");
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Jan 17 04:51:35 2007
@@ -674,7 +674,7 @@
rm_namespc_value, NULL);
terminate_body_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element,
env, qname, node, &terminate_body_node);
- old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = AXIS2_STRDUP(AXIS2_OPTIONS_GET_ACTION(options, env), env);
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
if(action)
@@ -690,6 +690,7 @@
}
if(old_action)
AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ AXIS2_FREE(env->allocator, old_action);
return AXIS2_SUCCESS;
}
@@ -1679,7 +1680,6 @@
sandesha2_transaction_commit(transaction, env);
if(!seq_id_bean)
{
- printf("came52\n");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_ID_BEAN_NOT_SET,
AXIS2_FAILURE);
return NULL;
@@ -1687,7 +1687,6 @@
seq_id = sandesha2_seq_property_bean_get_value(seq_id_bean, env);
if(!seq_id)
{
- printf("came53\n");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID,
AXIS2_FAILURE);
return NULL;
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed Jan 17 04:51:35 2007
@@ -119,27 +119,6 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Starting sandesha2 global in handler ......");
- /*axis2_char_t *error_msg = NULL;
- axis2_char_t *insert_sql = "insert into seq_property(id, seq_id, name, value) values('5643d0cc-974f-1db1-210b-001125b4c0fc:ReplyToEPR','5643d0cc-974f-1db1-210b-001125b4c0fc','ReplyToEPR','http://127.0.0.1:5555/axis2/services/RMSampleService');";
- sqlite3 *db = NULL;
- int rc = sqlite3_open("/usr/local/apache2/htdocs/sandesha2", &db);
- if(rc != SQLITE_OK)
- {
- AXIS2_LOG_INFO(env->log, "cannot open database");
- }
- rc = sqlite3_exec(db, "select * from seq_property;", 0, 0, &error_msg);
- if(rc != SQLITE_OK)
- {
- AXIS2_LOG_INFO(env->log, "my error_msg1:%s", error_msg);
- }
- rc = sqlite3_exec(db, insert_sql, 0, 0, &error_msg);
- if(rc != SQLITE_OK)
- {
- AXIS2_LOG_INFO(env->log, "my error_msg2:%s", error_msg);
- }
- else
- AXIS2_LOG_INFO(env->log, "sql_stmt OK");
- sqlite3_close(db);*/
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(!conf_ctx)
{
@@ -169,7 +148,9 @@
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
+ axis2_allocator_switch_to_global_pool(env->allocator);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
+ axis2_allocator_switch_to_local_pool(env->allocator);
if(!storage_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot get the "
@@ -190,9 +171,11 @@
{
axis2_property_t *prop = NULL;
+ axis2_allocator_switch_to_global_pool(env->allocator);
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- SANDESHA2_VALUE_TRUE);
+ axis2_allocator_switch_to_local_pool(env->allocator);
+ 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_FALSE);
}
@@ -205,8 +188,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ 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_FALSE);
rolled_back = AXIS2_TRUE;
@@ -224,7 +207,7 @@
{
axis2_msg_ctx_t *req_msg_ctx = NULL;
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE);
+ AXIS2_WSDL_MESSAGE_LABEL_OUT);
if(req_msg_ctx)
{
if(sandesha2_utils_is_retrievable_on_faults(env,
@@ -245,8 +228,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ 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_FALSE);
rolled_back = AXIS2_TRUE;
@@ -264,8 +247,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ 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_FALSE);
rolled_back = AXIS2_TRUE;
@@ -281,8 +264,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- 0, SANDESHA2_VALUE_FALSE);
+ 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_FALSE);
}
@@ -336,9 +319,9 @@
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
- rcvd_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, seq_id,
- SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
+ if(seq_prop_mgr)
+ rcvd_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
+ env, seq_id, SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
if(rcvd_msgs_bean)
{
axis2_char_t *rcvd_msgs_str = NULL;
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Jan 17 04:51:35 2007
@@ -150,8 +150,7 @@
{
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- SANDESHA2_VALUE_TRUE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
AXIS2_FALSE);
}
@@ -162,8 +161,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -184,8 +183,8 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
@@ -195,8 +194,8 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
@@ -237,8 +236,8 @@
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- 0, SANDESHA2_VALUE_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Jan 17 04:51:35 2007
@@ -79,7 +79,6 @@
axis2_property_t *temp_prop = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- axis2_ctx_t *ctx = NULL;
axis2_char_t *str_done = NULL;
axis2_char_t *dummy_msg_str = NULL;
axis2_char_t *within_transaction_str = NULL;
@@ -111,8 +110,7 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
str_done = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
@@ -123,15 +121,12 @@
Processing Done");
return AXIS2_SUCCESS;
}
- temp_prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(temp_prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(temp_prop, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
+ temp_prop = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
temp_prop, AXIS2_FALSE);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(temp_prop)
within_transaction_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
@@ -145,15 +140,14 @@
{
axis2_property_t *prop = NULL;
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_TRUE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
- AXIS2_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, prop,
+ AXIS2_FALSE);
}
/* Getting rm message */
rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
+ temp_prop = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
AXIS2_FALSE);
if(NULL != temp_prop)
dummy_msg_str = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(temp_prop, env);
@@ -169,7 +163,7 @@
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg_ctx) /* For the server side */
{
sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
@@ -209,11 +203,10 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_rollback(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
rolled_back = AXIS2_TRUE;
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Error in processing the message");
@@ -225,17 +218,16 @@
{
axis2_property_t *prop = NULL;
sandesha2_transaction_commit(transaction, env);
- prop = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(prop, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(prop, env, SANDESHA2_VALUE_FALSE);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
- prop, AXIS2_FALSE);
+ prop = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ prop, AXIS2_FALSE);
}
- temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ temp_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
- AXIS2_PROPERTY_SET_VALUE(temp_prop, env, AXIS2_STRDUP(
+ axis2_property_set_value(temp_prop, env, AXIS2_STRDUP(
SANDESHA2_VALUE_FALSE, env));
AXIS2_LOG_INFO(env->log, "[sandesha2] Exit: sandesha2_out_handler::invoke");
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -227,12 +227,10 @@
fault_msg_ctx, env));
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
}
+ if(int_seq_id)
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
- storage_mgr);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ storage_mgr);
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_PROCSSED, property,
AXIS2_FALSE);
@@ -313,9 +311,9 @@
no_of_msgs_acked_bean);
}
completed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, int_seq_id,
+ env, out_seq_id,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
- if(!completed_bean)
+ if(!completed_bean && int_seq_id)
{
completed_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_seq_id(completed_bean, env, int_seq_id);
@@ -325,8 +323,11 @@
}
str_list = sandesha2_utils_array_list_to_string(env, acked_list,
SANDESHA2_ARRAY_LIST_LONG);
- sandesha2_seq_property_bean_set_value(completed_bean, env, str_list);
- sandesha2_seq_property_mgr_update(seq_prop_mgr, env, completed_bean);
+ if(completed_bean)
+ {
+ sandesha2_seq_property_bean_set_value(completed_bean, env, str_list);
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env, completed_bean);
+ }
last_out_msg_no_str = sandesha2_utils_get_seq_property(env, int_seq_id,
SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, storage_mgr);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -215,10 +215,7 @@
}
ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, rm_msg_ctx,
ack_op);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property,
AXIS2_FALSE);
@@ -242,11 +239,9 @@
if(property)
wsa_version = AXIS2_PROPERTY_GET_VALUE(property, env);
- property = axis2_property_create(env);
+ property = axis2_property_create_with_args(env, 0, 0, 0, wsa_version);
if(property)
{
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(wsa_version, env));
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
property = NULL;
@@ -275,16 +270,12 @@
}
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN,
property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ACK_WRITTEN,
property, AXIS2_FALSE);
@@ -324,10 +315,8 @@
sandesha2_sender_bean_set_msg_type(ack_bean, env,
SANDESHA2_MSG_TYPE_ACK);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_FALSE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
@@ -370,27 +359,19 @@
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, ack_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, ack_bean);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ack_msg_ctx, env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, transport_out);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- transport_out->ops->free_void_arg);
+ property = axis2_property_create_with_args(env, 0, 0,
+ transport_out->ops->free_void_arg, transport_out);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(key, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, key);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -235,12 +235,7 @@
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
if (ctx)
{
- axis2_char_t *value = NULL;
-
- value = AXIS2_STRDUP("FALSE", env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, value);
+ property = axis2_property_create_with_args(env, 0, 0, 0, "FALSE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN,
property, AXIS2_FALSE);
}
@@ -465,10 +460,8 @@
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
sandesha2_invoker_mgr_insert(storage_map_mgr, env, invoker_bean);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
/* To avoid performing application processing more than once. */
sandesha2_msg_ctx_set_property(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
@@ -531,7 +524,7 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ AXIS2_WSDL_MESSAGE_LABEL_IN);
/* TODO setting up fault callback */
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
@@ -712,9 +705,7 @@
value = sandesha2_seq_property_bean_get_value(incoming_to_bean, env);
incoming_to = AXIS2_STRDUP(value, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, incoming_to);
+ property = axis2_property_create_with_args(env, 0, 0, 0, incoming_to);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR,
property, AXIS2_FALSE);
}
@@ -856,10 +847,8 @@
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
if (ctx)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE",
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ "TRUE");
AXIS2_CTX_SET_PROPERTY(ctx, env,
AXIS2_RESPONSE_WRITTEN, property, AXIS2_FALSE);
}
@@ -1040,7 +1029,7 @@
create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg, env);
AXIS2_MSG_CTX_SET_RELATES_TO(create_seq_msg, env, NULL);
/* Set that the create sequence message is part of a transaction. */
- property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
+ property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
@@ -1076,32 +1065,23 @@
sandesha2_sender_bean_set_internal_seq_id(create_seq_entry, env,
internal_seq_id);
sandesha2_sender_bean_set_send(create_seq_entry, env, AXIS2_TRUE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(create_seq_entry, env,
SANDESHA2_MSG_TYPE_CREATE_SEQ);
sandesha2_sender_mgr_insert(retrans_mgr, env, create_seq_entry);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, str_key, create_seq_msg);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, str_key);
+ property = axis2_property_create_with_args(env, 0, 0, 0, str_key);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(create_seq_msg, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, orig_trans_out);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- orig_trans_out->ops->free_void_arg);
+ property = axis2_property_create_with_args(env, 0, 0,
+ orig_trans_out->ops->free_void_arg, orig_trans_out);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(create_seq_msg, env, SANDESHA2_SET_SEND_TO_TRUE,
property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(create_seq_msg, env, trans_out);
@@ -1185,7 +1165,7 @@
axis2_endpoint_ref_t *reply_to = NULL;
req_msg = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env),
- env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ env, AXIS2_WSDL_MESSAGE_LABEL_IN);
if(req_msg)
{
reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);
@@ -1296,10 +1276,8 @@
else
{
sandesha2_sender_bean_set_send(app_msg_entry, env, AXIS2_TRUE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
@@ -1307,10 +1285,7 @@
sandesha2_storage_mgr_store_msg_ctx(mgr, env, storage_key, app_msg_ctx);
sandesha2_sender_mgr_insert(retrans_mgr, env, app_msg_entry);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_FALSE, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
trs_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(
@@ -1319,18 +1294,13 @@
{
axis2_transport_out_desc_t *trans_out = NULL;
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, storage_key);
+ property = axis2_property_create_with_args(env, 0, 0, 0, storage_key);
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- trans_out->ops->free_void_arg);
- AXIS2_PROPERTY_SET_VALUE(property, env, trans_out);
+ property = axis2_property_create_with_args(env, 0, 0,
+ trans_out->ops->free_void_arg, trans_out);
AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(app_msg_ctx, env,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/close_seq_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -207,10 +207,8 @@
SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT,
(sandesha2_iom_rm_part_t*)seq_ack);
sandesha2_msg_ctx_set_flow(close_seq_res_rm_msg, env, AXIS2_OUT_FLOW);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
sandesha2_msg_ctx_set_property(close_seq_res_rm_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(close_seq_res_msg, env, AXIS2_TRUE);
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -210,10 +210,8 @@
rm_msg_ctx, out_msg_ctx, new_seq_id, storage_mgr);
AXIS2_MSG_CTX_SET_FLOW(out_msg_ctx, env, AXIS2_OUT_FLOW);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
/* For making sure that this won't be processed again */
sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
@@ -324,13 +322,11 @@
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
if(0 == AXIS2_STRCMP(anon_uri, AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr,
env)))
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
else
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("FALSE", env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, "FALSE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
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=497010&r1=497009&r2=497010
==============================================================================
--- 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 Jan 17 04:51:35 2007
@@ -450,9 +450,7 @@
}
sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id, storage_mgr);
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -298,9 +298,7 @@
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
if (ctx)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, "TRUE");
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN,
property, AXIS2_FALSE);
}
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -313,7 +313,7 @@
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(highest_in_msg, env);
if(op_ctx)
highest_out_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE);
+ AXIS2_WSDL_MESSAGE_LABEL_OUT);
if(highest_out_msg)
{
sandesha2_msg_ctx_t *highest_out_rm_msg = NULL;
@@ -396,9 +396,8 @@
sandesha2_msg_ctx_add_soap_envelope(out_rm_msg, env);
sandesha2_msg_ctx_set_flow(out_rm_msg, env, AXIS2_OUT_FLOW);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(out_msg_ctx, env, AXIS2_TRUE);
@@ -407,7 +406,7 @@
axis2_transport_out_desc_t *orig_trans_out = NULL;
axis2_transport_out_desc_t *trans_out = NULL;
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(out_msg_ctx, env);
- property = axis2_property_create_with_args(env, 3, 0, orig_trans_out);
+ property = axis2_property_create_with_args(env, 0, 0, 0, orig_trans_out);
AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
trans_out = sandesha2_utils_get_transport_out(env);
@@ -420,8 +419,7 @@
term_res_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(term_res_bean, env, key);
/*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
- property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- key);
+ property = axis2_property_create_with_args(env, 0, 0, 0, key);
AXIS2_MSG_CTX_SET_PROPERTY(out_msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, out_msg_ctx);
@@ -434,9 +432,8 @@
(axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(out_msg_ctx, env));
sandesha2_sender_bean_set_send(term_res_bean, env, AXIS2_TRUE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_sender_bean_set_resend(term_res_bean, env, AXIS2_FALSE);
@@ -455,13 +452,15 @@
to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
if(0 == AXIS2_STRCMP(anon_uri, AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)))
- AXIS2_PROPERTY_SET_VALUE(property, env, "TRUE");
+ {
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
+ }
else
- AXIS2_PROPERTY_SET_VALUE(property, env, "FALSE");
+ {
+ property = axis2_property_create_with_args(env, 0, 0, 0, "FALSE");
+ }
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
@@ -554,10 +553,7 @@
sandesha2_identifier_set_identifier(sandesha2_terminate_seq_get_identifier(
term_seq_part, env), env, out_seq_id);
sandesha2_msg_ctx_set_flow(rm_msg_ctx, env, AXIS2_OUT_FLOW);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property,
AXIS2_FALSE);
@@ -580,10 +576,7 @@
if(transport_to)
{
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(transport_to,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, transport_to);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
AXIS2_TRANSPORT_URL, property, AXIS2_FALSE);
}
@@ -603,9 +596,8 @@
(axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env));
sandesha2_sender_bean_set_send(term_bean, env, AXIS2_TRUE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_sender_bean_set_resend(term_bean, env, AXIS2_FALSE);
@@ -622,25 +614,18 @@
out_desc = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, out_desc);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- out_desc->ops->free_void_arg);
+ property = axis2_property_create_with_args(env, 0, 0,
+ out_desc->ops->free_void_arg, out_desc);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(key,env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, key);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
sandesha2_out_desc = sandesha2_utils_get_transport_out(env);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Wed Jan 17 04:51:35 2007
@@ -133,16 +133,6 @@
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
-
- if(seq_ack)
- {
- sandesha2_msg_processor_t *ack_processor = NULL;
- ack_processor = (sandesha2_msg_processor_t *)
- sandesha2_ack_msg_processor_create(env);
- sandesha2_msg_processor_process_in_msg(ack_processor, env, rm_msg_ctx);
- }
term_seq_res = (sandesha2_terminate_seq_res_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ_RESPONSE);
if(!term_seq_res)
@@ -164,8 +154,10 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = (sandesha2_storage_mgr_t *) sandesha2_utils_get_storage_mgr(
env, conf_ctx, AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
- seq_id, storage_mgr);
+ /*sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
+ seq_id, storage_mgr);*/
+ sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
+ AXIS2_FALSE, storage_mgr);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_terminate_seq_res_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Wed Jan 17 04:51:35 2007
@@ -159,7 +159,7 @@
polling_mgr->scheduled_polling_reqs = axis2_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
- if(!polling_mgr->conf_ctx || !polling_mgr->conf_ctx->ops)
+ if(!polling_mgr->conf_ctx)
{
axis2_thread_mutex_unlock(polling_mgr->mutex);
return AXIS2_FAILURE;
@@ -322,9 +322,7 @@
AXIS2_TRANSPORT_IN, NULL);
/* Storing the MakeConnection message */
make_conn_msg_store_key = axis2_uuid_gen(env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, seq_prop_key);
+ property = axis2_property_create_with_args(env, 0, 0, 0, seq_prop_key);
sandesha2_msg_ctx_set_property(make_conn_rm_msg_ctx, env,
SANDESHA2_MSG_CTX_PROP_SEQUENCE_PROPERTY_KEY, property);
make_conn_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(make_conn_rm_msg_ctx,
@@ -365,9 +363,8 @@
/* This message should not be sent untils it is qualified. i.e. Till
* it is sent through the sandesha2_transport_sender
*/
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, 0, 0, 0,
+ SANDESHA2_VALUE_FALSE);
sandesha2_msg_ctx_set_property(make_conn_rm_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property);
if(sender_bean_mgr)
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Wed Jan 17 04:51:35 2007
@@ -101,8 +101,11 @@
if(argv[i])
sandesha2_msg_store_bean_set_to_url(bean, env, argv[i]);
if(0 == AXIS2_STRCMP(col_name[i], "transport_to"))
- if(argv[i])
+ if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ {
+ printf("argv[i]:%s\n", argv[i]);
sandesha2_msg_store_bean_set_transport_to(bean, env, argv[i]);
+ }
if(0 == AXIS2_STRCMP(col_name[i], "execution_chain_str"))
if(argv[i])
sandesha2_msg_store_bean_set_execution_chain_str(bean, env, argv[i]);
@@ -234,9 +237,9 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
+ retrieve_bean = (sandesha2_rm_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
- retrieve_bean = (sandesha2_rm_bean_t *) args->data;
if(retrieve_bean)
{
rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
@@ -747,6 +750,8 @@
sandesha2_msg_store_bean_get_persistent_property_str(bean, env);
axis2_char_t *action = sandesha2_msg_store_bean_get_action(bean, env);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
sql_size = AXIS2_STRLEN(msg_id) + AXIS2_STRLEN(stored_key) +
AXIS2_STRLEN(soap_env_str) + sizeof(int) + AXIS2_STRLEN(transport_out) +
AXIS2_STRLEN(op) + AXIS2_STRLEN(svc) + AXIS2_STRLEN(svc_grp) +
@@ -785,9 +790,9 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
+ msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
- msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
if(msg_store_bean)
{
sql_stmt_update = AXIS2_MALLOC(env->allocator, sql_size);
@@ -848,6 +853,8 @@
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
return AXIS2_TRUE;
}
@@ -862,6 +869,8 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
@@ -886,6 +895,8 @@
return AXIS2_FALSE;
}
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
return AXIS2_TRUE;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c Wed Jan 17 04:51:35 2007
@@ -297,6 +297,8 @@
axis2_char_t sql_remove[256];
axis2_char_t sql_retrieve[256];
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_remove");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
@@ -306,6 +308,8 @@
sprintf(sql_retrieve, "select create_seq_msg_id, internal_seq_id,"\
"seq_id, create_seq_msg_store_key, ref_msg_store_key from create_seq "\
"where create_seq_msg_id='%s';", msg_id);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_remove");
return sandesha2_permanent_bean_mgr_remove(seq_mgr_impl->bean_mgr, env,
sandesha2_create_seq_retrieve_callback, sql_retrieve, sql_remove);
}
@@ -318,6 +322,8 @@
{
axis2_char_t sql_retrieve[256];
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_retrieve");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
@@ -325,6 +331,8 @@
sprintf(sql_retrieve, "select create_seq_msg_id, internal_seq_id,"\
"seq_id, create_seq_msg_store_key, ref_msg_store_key from create_seq "\
"where create_seq_msg_id='%s';", msg_id);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_retrieve");
return (sandesha2_create_seq_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
seq_mgr_impl->bean_mgr, env, sandesha2_create_seq_retrieve_callback,
sql_retrieve);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c Wed Jan 17 04:51:35 2007
@@ -312,7 +312,7 @@
const axis2_env_t *env,
sandesha2_invoker_bean_t *bean)
{
- axis2_char_t *ref_key = NULL;
+ /*axis2_char_t *ref_key = NULL;*/
axis2_char_t *sql_update = NULL;
axis2_char_t *sql_retrieve = NULL;
axis2_bool_t ret = AXIS2_FALSE;
@@ -321,7 +321,7 @@
axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
(sandesha2_rm_bean_t *) bean, env);
long msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
- axis2_char_t seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
+ axis2_char_t *seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
axis2_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
AXIS2_LOG_INFO(env->log,
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c Wed Jan 17 04:51:35 2007
@@ -260,6 +260,8 @@
axis2_char_t sql_update[1024];
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_insert");
axis2_char_t *seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean,
env);
axis2_char_t *ref_msg_key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
@@ -278,6 +280,8 @@
sprintf(sql_insert, "insert into next_msg(seq_id, ref_msg_key,"\
"polling_mode, msg_no) values('%s', '%s', %d, %ld);", seq_id,
ref_msg_key, polling_mode, msg_no);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_insert");
return sandesha2_permanent_bean_mgr_insert(next_msg_mgr_impl->bean_mgr, env,
(sandesha2_rm_bean_t *) bean, sandesha2_next_msg_retrieve_callback,
sql_retrieve, sql_update, sql_insert);
@@ -292,6 +296,8 @@
axis2_char_t sql_remove[256];
axis2_char_t sql_retrieve[256];
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_remove");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
@@ -299,6 +305,8 @@
seq_id);
sprintf(sql_retrieve, "select seq_id, ref_msg_key, polling_mode, msg_no"\
" from next_msg where seq_id='%s';", seq_id);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_remove");
return sandesha2_permanent_bean_mgr_remove(next_msg_mgr_impl->bean_mgr, env,
sandesha2_next_msg_retrieve_callback, sql_retrieve, sql_remove);
}
@@ -316,11 +324,15 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_retrieve");
sprintf(sql_retrieve, "select seq_id, ref_msg_key, polling_mode, msg_no"\
" from next_msg where seq_id='%s';", seq_id);
bean = (sandesha2_next_msg_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
next_msg_mgr_impl->bean_mgr, env, sandesha2_next_msg_retrieve_callback,
sql_retrieve);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_next_msg_mgr_retrieve");
return bean;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c Wed Jan 17 04:51:35 2007
@@ -348,6 +348,8 @@
axis2_char_t sql_retrieve[256];
axis2_char_t sql_remove[256];
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_sender_mgr_remove");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
@@ -356,6 +358,8 @@
"internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
"msg_type, seq_id, wsrm_anon_uri, to_address from sender "\
"where msg_id='%s'", msg_id);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_sender_mgr_remove");
return sandesha2_permanent_bean_mgr_remove(sender_mgr_impl->bean_mgr, env,
sandesha2_sender_retrieve_callback, sql_retrieve, sql_remove);
}
@@ -414,11 +418,11 @@
axis2_char_t *wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(bean, env);
axis2_char_t *to_address = sandesha2_sender_bean_get_to_address(bean, env);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
- AXIS2_LOG_INFO(env->log,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
sprintf(sql_retrieve, "select msg_id, msg_ctx_ref_key, "\
"internal_seq_id, sent_count, msg_no, send, resend, time_to_send, "\
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c Wed Jan 17 04:51:35 2007
@@ -302,6 +302,8 @@
axis2_char_t sql_retrieve[256];
axis2_status_t status = AXIS2_FAILURE;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_remove");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
@@ -315,6 +317,8 @@
status = sandesha2_permanent_bean_mgr_remove(seq_prop_mgr_impl->bean_mgr, env,
sandesha2_seq_property_retrieve_callback, sql_retrieve, sql_remove);
AXIS2_FREE(env->allocator, key);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_permanent_seq_property_mgr_remove");
return status;
}
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Wed Jan 17 04:51:35 2007
@@ -42,6 +42,7 @@
#include <axis2_msg_ctx.h>
#include <axis2_uuid_gen.h>
#include <axis2_conf_ctx.h>
+#include <axis2_svc_ctx.h>
#include <axis2_options.h>
#include <axis2_addr.h>
#include <axis2_http_transport.h>
@@ -691,9 +692,9 @@
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if(transport_out_desc)
{
- const axis2_qname_t *qname = AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(
+ axis2_qname_t *qname = (axis2_qname_t *) AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(
transport_out_desc, env);
- axis2_char_t *str_qname = AXIS2_QNAME_TO_STRING(qname, env);
+ axis2_char_t *str_qname = axis2_qname_to_string(qname, env);
sandesha2_msg_store_bean_set_transport_out(bean, env, str_qname);
}
if(svc_grp)
@@ -747,7 +748,7 @@
transport_to = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
sandesha2_msg_store_bean_set_transport_to(bean, env, transport_to);
}
- options = (axis2_options_t *) AXIS2_MSG_CTX_GET_OPTIONS(msg_ctx, env);
+ options = (axis2_options_t *) axis2_msg_ctx_get_options(msg_ctx, env);
action = (axis2_char_t *) AXIS2_OPTIONS_GET_ACTION(options, env);
sandesha2_msg_store_bean_set_action(bean, env, action);
prop_str = sandesha2_permanent_storage_mgr_get_property_string(env, msg_ctx);
@@ -760,7 +761,7 @@
{
axis2_msg_ctx_t *in_msg_ctx = NULL;
in_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
- AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ AXIS2_WSDL_MESSAGE_LABEL_IN);
if(in_msg_ctx)
{
axis2_char_t *in_msg_store_key = NULL;
@@ -822,10 +823,11 @@
sandesha2_msg_store_bean_t *msg_store_bean = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- msg_ctx = (axis2_msg_ctx_t *) axis2_hash_get(storage_mgr_impl->msg_ctx_map,
+ /*msg_ctx = (axis2_msg_ctx_t *) axis2_hash_get(storage_mgr_impl->msg_ctx_map,
key, AXIS2_HASH_KEY_STRING);
if(msg_ctx)
- return msg_ctx;
+ return msg_ctx;*/
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "retrieved from database");
msg_store_bean = sandesha2_permanent_bean_mgr_retrieve_msg_store_bean(
storage_mgr_impl->bean_mgr, env, key);
if (!msg_store_bean)
@@ -959,8 +961,8 @@
axis2_svc_ctx_t *svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
if(svc_ctx)
{
- AXIS2_SVC_CTX_SET_PARENT(svc_ctx, env, svc_grp_ctx);
- AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx);
+ axis2_svc_ctx_set_parent(svc_ctx, env, svc_grp_ctx);
+ axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
}
}
@@ -985,10 +987,12 @@
sandesha2_msg_store_bean_get_flow(msg_store_bean, env));
transport_to_str = sandesha2_msg_store_bean_get_transport_to(msg_store_bean,
env);
- property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- transport_to_str);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL, property,
+ if(transport_to_str)
+ {
+ property = axis2_property_create_with_args(env, 0, 0, 0, transport_to_str);
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_URL, property,
AXIS2_FALSE);
+ }
to_url_str = sandesha2_msg_store_bean_get_to_url(msg_store_bean, env);
if(to_url_str)
{
@@ -1059,8 +1063,8 @@
}
else
{
- property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- 0, SANDESHA2_VALUE_FALSE);
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
@@ -1146,8 +1150,8 @@
{
axis2_char_t *key = AXIS2_ARRAY_LIST_GET(values, env, i);
axis2_char_t *value = AXIS2_ARRAY_LIST_GET(values, env, i+1);
- axis2_property_t *property = axis2_property_create_with_args(env,
- AXIS2_SCOPE_APPLICATION, 0, value);
+ axis2_property_t *property = axis2_property_create_with_args(env, 0,
+ 0, 0, value);
axis2_hash_set(map, key, AXIS2_HASH_KEY_STRING, property);
}
return map;
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Wed Jan 17 04:51:35 2007
@@ -118,6 +118,7 @@
env, conf);
path = sandesha2_property_bean_get_db_path(prop_bean, env);
db_name = axis2_strcat(env, path, AXIS2_PATH_SEP_STR, "sandesha2", NULL);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "db_name %s", db_name);
rc = sqlite3_open(db_name, &(trans_impl->dbconn));
if(rc != SQLITE_OK)
{
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Wed Jan 17 04:51:35 2007
@@ -182,9 +182,7 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
+ property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
property, AXIS2_FALSE);
sandesha2_storage_mgr_update_msg_ctx(storage_man, env, key, msg_ctx);
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Jan 17 04:51:35 2007
@@ -67,9 +67,10 @@
env);
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
- acks_to = axis2_endpoint_ref_create(env,
- sandesha2_seq_property_bean_get_value(acks_to_bean,
- env));
+ if(acks_to_bean)
+ acks_to = axis2_endpoint_ref_create(env,
+ 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);
if(!acks_to_str)
@@ -98,21 +99,19 @@
}
ack_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env, ref_rm_msg,
ack_op);
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION,
+ /*property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION,
AXIS2_FALSE);
if(property)
{
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
property = NULL;
- }
+ }*/
- property = axis2_property_create(env);
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
if(property)
{
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE,
- env));
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property,
AXIS2_FALSE);
@@ -140,13 +139,11 @@
AXIS2_FALSE);
if(property)
{
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(addr_ns_uri,
- env));
+ AXIS2_PROPERTY_SET_VALUE(property, env, addr_ns_uri);
}
else
{
- property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- AXIS2_STRDUP(addr_ns_uri, env));
+ property = axis2_property_create_with_args(env, 0, 0, 0, addr_ns_uri);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env, AXIS2_WSA_VERSION, property,
AXIS2_FALSE);
}
@@ -167,16 +164,13 @@
AXIS2_MSG_CTX_SET_OP_CTX(ref_msg, env, op_ctx);
}
ref_ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP("TRUE", env));
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, "TRUE");
AXIS2_CTX_SET_PROPERTY(ref_ctx, env, AXIS2_RESPONSE_WRITTEN,
property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ref_msg, env, SANDESHA2_ACK_WRITTEN, property,
AXIS2_FALSE);
/*AXIS2_CTX_SET_PROPERTY(ref_ctx, env, SANDESHA2_ACK_WRITTEN, property,
@@ -210,10 +204,8 @@
sandesha2_sender_bean_set_seq_id(ack_bean, env, seq_id);
sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_FALSE, env));
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, SANDESHA2_VALUE_FALSE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
sandesha2_sender_bean_set_msg_type(ack_bean, env,
@@ -252,26 +244,19 @@
orig_trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(ack_msg_ctx,
env);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, orig_trans_out);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
- orig_trans_out->ops->free_void_arg);
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
+ AXIS2_FALSE, orig_trans_out->ops->free_void_arg, orig_trans_out);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- SANDESHA2_VALUE_TRUE, env));
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
- property = axis2_property_create(env);
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
- key, env));
+ property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
+ AXIS2_FALSE, 0, key);
AXIS2_MSG_CTX_SET_PROPERTY(ack_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
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=497010&r1=497009&r2=497010
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Jan 17 04:51:35 2007
@@ -378,8 +378,7 @@
}
else
{
- prop = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0,
- addressing_ns_value);
+ prop = axis2_property_create_with_args(env, 0, 0, 0, addressing_ns_value);
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, prop, AXIS2_FALSE);
}
new_msg_id = axis2_uuid_gen(env);
@@ -564,7 +563,7 @@
if(!is_seq_res_reqd)
{
- AXIS2_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
+ AXIS2_MSG_CTX_SET_PROPERTY(terminate_seq_msg_ctx, env, AXIS2_TRANSPORT_IN,
NULL, AXIS2_FALSE);
}
terminate_rm_msg = sandesha2_msg_init_init_msg(env, terminate_seq_msg_ctx);
@@ -704,7 +703,7 @@
temp_name = AXIS2_PARAM_GET_NAME(next_param, env);
temp_value = AXIS2_PARAM_GET_VALUE(next_param, env);
new_param = axis2_param_create(env, temp_name, temp_value);
- new_param->ops->value_free = next_param->ops->value_free;
+ /*new_param->ops->value_free = next_param->ops->value_free;*/
AXIS2_OP_ADD_PARAM(new_op, env, new_param);
}
}
@@ -746,7 +745,7 @@
}
}
/* Message Context properties */
- if(related_msg && new_msg)
+ /*if(related_msg && new_msg)
{
axis2_hash_t *old_msg_ctx_props = NULL;
axis2_ctx_t *ctx = NULL;
@@ -777,33 +776,40 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, key, new_prop, AXIS2_FALSE);
}
}
- }
+ }*/
/* Setting options with properties copied from the old one */
- related_ctx = AXIS2_MSG_CTX_GET_BASE(related_msg, env);
- related_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(related_ctx, env);
- new_ctx = AXIS2_MSG_CTX_GET_BASE(new_msg, env);
- new_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(new_ctx, env);
- if(!new_msg_props)
- {
- new_msg_props = axis2_hash_make(env);
- }
- if(related_msg_props)
+ if(related_msg && new_msg)
{
- axis2_hash_index_t *i = NULL;
-
- for (i = axis2_hash_first (related_msg_props, env); i; i =
- axis2_hash_next (env, i))
+ related_ctx = AXIS2_MSG_CTX_GET_BASE(related_msg, env);
+ related_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(related_ctx, env);
+ new_ctx = AXIS2_MSG_CTX_GET_BASE(new_msg, env);
+ new_msg_props = AXIS2_CTX_GET_ALL_PROPERTIES(new_ctx, env);
+ /*if(!new_msg_props)
{
- void *v = NULL;
- void *k = NULL;
- axis2_char_t *key = NULL;
- axis2_property_t *prop = NULL;
-
- axis2_hash_this (i, (const void **)&k, NULL, &v);
- key = (axis2_char_t *) k;
- prop = (axis2_property_t *) v;
- axis2_hash_set(new_msg_props, key, AXIS2_HASH_KEY_STRING, prop);
+ new_msg_props = axis2_hash_make(env);
+ }*/
+ if(related_msg_props)
+ {
+ axis2_hash_index_t *i = NULL;
+
+ for (i = axis2_hash_first (related_msg_props, env); i; i =
+ axis2_hash_next (env, i))
+ {
+ void *v = NULL;
+ void *k = NULL;
+ axis2_char_t *key = NULL;
+ axis2_property_t *prop = NULL;
+ axis2_property_t *new_prop = NULL;
+
+ axis2_hash_this (i, (const void **)&k, NULL, &v);
+ key = (axis2_char_t *) k;
+ prop = (axis2_property_t *) v;
+ if(prop)
+ new_prop = AXIS2_PROPERTY_CLONE(prop, env);
+ if(new_prop)
+ axis2_hash_set(new_msg_props, key, AXIS2_HASH_KEY_STRING, new_prop);
+ }
}
}
return AXIS2_SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org