You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2007/02/22 06:38:26 UTC
svn commit: r510404 - in /webservices/sandesha/trunk/c: config/module.xml
samples/rm_echo_1_0/rm_echo.c src/msgprocessors/app_msg_processor.c
src/storage/permanent/permanent_storage_mgr.c src/util/msg_retrans_adjuster.c
Author: damitha
Date: Wed Feb 21 21:38:22 2007
New Revision: 510404
URL: http://svn.apache.org/viewvc?view=rev&rev=510404
Log:
Now rm_echo_single_1_0 and rm_ping_1_0 is working (SANDESHA2C-23)
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
Modified: webservices/sandesha/trunk/c/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?view=diff&rev=510404&r1=510403&r2=510404
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Wed Feb 21 21:38:22 2007
@@ -68,7 +68,7 @@
</operation>
<!-- Database connection parameters -->
- <parameter name="sandesha2_db" locked="false">/tmp</parameter>
+ <parameter name="sandesha2_db" locked="false">/axis2c/deploy</parameter>
<!-- General parameters -->
<parameter name="ExponentialBackoff" locked="false">AXIS2_TRUE</parameter>
<parameter name="RetransmissionInterval" locked="false">20000</parameter>
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c?view=diff&rev=510404&r1=510403&r2=510404
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c Wed Feb 21 21:38:22 2007
@@ -195,7 +195,6 @@
sandesha2_client_send_non_blocking(env, svc_client, options, NULL, callback3,
payload, listener_manager);
wait_on_callback(env, callback3);
- printf("came echo\n");
AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
if (svc_client)
{
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=510404&r1=510403&r2=510404
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Feb 21 21:38:22 2007
@@ -209,6 +209,13 @@
const axis2_char_t *reply_to_addr = NULL;
const axis2_char_t *to_addr = NULL;
axis2_char_t *rm_version = NULL;
+ sandesha2_seq_property_bean_t *acks_to_bean = NULL;
+ sandesha2_seq_property_bean_t *to_bean = NULL;
+ axis2_char_t *acks_to_str = NULL;
+ axis2_endpoint_ref_t *acks_to = NULL;
+ axis2_bool_t back_channel_free = AXIS2_FALSE;
+ axis2_op_t *op = NULL;
+ int mep = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -490,20 +497,7 @@
if(to_epr)
to_addr = axis2_endpoint_ref_get_address(to_epr, env);
-
-
-
-
-
-
-
- sandesha2_seq_property_bean_t *acks_to_bean = NULL;
- sandesha2_seq_property_bean_t *to_bean = NULL;
- axis2_char_t *acks_to_str = NULL;
- axis2_endpoint_ref_t *acks_to = NULL;
- axis2_bool_t back_channel_free = AXIS2_FALSE;
- axis2_op_t *op = axis2_op_ctx_get_op(op_ctx, env);
- int mep = -1;
+ op = axis2_op_ctx_get_op(op_ctx, env);
acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
if(acks_to_bean)
@@ -518,51 +512,25 @@
mep = AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op, env);
back_channel_free = (reply_to_addr && !sandesha2_utils_is_anon_uri(env,
reply_to_addr)) || AXIS2_MEP_CONSTANT_IN_ONLY == mep;
- printf("came10\n");
if(!reply_to_epr)
{
- printf("came11\n");
to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR);
if(to_bean)
reply_to_addr = sandesha2_seq_property_bean_get_value(to_bean, env);
}
- printf("reply_to_addr:%s\n", reply_to_addr);
-
- if(sandesha2_utils_is_single_channel(env, rm_version, reply_to_addr))
- {
- printf("came13\n");
- /* Do nothing */
- }
- else
- if(sandesha2_utils_is_single_channel(env, rm_version, to_addr))
- {
- sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
- storage_mgr);
- }
- else
- {
- sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
- storage_mgr);
- }
-
-
-
-
-
-
- /*if(back_channel_free)
+ if(back_channel_free)
sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
storage_mgr);
else if(sandesha2_utils_is_single_channel(env, rm_version, acks_to_str))
{
- // Do nothing
+ /* Do nothing */
}
else
{
sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
storage_mgr);
- }*/
+ }
/* test code */
if(axis2_msg_ctx_get_server_side(msg_ctx, env))
{
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=510404&r1=510403&r2=510404
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Wed Feb 21 21:38:22 2007
@@ -997,19 +997,19 @@
persistent_prop_str);
axis2_hash_index_t *index = NULL;
if(map)
- for (index = axis2_hash_first(map, env); index; index =
- axis2_hash_next(env, index))
- {
- axis2_property_t *property = NULL;
- void *v = NULL;
- const void *k = NULL;
- axis2_char_t *key = NULL;
- axis2_hash_this(index, &k, NULL, &v);
- key = (axis2_char_t *) k;
- property = (axis2_property_t *) v;
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, key, property,
- AXIS2_FALSE);
- }
+ for (index = axis2_hash_first(map, env); index; index =
+ axis2_hash_next(env, index))
+ {
+ axis2_property_t *property = NULL;
+ void *v = NULL;
+ const void *k = NULL;
+ axis2_char_t *key = NULL;
+ axis2_hash_this(index, &k, NULL, &v);
+ key = (axis2_char_t *) k;
+ property = (axis2_property_t *) v;
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, key, property,
+ AXIS2_FALSE);
+ }
}
return msg_ctx;
}
@@ -1034,15 +1034,6 @@
prop_str = axis2_strcat(env, SANDESHA2_QUALIFIED_FOR_SENDING,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
}
- /*else
- {
- 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,
- SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, SANDESHA2_VALUE_FALSE, NULL);
- }*/
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_WSA_VERSION, AXIS2_FALSE);
if(property)
Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?view=diff&rev=510404&r1=510403&r2=510404
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Wed Feb 21 21:38:22 2007
@@ -109,7 +109,6 @@
if(timeout_seq)
{
- printf("came40\n");
sandesha2_sender_bean_set_send(retrans_bean, env, AXIS2_FALSE);
sandesha2_msg_retrans_adjuster_finalize_timedout_seq(env, int_seq_id,
seq_id, msg_ctx, storage_mgr);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org