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 2006/09/12 10:33:43 UTC
svn commit: r442523 - in /webservices/sandesha/trunk/c: include/
samples/client/rm_echo_blocking/ samples/client/rm_mtom/
samples/client/rm_ping/ src/core/ src/handlers/ src/msgprocessors/
src/storage/inmemory/ src/util/
Author: damitha
Date: Tue Sep 12 01:33:42 2006
New Revision: 442523
URL: http://svn.apache.org/viewvc?view=rev&rev=442523
Log:
More bug fixes
Modified:
webservices/sandesha/trunk/c/include/sandesha2_utils.h
webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c
webservices/sandesha/trunk/c/samples/client/rm_mtom/mtom_client.c
webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.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/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_utils.h?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_utils.h Tue Sep 12 01:33:42 2006
@@ -50,78 +50,95 @@
AXIS2_EXTERN long AXIS2_CALL
sandesha2_utils_get_current_time_in_millis(
- const axis2_env_t *env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_utils_remove_soap_body_part(const axis2_env_t *env,
- axiom_soap_envelope_t *envelope, axis2_qname_t *qname);
+sandesha2_utils_remove_soap_body_part(
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope,
+ axis2_qname_t *qname);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_rm_version(const axis2_env_t *env,
- axis2_char_t *key,
- sandesha2_storage_mgr_t *storage_man);
+sandesha2_utils_get_rm_version(
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
-sandesha2_utils_get_storage_mgr(const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_conf_t *conf);
+sandesha2_utils_get_storage_mgr(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_conf_t *conf);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_seq_property(const axis2_env_t *env,
- axis2_char_t *id,
- axis2_char_t *name,
- sandesha2_storage_mgr_t *storage_man);
+sandesha2_utils_get_seq_property(
+ const axis2_env_t *env,
+ axis2_char_t *id,
+ axis2_char_t *name,
+ sandesha2_storage_mgr_t *storage_man);
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_utils_get_property_bean(const axis2_env_t *env,
- axis2_conf_t *conf);
+sandesha2_utils_get_property_bean(
+ const axis2_env_t *env,
+ axis2_conf_t *conf);
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_utils_get_property_bean_from_op(const axis2_env_t *env,
- axis2_op_t *op);
+sandesha2_utils_get_property_bean_from_op(
+ const axis2_env_t *env,
+ axis2_op_t *op);
AXIS2_EXTERN axis2_array_list_t* AXIS2_CALL
-sandesha2_utils_get_array_list_from_string(const axis2_env_t *env,
- axis2_char_t *string);
+sandesha2_utils_get_array_list_from_string(
+ const axis2_env_t *env,
+ axis2_char_t *string);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_utils_array_list_contains(const axis2_env_t *env,
- axis2_array_list_t *list,
- axis2_char_t *string);
+sandesha2_utils_array_list_contains(
+ const axis2_env_t *env,
+ axis2_array_list_t *list,
+ axis2_char_t *string);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_array_list_to_string(const axis2_env_t *env,
- axis2_array_list_t *list,
- int type);
+sandesha2_utils_array_list_to_string(
+ const axis2_env_t *env,
+ axis2_array_list_t *list,
+ int type);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_utils_start_invoker_for_seq(const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id);
+sandesha2_utils_start_invoker_for_seq(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_utils_start_sender_for_seq(const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id);
+sandesha2_utils_start_sender_for_seq(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_outgoing_internal_seq_id(const axis2_env_t *env,
- axis2_char_t *seq_id);
+sandesha2_utils_get_outgoing_internal_seq_id(
+ const axis2_env_t *env,
+ axis2_char_t *seq_id);
AXIS2_EXTERN axis2_transport_out_desc_t* AXIS2_CALL
-sandesha2_utils_get_transport_out(const axis2_env_t *env);
+sandesha2_utils_get_transport_out(
+ const axis2_env_t *env);
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
-sandesha2_utils_get_inmemory_storage_mgr(const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+sandesha2_utils_get_inmemory_storage_mgr(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
-sandesha2_utils_get_permanent_storage_mgr(const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+sandesha2_utils_get_permanent_storage_mgr(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_svr_side_incoming_seq_id(const axis2_env_t *env,
- axis2_char_t *incoming_seq_id);
+sandesha2_utils_get_svr_side_incoming_seq_id(
+ const axis2_env_t *env,
+ axis2_char_t *incoming_seq_id);
/**
* Caller must free the returned string.
@@ -132,45 +149,45 @@
*/
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_internal_seq_id(
- const axis2_env_t *env,
- axis2_char_t *to,
- axis2_char_t *seq_key);
+ const axis2_env_t *env,
+ axis2_char_t *to,
+ axis2_char_t *seq_key);
AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
sandesha2_utils_create_new_related_msg_ctx(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *ref_rm_msg,
- axis2_op_t *op);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ref_rm_msg,
+ axis2_op_t *op);
AXIS2_EXTERN int AXIS2_CALL
sandesha2_utils_get_soap_version(
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope);
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope);
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_trim_string(
- const axis2_env_t *env,
- axis2_char_t *orig_string);
+ const axis2_env_t *env,
+ axis2_char_t *orig_string);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_utils_is_retriable_on_faults(
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+sandesha2_utils_is_retrievable_on_faults(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_utils_is_rm_global_msg(
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
sandesha2_utils_get_seq_id_from_rm_msg_ctx(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
sandesha2_spec_specific_consts_get_ack_req_soap_action(
- const axis2_env_t *env,
- axis2_char_t *spec_version);
+ const axis2_env_t *env,
+ axis2_char_t *spec_version);
/**
* Used to convert a message number list (a comma seperated list of message
@@ -182,9 +199,9 @@
*/
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
sandesha2_utils_get_ack_range_list(
- const axis2_env_t *env,
- axis2_char_t *msg_no_str,
- axis2_char_t *rm_ns_value);
+ const axis2_env_t *env,
+ axis2_char_t *msg_no_str,
+ axis2_char_t *rm_ns_value);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_echo_blocking/rm_echo_blocking.c Tue Sep 12 01:33:42 2006
@@ -19,7 +19,7 @@
#include <axiom_soap.h>
#include <axis2_client.h>
-#define MAX_COUNT 3000000
+#define MAX_COUNT 10
/* to check whether the callback is completed */
int is_complete = 0;
@@ -65,19 +65,21 @@
/* Seperate listner needs addressing, hence addressing stuff in options */
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/echoString");
- reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+ reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/" \
+ "services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_VALUE_TRUE);
- /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
- * using the axis2.xml file.
- * In this sample client_home points to the Axis2/C default deploy folder. The client_home can
- * be different from this folder on your system. For example, you may have a different folder
- * (say, my_client_folder) with its own axis2.xml file. my_client_folder/modules will have the
- * modules that the client uses
+ /* Set up deploy folder. It is from the deploy folder, the configuration is
+ * picked up using the axis2.xml file.
+ * In this sample client_home points to the Axis2/C default deploy folder.
+ * The client_home can be different from this folder on your system. For
+ * example, you may have a different folder
+ * (say, my_client_folder) with its own axis2.xml file.
+ * my_client_folder/modules will have the modules that the client uses
*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
if (!client_home)
Modified: webservices/sandesha/trunk/c/samples/client/rm_mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_mtom/mtom_client.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_mtom/mtom_client.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_mtom/mtom_client.c Tue Sep 12 01:33:42 2006
@@ -50,7 +50,8 @@
address = argv[1];
if (AXIS2_STRCMP(address, "-h") == 0)
{
- printf("Usage : %s [endpoint_url] [image_name] [to_save_name]\n", argv[0]);
+ printf("Usage : %s [endpoint_url] [image_name] [to_save_name]\n",
+ argv[0]);
printf("use -h for help\n");
return 0;
}
@@ -74,18 +75,19 @@
/* Seperate listner needs addressing, hence addressing stuff in options */
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://ws.apache.org/axis2/c/samples/mtomSample");
- reply_to = axis2_endpoint_ref_create(env,
- "http://localhost:6060/axis2/services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
+ reply_to = axis2_endpoint_ref_create(env, "http://localhost:6060/axis2/" \
+ "services/__ANONYMOUS_SERVICE__/__OPERATION_OUT_IN__");
AXIS2_OPTIONS_SET_REPLY_TO(options, env, reply_to);
AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, AXIOM_SOAP11);
AXIS2_OPTIONS_SET_ENABLE_MTOM(options, env, AXIS2_TRUE);
- /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
- * using the axis2.xml file.
- * In this sample client_home points to the Axis2/C default deploy folder. The client_home can
- * be different from this folder on your system. For example, you may have a different folder
- * (say, my_client_folder) with its own axis2.xml file. my_client_folder/modules will have the
+ /* Set up deploy folder. It is from the deploy folder, the configuration is
+ * picked up using the axis2.xml file.
+ * In this sample client_home points to the Axis2/C default deploy folder.
+ * The client_home can be different from this folder on your system. For
+ * example, you may have a different folder (say, my_client_folder) with
+ * its own axis2.xml file. my_client_folder/modules will have the
* modules that the client uses
*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
Modified: webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c (original)
+++ webservices/sandesha/trunk/c/samples/client/rm_ping/rm_ping_client.c Tue Sep 12 01:33:42 2006
@@ -20,6 +20,10 @@
#include <axiom_soap.h>
#include <axis2_client.h>
+#define MAX_COUNT 10
+/* to check whether the callback is completed */
+int is_complete = 0;
+
axiom_node_t *
build_om_programatically(
const axis2_env_t *env,
@@ -36,6 +40,7 @@
axiom_node_t *payload = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_property_t *property = NULL;
+ int count = 0;
/* Set up the environment */
env = axis2_env_create_all("rm_ping.log", AXIS2_LOG_LEVEL_TRACE);
@@ -62,12 +67,13 @@
AXIS2_OPTIONS_SET_ACTION(options, env,
"http://example.org/action/ping");
- /* Set up deploy folder. It is from the deploy folder, the configuration is picked up
- * using the axis2.xml file.
- * In this sample client_home points to the Axis2/C default deploy folder. The client_home can
- * be different from this folder on your system. For example, you may have a different folder
- * (say, my_client_folder) with its own axis2.xml file. my_client_folder/modules will have the
- * modules that the client uses
+ /* Set up deploy folder. It is from the deploy folder, the configuration is
+ * picked up using the axis2.xml file.
+ * In this sample client_home points to the Axis2/C default deploy folder.
+ * The client_home can be different from this folder on your system. For
+ * example, you may have a different folder (say, my_client_folder) with its
+ * own axis2.xml file. my_client_folder/modules will have the modules that
+ * the client uses
*/
client_home = AXIS2_GETENV("AXIS2C_HOME");
if (!client_home)
@@ -125,17 +131,28 @@
AXIS2_ERROR_GET_MESSAGE(env->error));
printf("ping client invoke FAILED!\n");
}
- AXIS2_SLEEP(10);
+ /** Wait till callback is complete. Simply keep the parent thread running
+ until our on_complete or on_error is invoked */
+ while(count < MAX_COUNT )
+ {
+ if (is_complete)
+ {
+ /* We are done with the callback */
+ break;
+ }
+ AXIS2_SLEEP(1);
+ count++;
+ }
+
+ if (!(count < MAX_COUNT))
+ {
+ printf("\nCounter timed out.\n");
+ }
if (svc_client)
{
AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
- }
- if (endpoint_ref)
- {
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
- endpoint_ref = NULL;
}
return 0;
}
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Tue Sep 12 01:33:42 2006
@@ -43,77 +43,104 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_msg_ctx(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx);
+sandesha2_msg_ctx_set_msg_ctx(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
axis2_msg_ctx_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_ctx(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_msg_ctx(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_add_soap_envelope(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
-
+sandesha2_msg_ctx_add_soap_envelope(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
+
int AXIS2_CALL
-sandesha2_msg_ctx_get_msg_type (sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
-
+sandesha2_msg_ctx_get_msg_type (
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
+
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_msg_type (sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, int msg_type);
+sandesha2_msg_ctx_set_msg_type (
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ int msg_type);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_msg_part (sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, int part_id,
- sandesha2_iom_rm_part_t *part);
-
+sandesha2_msg_ctx_set_msg_part (
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ int part_id,
+ sandesha2_iom_rm_part_t *part);
+
sandesha2_iom_rm_part_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_part(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, int part_id);
+sandesha2_msg_ctx_get_msg_part(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ int part_id);
axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_from(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_from(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_from(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_endpoint_ref_t *from);
+sandesha2_msg_ctx_set_from(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_endpoint_ref_t *from);
axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_to (sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_to (
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_endpoint_ref_t *to);
+sandesha2_msg_ctx_set_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_endpoint_ref_t *to);
axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_reply_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_reply_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_reply_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_endpoint_ref_t *reply_to);
+sandesha2_msg_ctx_set_reply_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_endpoint_ref_t *reply_to);
axis2_endpoint_ref_t *AXIS2_CALL
-sandesha2_msg_ctx_get_fault_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_fault_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_fault_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_endpoint_ref_t *fault_to);
+sandesha2_msg_ctx_set_fault_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_endpoint_ref_t *fault_to);
axis2_relates_to_t *AXIS2_CALL
-sandesha2_msg_ctx_get_relates_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_relates_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_relates_to(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_relates_to_t *relates_to);
+sandesha2_msg_ctx_set_relates_to(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_relates_to_t *relates_to);
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_id(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_msg_id(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
sandesha2_msg_ctx_set_msg_id(
@@ -122,73 +149,101 @@
axis2_char_t *msg_id);
axiom_soap_envelope_t *AXIS2_CALL
-sandesha2_msg_ctx_get_soap_envelope(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_soap_envelope(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_soap_envelope(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env,
- axiom_soap_envelope_t *soap_envelope);
+sandesha2_msg_ctx_set_soap_envelope(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_envelope);
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_wsa_action(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_wsa_action(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_wsa_action(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *action);
+sandesha2_msg_ctx_set_wsa_action(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *action);
void *AXIS2_CALL
-sandesha2_msg_ctx_get_property(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *key);
+sandesha2_msg_ctx_get_property(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *key);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_property(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *key, void *val);
+sandesha2_msg_ctx_set_property(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ void *val);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_soap_action(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *soap_action);
+sandesha2_msg_ctx_set_soap_action(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *soap_action);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_paused(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_bool_t paused);
+sandesha2_msg_ctx_set_paused(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_bool_t paused);
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_rm_ns_val(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_rm_ns_val(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_rm_ns_val(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *ns_val);
+sandesha2_msg_ctx_set_rm_ns_val(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *ns_val);
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_addr_ns_val(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_addr_ns_val(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_addr_ns_val(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *ns_val);
+sandesha2_msg_ctx_set_addr_ns_val(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *ns_val);
int AXIS2_CALL
-sandesha2_msg_ctx_get_flow(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_flow(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_flow(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, int flow);
+sandesha2_msg_ctx_set_flow(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ int flow);
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_rm_spec_ver(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env);
+sandesha2_msg_ctx_get_rm_spec_ver(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_free(sandesha2_msg_ctx_t *rm_msg_ctx, const axis2_env_t *env);
+sandesha2_msg_ctx_free(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_ctx_t* AXIS2_CALL
-sandesha2_msg_ctx_create(const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx)
+sandesha2_msg_ctx_create(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -539,8 +594,9 @@
}
axis2_char_t *AXIS2_CALL
-sandesha2_msg_ctx_get_msg_id(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env)
+sandesha2_msg_ctx_get_msg_id(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env)
{
sandesha2_msg_ctx_impl_t *msg_ctx_impl = NULL;
AXIS2_ENV_CHECK(env, 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=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Tue Sep 12 01:33:42 2006
@@ -39,35 +39,35 @@
axis2_qname_t *AXIS2_CALL
sandesha2_global_in_handler_get_qname(
- struct axis2_handler *handler,
- const axis2_env_t *env);
+ struct axis2_handler *handler,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
sandesha2_global_in_handler_invoke(
- struct axis2_handler *handler,
- const axis2_env_t *env,
- struct axis2_msg_ctx *msg_ctx);
-
+ struct axis2_handler *handler,
+ const axis2_env_t *env,
+ struct axis2_msg_ctx *msg_ctx);
+
axis2_bool_t AXIS2_CALL
sandesha2_global_in_handler_drop_if_duplicate(
- struct axis2_handler *handler,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
+ struct axis2_handler *handler,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
axis2_status_t AXIS2_CALL
sandesha2_global_in_handler_process_dropped_msg(
- struct axis2_handler *handler,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
+ struct axis2_handler *handler,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
/******************************************************************************/
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
sandesha2_global_in_handler_create(
- const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_env_t *env,
+ axis2_qname_t *qname)
{
axis2_handler_t *handler = NULL;
@@ -91,9 +91,9 @@
axis2_status_t AXIS2_CALL
sandesha2_global_in_handler_invoke(
- struct axis2_handler *handler,
- const axis2_env_t *env,
- struct axis2_msg_ctx *msg_ctx)
+ struct axis2_handler *handler,
+ const axis2_env_t *env,
+ struct axis2_msg_ctx *msg_ctx)
{
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -196,7 +196,7 @@
AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE);
if(NULL != req_msg_ctx)
{
- if(AXIS2_TRUE == sandesha2_utils_is_retriable_on_faults(env,
+ if(AXIS2_TRUE == sandesha2_utils_is_retrievable_on_faults(env,
req_msg_ctx))
{
/* TODO we need to notify the listeners */
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=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Tue Sep 12 01:33:42 2006
@@ -89,26 +89,24 @@
sandesha2_transaction_t *transaction = NULL;
sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
sandesha2_msg_processor_t *msg_processor = NULL;
- /* test code */
sandesha2_seq_t *seq_part = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
- /* end test code */
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log, "[sandesha2] Starting in handler .........");
- printf("came10\n");
+ printf("Starting Sandesha2 in handler\n");
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
if(conf_ctx == NULL)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Configuration Context is NULL");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Configuration Context is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
- printf("came11\n");
temp_prop = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, AXIS2_FALSE);
if(temp_prop)
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=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Sep 12 01:33:42 2006
@@ -195,7 +195,7 @@
axis2_ctx_t *ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_property_t *property = NULL;
- sandesha2_storage_mgr_t *storage_man = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
sandesha2_fault_mgr_t *fault_man = NULL;
sandesha2_seq_t *seq = NULL;
@@ -272,11 +272,11 @@
}
}
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
fault_man = sandesha2_fault_mgr_create(env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
- fault_man, env, rm_msg_ctx, storage_man);
+ fault_man, env, rm_msg_ctx, storage_mgr);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -291,14 +291,14 @@
return AXIS2_SUCCESS;
}
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
- storage_man, env);
+ storage_mgr, env);
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_man, env,
- rm_msg_ctx, str_seq_id, storage_man);
+ rm_msg_ctx, str_seq_id, storage_mgr);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -315,7 +315,7 @@
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_man, env,
- rm_msg_ctx, str_seq_id, storage_man);
+ rm_msg_ctx, str_seq_id, storage_mgr);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -330,7 +330,7 @@
return AXIS2_SUCCESS;
}
sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id,
- storage_man);
+ storage_mgr);
msgs_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
str_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
@@ -344,9 +344,9 @@
}
str_key = axis2_uuid_gen(env);
highest_in_msg_no_str = sandesha2_utils_get_seq_property(env, str_seq_id,
- SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, storage_man);
+ SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, storage_mgr);
highest_in_msg_key_str = sandesha2_utils_get_seq_property(env, str_seq_id,
- SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_man);
+ SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_mgr);
if(NULL == highest_in_msg_key_str)
{
highest_in_msg_key_str = axis2_uuid_gen(env);
@@ -369,9 +369,9 @@
highest_msg_key_bean = sandesha2_seq_property_bean_create_with_data(env,
str_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env,
+ SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env,
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str, msg_ctx);
if(NULL != highest_in_msg_no_str)
{
@@ -414,7 +414,7 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
- next_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_man,
+ next_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR(storage_mgr,
env);
next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_mgr, env,
str_seq_id);
@@ -425,7 +425,7 @@
return AXIS2_FAILURE;
}
storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR(
- storage_man, env);
+ storage_mgr, env);
in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
sandesha2_utils_get_property_bean(env,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env)), env);
@@ -484,7 +484,7 @@
incoming_seq_list_bean);
}
/* save the message */
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, str_key,
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, str_key,
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
@@ -501,7 +501,7 @@
sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
}
sandesha2_app_msg_processor_send_ack_if_reqd(msg_processor, env, rm_msg_ctx,
- msgs_str, storage_man);
+ msgs_str, storage_mgr);
if(AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_FALSE);
@@ -518,7 +518,7 @@
{
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
- sandesha2_storage_mgr_t *storage_man = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
axis2_bool_t is_svr_side = AXIS2_FALSE;
axis2_char_t *internal_seq_id = NULL;
@@ -548,10 +548,10 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
/* TODO setting up fault callback */
- storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
+ storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
- storage_man, env);
+ storage_mgr, env);
is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
@@ -570,8 +570,6 @@
if(AXIS2_TRUE == is_svr_side)
{
- /*axis2_msg_ctx_t *req_msg_ctx = NULL;
- sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;*/
sandesha2_seq_t *req_seq = NULL;
long request_msg_no = -1;
axis2_char_t *req_last_msg_num_str = NULL;
@@ -581,12 +579,6 @@
axis2_property_t *property = NULL;
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);
- req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
- req_seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
- req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- */
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_WSRM_COMMON_SEQ, AXIS2_FALSE);
@@ -612,7 +604,7 @@
incoming_seq_id);
req_last_msg_num_str = sandesha2_utils_get_seq_property(env,
incoming_seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_NO,
- storage_man);
+ storage_mgr);
if(NULL != req_last_msg_num_str)
{
long req_last_msg_num = atol(req_last_msg_num_str);
@@ -655,8 +647,8 @@
}
}
system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(msg_processor,
- env, internal_seq_id, storage_man);
- if(msg_num_lng >= 0 && msg_num_lng <= system_msg_num)
+ env, internal_seq_id, storage_mgr);
+ if(msg_num_lng > 0 && msg_num_lng <= system_msg_num)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
AXIS2_FAILURE);
@@ -681,7 +673,7 @@
dummy_msg = AXIS2_TRUE;
if(AXIS2_FALSE == dummy_msg)
sandesha2_app_msg_processor_set_next_msg_no(msg_processor, env,
- internal_seq_id, msg_number, storage_man);
+ internal_seq_id, msg_number, storage_mgr);
sprintf(msg_number_str, "%ld", msg_number);
res_highest_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
@@ -749,18 +741,6 @@
seq = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property,
env);
- /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx,
- env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
- if(NULL == req_msg_ctx)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
- AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
-
- seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx,
- env, SANDESHA2_MSG_PART_SEQ);*/
req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
@@ -787,7 +767,7 @@
if(NULL == out_seq_bean)
send_create_seq = AXIS2_TRUE;
sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx,
- internal_seq_id, spec_ver, storage_man);
+ internal_seq_id, spec_ver, storage_mgr);
}
if(AXIS2_TRUE == send_create_seq)
{
@@ -800,7 +780,7 @@
SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
- storage_man);
+ storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
if(NULL == res_create_seq_added)
{
@@ -833,19 +813,6 @@
acks_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
acks_to_epr, env);
- /*axis2_msg_ctx_t *req_msg_ctx = NULL;
- req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
- msg_ctx, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
- if(NULL == req_msg_ctx)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Request message is"
- "NULL");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
- AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- acks_to = AXIS2_ENDPOINT_REF_GET_ADDRESS(AXIS2_MSG_CTX_GET_TO(
- req_msg_ctx, env), env);*/
}
else if(NULL == acks_to)
acks_to = anon_uri;
@@ -876,7 +843,7 @@
* TODO handle acks_to == anon_uri case
*/
sandesha2_app_msg_processor_add_create_seq_msg(msg_processor, env,
- rm_msg_ctx, internal_seq_id, acks_to, storage_man);
+ rm_msg_ctx, internal_seq_id, acks_to, storage_mgr);
}
}
soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env);
@@ -895,24 +862,11 @@
/* let the request end with 202 if a ack has not been
* written in the incoming thread
*/
- /*axis2_msg_ctx_t *req_msg_ctx = NULL;*/
axis2_op_ctx_t *op_ctx = NULL;
axis2_ctx_t *ctx = NULL;
axis2_char_t *written = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
- msg_ctx, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
- if(NULL == req_msg_ctx)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Request message is"
- "NULL");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
- AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg_ctx, env,
- SANDESHA2_ACK_WRITTEN, AXIS2_FALSE);*/
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_ACK_WRITTEN,
AXIS2_FALSE);
@@ -952,7 +906,7 @@
if(AXIS2_FALSE == dummy_msg)
sandesha2_app_msg_processor_process_response_msg(msg_processor, env,
rm_msg_ctx, internal_seq_id, msg_number, storage_key,
- storage_man);
+ storage_mgr);
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c Tue Sep 12 01:33:42 2006
@@ -43,68 +43,68 @@
axis2_status_t AXIS2_CALL
sandesha2_seq_property_mgr_free(
- void *seq_property,
- const axis2_env_t *envv);
+ void *seq_property,
+ const axis2_env_t *envv);
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_remove(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- axis2_char_t *name);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ axis2_char_t *name);
sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- axis2_char_t *name);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ axis2_char_t *name);
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_update(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_find(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_find_unique(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
axis2_array_list_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve_all(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
sandesha2_seq_property_mgr_update_or_insert(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
static axis2_char_t *
sandesha2_seq_property_mgr_get_id(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- sandesha2_seq_property_bean_t *bean);
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ sandesha2_seq_property_bean_t *bean);
AXIS2_EXTERN sandesha2_seq_property_mgr_t * AXIS2_CALL
sandesha2_seq_property_mgr_create(
- const axis2_env_t *env,
- axis2_ctx_t *ctx)
+ const axis2_env_t *env,
+ axis2_ctx_t *ctx)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
axis2_property_t *property = NULL;
@@ -280,10 +280,10 @@
sandesha2_seq_property_bean_t *AXIS2_CALL
sandesha2_seq_property_mgr_retrieve(
- sandesha2_seq_property_mgr_t *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- axis2_char_t *name)
+ sandesha2_seq_property_mgr_t *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ axis2_char_t *name)
{
sandesha2_seq_property_mgr_impl_t *seq_property_impl = NULL;
sandesha2_seq_property_bean_t *bean = NULL;
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Tue Sep 12 01:33:42 2006
@@ -241,8 +241,8 @@
}
static axis2_bool_t validate_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=442523&r1=442522&r2=442523
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Tue Sep 12 01:33:42 2006
@@ -117,19 +117,19 @@
sandesha2_utils_get_rm_version(
const axis2_env_t *env,
axis2_char_t *key,
- sandesha2_storage_mgr_t *storage_man)
+ sandesha2_storage_mgr_t *storage_mgr)
{
- sandesha2_seq_property_mgr_t *seq_prop_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *rm_version_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
- AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
- storage_man, env);
- if(seq_prop_man)
- rm_version_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_man,
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ storage_mgr, env);
+ if(seq_prop_mgr)
+ rm_version_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, key, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(NULL == rm_version_bean)
return NULL;
@@ -169,23 +169,24 @@
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_seq_property(const axis2_env_t *env,
- axis2_char_t *id,
- axis2_char_t *name,
- sandesha2_storage_mgr_t *storage_man)
+sandesha2_utils_get_seq_property(
+ const axis2_env_t *env,
+ axis2_char_t *incoming_seq_id,
+ axis2_char_t *name,
+ sandesha2_storage_mgr_t *storage_mgr)
{
- sandesha2_seq_property_mgr_t *seq_prop_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, id, NULL);
+ AXIS2_PARAM_CHECK(env->error, incoming_seq_id, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
+ AXIS2_PARAM_CHECK(env->error, storage_mgr, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
- storage_man, env);
- seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_man,
- env, id, name);
+ seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
+ storage_mgr, env);
+ seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+ env, incoming_seq_id, name);
if(NULL == seq_prop_bean)
return NULL;
return SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(seq_prop_bean, env);
@@ -193,8 +194,9 @@
}
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_utils_get_property_bean(const axis2_env_t *env,
- axis2_conf_t *conf)
+sandesha2_utils_get_property_bean(
+ const axis2_env_t *env,
+ axis2_conf_t *conf)
{
axis2_param_t *param = NULL;
@@ -443,15 +445,15 @@
else
{
/* TODO we need to class load the proper storage mgr */
- sandesha2_storage_mgr_t *storage_man =
+ sandesha2_storage_mgr_t *storage_mgr =
sandesha2_storage_mgr_create(env, conf_ctx);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, storage_man);
+ AXIS2_PROPERTY_SET_VALUE(property, env, storage_mgr);
AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env),
env, SANDESHA2_INMEMORY_STORAGE_MGR, property,
AXIS2_FALSE);
- return storage_man;
+ return storage_mgr;
}
return NULL;
}
@@ -510,9 +512,9 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_utils_get_internal_seq_id(
- const axis2_env_t *env,
- axis2_char_t *to,
- axis2_char_t *seq_key)
+ const axis2_env_t *env,
+ axis2_char_t *to,
+ axis2_char_t *seq_key)
{
axis2_char_t *ret = NULL;
@@ -764,7 +766,7 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_utils_is_retriable_on_faults(const axis2_env_t *env,
+sandesha2_utils_is_retrievable_on_faults(const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
axis2_bool_t ret = AXIS2_FALSE;
@@ -786,8 +788,9 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_utils_is_rm_global_msg(const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+sandesha2_utils_is_rm_global_msg(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
axis2_bool_t is_global_msg = AXIS2_FALSE;
axis2_char_t *action = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org