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/04/17 08:12:24 UTC
svn commit: r529498 - in /webservices/sandesha/trunk/c: include/
src/msgprocessors/ src/storage/permanent/ src/util/ src/workers/
Author: damitha
Date: Mon Apr 16 23:12:22 2007
New Revision: 529498
URL: http://svn.apache.org/viewvc?view=rev&rev=529498
Log:
changes for the windows build
Modified:
webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h?view=diff&rev=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h Mon Apr 16 23:12:22 2007
@@ -22,6 +22,8 @@
* @brief Sandesha In Memory Bean Manager Interface
*/
+#include <platforms/axutil_platform_auto_sense.h>
+#include <mysql.h>
#include <axutil_allocator.h>
#include <axutil_env.h>
#include <axutil_error.h>
@@ -30,7 +32,6 @@
#include <axutil_array_list.h>
#include <sandesha2_rm_bean.h>
#include <sandesha2_msg_store_bean.h>
-#include <mysql.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h?view=diff&rev=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_storage_mgr.h Mon Apr 16 23:12:22 2007
@@ -21,7 +21,7 @@
* @file sandesha2_storage_mgr.h
* @brief
*/
-
+#include <platforms/axutil_platform_auto_sense.h>
#include <axutil_utils_defines.h>
#include <axutil_env.h>
#include <axiom_soap_envelope.h>
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=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Apr 16 23:12:22 2007
@@ -169,9 +169,6 @@
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
- sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
- sandesha2_seq_property_bean_t *term_rcvd_bean = NULL;
- sandesha2_seq_property_bean_t *transmit_bean = NULL;
axis2_char_t *spec_version = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
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=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Mon Apr 16 23:12:22 2007
@@ -29,7 +29,6 @@
#include <axutil_property.h>
#include <axis2_conf_ctx.h>
#include <axutil_types.h>
-#include <platforms/axutil_platform_auto_sense.h>
/**
* @brief Sandesha2 Permanent Bean Manager Struct Impl
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=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Mon Apr 16 23:12:22 2007
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <platforms/axutil_platform_auto_sense.h>
+#include <mysql.h>
#include <sandesha2_permanent_transaction.h>
#include "sandesha2_permanent_storage_mgr.h"
#include <sandesha2_transaction.h>
@@ -29,8 +31,6 @@
#include <axutil_property.h>
#include <axis2_module_desc.h>
#include <sandesha2_permanent_bean_mgr.h>
-#include <platforms/axutil_platform_auto_sense.h>
-#include <mysql.h>
typedef struct sandesha2_permanent_transaction_impl
sandesha2_permanent_transaction_impl_t;
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Mon Apr 16 23:12:22 2007
@@ -641,7 +641,10 @@
axis2_status_t status = AXIS2_FALSE;
const axis2_char_t *to_addr = NULL;
long send_time = -1;
-
+ sandesha2_terminate_seq_t *terminate_seq = NULL;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+
AXIS2_LOG_INFO(env->log,
"[sandesha2] Start:sandesha2_terminate_mgr_add_terminate_seq_msg");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -754,23 +757,16 @@
sandesha2_sender_bean_set_msg_id(terminate_bean, env,
sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env));
sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE);
-
-
-
- sandesha2_terminate_seq_t *terminate_seq = NULL;
terminate_seq = (sandesha2_terminate_seq_t*)
sandesha2_msg_ctx_get_msg_part(terminate_rm_msg, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ);
- axis2_char_t *seq_id = sandesha2_identifier_get_identifier(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
- axis2_char_t *internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
+ internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
sandesha2_sender_bean_set_seq_id(terminate_bean, env, internal_seq_id);
-
-
-
property = axutil_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_FALSE);
sandesha2_msg_ctx_set_property(terminate_rm_msg, env,
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=529498&r1=529497&r2=529498
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Mon Apr 16 23:12:22 2007
@@ -267,12 +267,7 @@
sandesha2_sender_worker_t *sender_worker = NULL;
axis2_char_t *msg_id = NULL;
axis2_char_t *seq_id = NULL;
- axis2_char_t *out_int_seq_id = NULL;
- axis2_char_t *out_seq_id = NULL;
int no_of_seqs = 0;
- axis2_bool_t seq_completed = AXIS2_FALSE;
- sandesha2_seq_property_bean_t *terminated_bean = NULL;
- axis2_char_t *terminated = NULL;
no_of_seqs = axutil_array_list_size(sender->working_seqs, env);
if(sender->seq_index >= no_of_seqs)
{
@@ -300,8 +295,7 @@
if(!sender_bean)
{
sandesha2_transaction_commit(transaction, env);
- /*AXIS2_SLEEP(SANDESHA2_SENDER_SLEEP_TIME);*/
- usleep(100000);
+ AXIS2_USLEEP(100000);
continue;
}
msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org