Author: nandika
Date: Fri Dec 7 00:31:41 2007
New Revision: 602021
URL: http://svn.apache.org/viewvc?rev=602021&view=rev
Log:
compile errors fixed, permanent_transaction.c file removed
Removed:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
Fri Dec 7 00:31:41 2007
@@ -233,18 +233,21 @@
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
axis2_bool_t ret = AXIS2_FALSE;
axis2_char_t sql_insert[1024];
+ axis2_char_t *create_seq_msg_id = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *create_seq_msg_store_key = NULL;
+ axis2_char_t *ref_msg_store_key = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *create_seq_msg_id =
sandesha2_create_seq_bean_get_create_seq_msg_id(
+ create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
(sandesha2_rm_bean_t *) bean, env);
- axis2_char_t *internal_seq_id =
sandesha2_create_seq_bean_get_internal_seq_id(bean, env);
- axis2_char_t *seq_id = sandesha2_create_seq_bean_get_seq_id(bean, env);
- axis2_char_t *create_seq_msg_store_key =
- sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
- axis2_char_t *ref_msg_store_key =
- sandesha2_create_seq_bean_get_ref_msg_store_key(bean, env);
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(bean, env);
+ seq_id = sandesha2_create_seq_bean_get_seq_id(bean, env);
+ create_seq_msg_store_key =
sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
+ ref_msg_store_key = sandesha2_create_seq_bean_get_ref_msg_store_key(bean,
env);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
@@ -314,18 +317,20 @@
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
axis2_char_t sql_update[1024];
axis2_bool_t ret = AXIS2_FALSE;
-
+ axis2_char_t *create_seq_msg_id = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *create_seq_msg_store_key = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *ref_msg_store_key = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"Entry:[sandesha2]sandesha2_permanent_create_seq_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *create_seq_msg_id =
sandesha2_create_seq_bean_get_create_seq_msg_id(
+ create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
(sandesha2_rm_bean_t *) bean, env);
- axis2_char_t *internal_seq_id =
sandesha2_create_seq_bean_get_internal_seq_id(bean, env);
- axis2_char_t *seq_id = sandesha2_create_seq_bean_get_seq_id(bean, env);
- axis2_char_t *create_seq_msg_store_key =
- sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
- axis2_char_t *ref_msg_store_key =
- sandesha2_create_seq_bean_get_ref_msg_store_key(bean, env);
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(bean, env);
+ seq_id = sandesha2_create_seq_bean_get_seq_id(bean, env);
+ create_seq_msg_store_key =
sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
+ ref_msg_store_key = sandesha2_create_seq_bean_get_ref_msg_store_key(bean,
env);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c Fri
Dec 7 00:31:41 2007
@@ -219,15 +219,19 @@
axis2_char_t sql_insert[1024];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_invoker_mgr_t *invoker_mgr_impl = NULL;
-
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ axis2_char_t *msg_ctx_ref_key = NULL;
+ long msg_no;
+ axis2_char_t *seq_id = NULL;
+ axis2_bool_t is_invoked = AXIS2_FALSE;
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_invoker_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
+ 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_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
+ msg_no= sandesha2_invoker_bean_get_msg_no(bean, env);
+ seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
+ is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
@@ -289,15 +293,18 @@
axis2_char_t *sql_update = NULL;
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_invoker_mgr_t *invoker_mgr_impl = NULL;
-
+ axis2_char_t *msg_ctx_ref_key = NULL;
+ long msg_no;
+ axis2_char_t *seq_id = NULL;
+ axis2_bool_t is_invoked = AXIS2_FALSE;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_invoker_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *msg_ctx_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
+ 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_bool_t is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
+ msg_no = sandesha2_invoker_bean_get_msg_no(bean, env);
+ seq_id = sandesha2_invoker_bean_get_seq_id(bean, env);
+ is_invoked = sandesha2_invoker_bean_is_invoked(bean, env);
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
Fri Dec 7 00:31:41 2007
@@ -334,15 +334,18 @@
axis2_char_t sql_update[1024];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
-
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *ref_msg_key = NULL;
+ axis2_bool_t polling_mode = AXIS2_FALSE;
+ long msg_no;
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *seq_id =
sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean,
+ 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);
- axis2_bool_t polling_mode = sandesha2_next_msg_bean_is_polling_mode(bean,
env);
- long msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean,
env);
+ ref_msg_key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
+ polling_mode = sandesha2_next_msg_bean_is_polling_mode(bean, env);
+ msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean, env);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Fri
Dec 7 00:31:41 2007
@@ -276,23 +276,36 @@
axis2_char_t sql_insert[1024];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
+ axis2_char_t *msg_id = NULL;
+ axis2_char_t *msg_ctx_ref_key = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ int sent_count =0;
+ long msg_no = 0;
+ axis2_bool_t send = AXIS2_FALSE;
+ axis2_bool_t resend = AXIS2_FALSE;
+ long time_to_send = 0;
+ int msg_type = 0;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *wsrm_anon_uri = NULL;
+ axis2_char_t *to_address = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_sender_mgr_insert");
- AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *msg_id =
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
+
+ AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
+ msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
env);
- axis2_char_t *msg_ctx_ref_key =
sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
- axis2_char_t *internal_seq_id =
sandesha2_sender_bean_get_internal_seq_id(bean, env);
- int sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
- long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
- axis2_bool_t send = sandesha2_sender_bean_is_send(bean, env);
- axis2_bool_t resend = sandesha2_sender_bean_is_resend(bean, env);
- long time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
- int msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
- axis2_char_t *seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
- 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);
+ msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
+ internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
+ sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
+ msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
+ send = sandesha2_sender_bean_is_send(bean, env);
+ resend = sandesha2_sender_bean_is_resend(bean, env);
+ time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
+ msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
+ seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
+ wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(bean, env);
+ to_address = sandesha2_sender_bean_get_to_address(bean, env);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
@@ -366,23 +379,35 @@
axis2_char_t sql_update[1024];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
+ axis2_char_t *msg_id = NULL;
+ axis2_char_t *msg_ctx_ref_key = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ int sent_count = 0;
+ long msg_no = 0;
+ axis2_bool_t resend = AXIS2_FALSE;
+ axis2_bool_t send = AXIS2_FALSE;
+ long time_to_send = 0;
+ int msg_type = 0;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *wsrm_anon_uri = NULL;
+ axis2_char_t *to_address = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *msg_id =
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
+ msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *) bean,
env);
- axis2_char_t *msg_ctx_ref_key =
sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
- axis2_char_t *internal_seq_id =
sandesha2_sender_bean_get_internal_seq_id(bean, env);
- int sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
- long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
- axis2_bool_t send = sandesha2_sender_bean_is_send(bean, env);
- axis2_bool_t resend = sandesha2_sender_bean_is_resend(bean, env);
- long time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
- int msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
- axis2_char_t *seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
- 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);
+ msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
+ internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
+ sent_count= sandesha2_sender_bean_get_sent_count(bean, env);
+ msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
+ send = sandesha2_sender_bean_is_send(bean, env);
+ resend = sandesha2_sender_bean_is_resend(bean, env);
+ time_to_send = sandesha2_sender_bean_get_time_to_send(bean, env);
+ msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
+ seq_id = sandesha2_sender_bean_get_seq_id(bean, env);
+ wsrm_anon_uri = sandesha2_sender_bean_get_wsrm_anon_uri(bean, env);
+ to_address = sandesha2_sender_bean_get_to_address(bean, env);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
(original)
+++
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
Fri Dec 7 00:31:41 2007
@@ -247,14 +247,18 @@
axis2_char_t sql_insert[1024];
axis2_bool_t ret = AXIS2_FALSE;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
+ axis2_char_t *id = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *name = NULL;
+ axis2_char_t *value = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *id =
sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
- axis2_char_t *seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
- axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
- axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
+ id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
+ seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
+ name = sandesha2_seq_property_bean_get_name(bean, env);
+ value = sandesha2_seq_property_bean_get_value(bean, env);
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
@@ -333,15 +337,19 @@
{
axis2_char_t sql_update[1024];
axis2_bool_t ret = AXIS2_FALSE;
+ axis2_char_t *id = NULL;
sandesha2_permanent_seq_property_mgr_t *seq_prop_mgr_impl = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *name = NULL;
+ axis2_char_t *value = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_seq_property_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- axis2_char_t *id =
sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
- axis2_char_t *seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
- axis2_char_t *name = sandesha2_seq_property_bean_get_name(bean, env);
- axis2_char_t *value = sandesha2_seq_property_bean_get_value(bean, env);
+ id = sandesha2_permanent_seq_property_mgr_get_id_with_bean(env, bean);
+ seq_id = sandesha2_seq_property_bean_get_seq_id(bean, env);
+ name = sandesha2_seq_property_bean_get_name(bean, env);
+ value = sandesha2_seq_property_bean_get_value(bean, env);
seq_prop_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_prop_mgr);
Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?rev=602021&r1=602020&r2=602021&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Fri Dec 7 00:31:41 2007
@@ -603,8 +603,8 @@
axiom_soap_header_t *soap_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, soap_envelope, NULL);
+ AXIS2_PARAM_CHECK(env->error, action, NULL);
soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
if(soap_header)
@@ -663,8 +663,8 @@
axiom_soap_header_t *soap_header = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, soap_envelope, NULL);
+ AXIS2_PARAM_CHECK(env->error, action, NULL);
soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
if(soap_header)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
