Author: damitha
Date: Mon Jun 23 13:38:30 2008
New Revision: 670743
URL: http://svn.apache.org/viewvc?rev=670743&view=rev
Log:
Making the branch work on windows
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/build/win32/configure.in
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/ides/vc8/sandesha2/sandesha2/sandesha2.vcproj
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/build/win32/configure.in
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/build/win32/configure.in?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/build/win32/configure.in
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/build/win32/configure.in
Mon Jun 23 13:38:30 2008
@@ -1,7 +1,8 @@
-AXIS2_BIN_DIR = E:\axis2c\build\axis2c-bin-1.2.0-win32
+AXIS2_BIN_DIR = C:\damitha\axis2c\build\deploy
#CRUNTIME Library (Use /MD or /MT )
CRUNTIME=/MD
# Embed Manifest
EMBED_MANIFEST=1
+DEBUG=1
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/ides/vc8/sandesha2/sandesha2/sandesha2.vcproj
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/ides/vc8/sandesha2/sandesha2/sandesha2.vcproj?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/ides/vc8/sandesha2/sandesha2/sandesha2.vcproj
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/ides/vc8/sandesha2/sandesha2/sandesha2.vcproj
Mon Jun 23 13:38:30 2008
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="./../../../../include;$(AXIS2C_SRC)\include;$(AXIS2C_SRC)\util\include;$(AXIS2C_SRC)\axiom\include;"
+
AdditionalIncludeDirectories=""C:\damitha\axis2c-bin-1.3.1\include";./../../../../include;"$(AXIS2C_SRC)\include";"$(AXIS2C_SRC)\util\include";"$(AXIS2C_SRC)\axiom\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SANDESHA2_EXPORTS;AXIS2_DECLARE_EXPORT;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINNT=0x0400;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -68,10 +68,10 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- UseLibraryDependencyInputs="true"
- AdditionalDependencies="axutil.lib axiom.lib
axis2_engine.lib axis2_parser.lib libmysql.lib"
+ UseLibraryDependencyInputs="false"
+ AdditionalDependencies="axutil.lib axiom.lib
axis2_engine.lib axis2_parser.lib"
LinkIncremental="1"
-
AdditionalLibraryDirectories="$(AXIS2C_HOME)\lib;C:\Program Files\MySQL\MySQL
Server 5.0\lib\debug;$(SQLITE_HOME);"
+
AdditionalLibraryDirectories=""C:\damitha\axis2c-bin-1.3.1\lib""
ModuleDefinitionFile=""
GenerateDebugInformation="true"
MapExports="false"
@@ -303,6 +303,10 @@
<Filter
Name="storage"
>
+ <File
+
RelativePath="..\..\..\..\src\storage\sqlite\sandesha2_permanent_bean_mgr.h"
+ >
+ </File>
<Filter
Name="sqlite"
>
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/handlers/sandesha2_in_handler.c
Mon Jun 23 13:38:30 2008
@@ -33,6 +33,7 @@
#include <sandesha2_ack_msg_processor.h>
#include <sandesha2_ack_req_msg_processor.h>
#include <sandesha2_msg_init.h>
+#include <sandesha2_msg_creator.h>
#include <sandesha2_seq.h>
#include <sandesha2_constants.h>
#include <sandesha2_utils.h>
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
Mon Jun 23 13:38:30 2008
@@ -47,6 +47,7 @@
#include <sandesha2_msg_creator.h>
#include <sandesha2_client_constants.h>
#include <sandesha2_terminate_mgr.h>
+#include <sandesha2_msg_retrans_adjuster.h>
#include <axis2_const.h>
#include <axutil_types.h>
@@ -55,6 +56,7 @@
#include <axis2_engine.h>
#include <axutil_uuid_gen.h>
#include <axis2_relates_to.h>
+#include <axis2_core_utils.h>
#include <axiom_soap_const.h>
#include <axiom_soap_body.h>
#include <axis2_http_transport_utils.h>
@@ -3084,7 +3086,6 @@
args->msg_id = msg_id;
args->retrans_interval = retrans_interval;
args->is_server_side = is_server_side;
- ++(env->allocator->ref_pool_allocator);
worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
sandesha2_app_msg_processor_application_msg_worker_function,
(void*)args);
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
Mon Jun 23 13:38:30 2008
@@ -225,9 +225,11 @@
while(AXIS2_TRUE)
{
sandesha2_ack_range_t *ack_range = NULL;
+ long upper_value = -1;
+
sprintf(tmp, "%ld", start);
ack_range = axutil_hash_get(hash, tmp, AXIS2_HASH_KEY_STRING);
- long upper_value = -1;
+
if(!ack_range)
{
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
Mon Jun 23 13:38:30 2008
@@ -558,26 +558,7 @@
axis2_ctx_t *new_ctx = axis2_msg_ctx_get_base(new_msg, env);
if (new_ctx)
{
- axutil_hash_index_t *hi = NULL;
- axutil_hash_t *ht = NULL;
- axutil_hash_t *ht2 = NULL;
- void *val = NULL;
- const void *val2 = NULL;
- axutil_property_t *prop = NULL;
- axutil_property_t *prop_clone = NULL;
- axis2_char_t *prop_name = NULL;
-
- ht = axis2_ctx_get_property_map(ctx, env);
- ht2 = axis2_ctx_get_property_map(new_ctx, env);
- for (hi = axutil_hash_first(ht, env); hi; hi =
axutil_hash_next(env, hi))
- {
- axutil_hash_this(hi, &val2, NULL, &val);
- prop = (axutil_property_t*)val;
- prop_name = (axis2_char_t*)val2;
- prop_clone = sandesha2_util_property_clone(env, prop);
- axis2_ctx_set_property(new_ctx, env, prop_name, prop_clone);
- axutil_property_set_free_func(prop, env,
sandesha2_util_dummy_prop_free);
- }
+ axis2_ctx_set_property_map(new_ctx, env,
axis2_ctx_get_property_map(ctx, env));
}
}
@@ -1302,28 +1283,7 @@
axis2_ctx_t *new_ctx = axis2_msg_ctx_get_base(new_msg_ctx, env);
if (new_ctx)
{
- axutil_hash_index_t *hi = NULL;
- axutil_hash_t *ht = NULL;
- axutil_hash_t *ht2 = NULL;
- void *val = NULL;
- const void *val2 = NULL;
- axutil_property_t *prop = NULL;
- axutil_property_t *prop_clone = NULL;
- axis2_char_t *prop_name = NULL;
-
- ht = axis2_ctx_get_property_map(ctx, env);
- ht2 = axis2_ctx_get_property_map(new_ctx, env);
- for (hi = axutil_hash_first(ht, env); hi; hi =
axutil_hash_next(env, hi)) {
- axutil_hash_this(hi, &val2, NULL, &val);
- prop = (axutil_property_t*)val;
- prop_name = (axis2_char_t*)val2;
- prop_clone = sandesha2_util_property_clone(env, prop);
- axis2_ctx_set_property(new_ctx, env, prop_name, prop_clone);
- axutil_property_set_free_func(prop, env,
sandesha2_util_dummy_prop_free);
- }
- /* axis2_ctx_set_property_map(new_ctx, env,
- * axis2_ctx_get_property_map(ctx, env));
- */
+ axis2_ctx_set_property_map(new_ctx, env,
axis2_ctx_get_property_map(ctx, env));
}
}
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
Mon Jun 23 13:38:30 2008
@@ -37,9 +37,12 @@
#include <axutil_array_list.h>
#include <axis2_engine.h>
#include <sandesha2_msg_creator.h>
+#include <sandesha2_ack_mgr.h>
+#include <sandesha2_msg_retrans_adjuster.h>
#include <axis2_transport_out_desc.h>
#include <axiom_soap_const.h>
#include <axis2_http_transport_utils.h>
+#include <axis2_core_utils.h>
axutil_hash_t *sandesha2_terminate_mgr_rcv_side_clean_map = NULL;
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender.c
Mon Jun 23 13:38:30 2008
@@ -83,7 +83,6 @@
args->conf_ctx = conf_ctx;
args->seq_id = seq_id;
args->persistent_msg_ctx = persistent_msg_ctx;
- ++(env->allocator->ref_pool_allocator);
worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
sandesha2_sender_worker_func,
(void*)args);
@@ -195,10 +194,6 @@
"[sandesha2]Exit:sandesha2_sender_worker_func");
axutil_allocator_switch_to_local_pool(env->allocator);
- if(env->allocator->pool_allocator)
- {
- AXIS2_POOL_ALLOCATOR_DESTROY(env->allocator);
- }
return NULL;
}
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c?rev=670743&r1=670742&r2=670743&view=diff
==============================================================================
---
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c
(original)
+++
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/workers/sender_worker.c
Mon Jun 23 13:38:30 2008
@@ -392,8 +392,10 @@
if(!resend && msg_type != SANDESHA2_MSG_TYPE_APPLICATION &&
msg_type != SANDESHA2_MSG_TYPE_CREATE_SEQ)
{
+ axis2_char_t *msg_stored_key = NULL;
+
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"msg_type:%d*****************************", msg_type);
- axis2_char_t *msg_stored_key = NULL;
+
if(bean1)
{
msg_id = sandesha2_sender_bean_get_msg_id(bean1, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
