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 na...@apache.org on 2007/03/23 10:02:55 UTC
svn commit: r521634 - in /webservices/sandesha/trunk/c: ides/vc8/sandesha2/
samples/rm_echo_1_0/ src/client/ src/handlers/ src/msgprocessors/
src/storage/permanent/ src/util/
Author: nandika
Date: Fri Mar 23 02:02:54 2007
New Revision: 521634
URL: http://svn.apache.org/viewvc?view=rev&rev=521634
Log:
compile errors due to axis2 changes fixed
Modified:
webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln
webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
Modified: webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln?view=diff&rev=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln (original)
+++ webservices/sandesha/trunk/c/ides/vc8/sandesha2/sandesha2.sln Fri Mar 23 02:02:54 2007
@@ -8,18 +8,6 @@
{5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C} = {5D4A55B6-5A2A-4B2E-8DE3-AF69F1DFCB1C}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_echo", "clients\rm_echo\rm_echo.vcproj", "{67B7B376-5F98-4935-B0EC-574D4A5D5ABA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_echo_1_1", "clients\rm_echo_1_1\rm_echo_1_1.vcproj", "{025F8AE7-6D06-4619-B88C-8565C7919E37}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_echo_single", "clients\rm_echo_single\rm_echo_single.vcproj", "{E671F2A0-9F78-4850-A551-EA4B3D3285E0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_mtom", "clients\rm_mtom\rm_mtom.vcproj", "{30601F88-F9A8-4042-9384-7B7A16D2715E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_ping_1_0", "clients\rm_ping_1_0\rm_ping_1_0.vcproj", "{E18C6113-1416-44D3-8161-6B15B4A5EE90}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rm_ping_1_1", "clients\rm_ping_1_1\rm_ping_1_1.vcproj", "{50ACBF00-575D-47B2-B00A-C98FFCFFF4AE}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -34,30 +22,6 @@
{1F323607-2D46-4596-9BF5-F3B8331AF081}.Debug|Win32.Build.0 = Debug|Win32
{1F323607-2D46-4596-9BF5-F3B8331AF081}.Release|Win32.ActiveCfg = Release|Win32
{1F323607-2D46-4596-9BF5-F3B8331AF081}.Release|Win32.Build.0 = Release|Win32
- {67B7B376-5F98-4935-B0EC-574D4A5D5ABA}.Debug|Win32.ActiveCfg = Debug|Win32
- {67B7B376-5F98-4935-B0EC-574D4A5D5ABA}.Debug|Win32.Build.0 = Debug|Win32
- {67B7B376-5F98-4935-B0EC-574D4A5D5ABA}.Release|Win32.ActiveCfg = Release|Win32
- {67B7B376-5F98-4935-B0EC-574D4A5D5ABA}.Release|Win32.Build.0 = Release|Win32
- {025F8AE7-6D06-4619-B88C-8565C7919E37}.Debug|Win32.ActiveCfg = Debug|Win32
- {025F8AE7-6D06-4619-B88C-8565C7919E37}.Debug|Win32.Build.0 = Debug|Win32
- {025F8AE7-6D06-4619-B88C-8565C7919E37}.Release|Win32.ActiveCfg = Release|Win32
- {025F8AE7-6D06-4619-B88C-8565C7919E37}.Release|Win32.Build.0 = Release|Win32
- {E671F2A0-9F78-4850-A551-EA4B3D3285E0}.Debug|Win32.ActiveCfg = Debug|Win32
- {E671F2A0-9F78-4850-A551-EA4B3D3285E0}.Debug|Win32.Build.0 = Debug|Win32
- {E671F2A0-9F78-4850-A551-EA4B3D3285E0}.Release|Win32.ActiveCfg = Release|Win32
- {E671F2A0-9F78-4850-A551-EA4B3D3285E0}.Release|Win32.Build.0 = Release|Win32
- {30601F88-F9A8-4042-9384-7B7A16D2715E}.Debug|Win32.ActiveCfg = Debug|Win32
- {30601F88-F9A8-4042-9384-7B7A16D2715E}.Debug|Win32.Build.0 = Debug|Win32
- {30601F88-F9A8-4042-9384-7B7A16D2715E}.Release|Win32.ActiveCfg = Release|Win32
- {30601F88-F9A8-4042-9384-7B7A16D2715E}.Release|Win32.Build.0 = Release|Win32
- {E18C6113-1416-44D3-8161-6B15B4A5EE90}.Debug|Win32.ActiveCfg = Debug|Win32
- {E18C6113-1416-44D3-8161-6B15B4A5EE90}.Debug|Win32.Build.0 = Debug|Win32
- {E18C6113-1416-44D3-8161-6B15B4A5EE90}.Release|Win32.ActiveCfg = Release|Win32
- {E18C6113-1416-44D3-8161-6B15B4A5EE90}.Release|Win32.Build.0 = Release|Win32
- {50ACBF00-575D-47B2-B00A-C98FFCFFF4AE}.Debug|Win32.ActiveCfg = Debug|Win32
- {50ACBF00-575D-47B2-B00A-C98FFCFFF4AE}.Debug|Win32.Build.0 = Debug|Win32
- {50ACBF00-575D-47B2-B00A-C98FFCFFF4AE}.Release|Win32.ActiveCfg = Release|Win32
- {50ACBF00-575D-47B2-B00A-C98FFCFFF4AE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
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=521634&r1=521633&r2=521634
==============================================================================
--- 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 Fri Mar 23 02:02:54 2007
@@ -121,16 +121,16 @@
if(target_epr)
{
property = axis2_property_create_with_args(env, 0, 0, 0, target_epr);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_TARGET_EPR, property);
+ axis2_options_set_property(options, env, AXIS2_TARGET_EPR, property);
}
AXIS2_OPTIONS_SET_USE_SEPARATE_LISTENER(options, env, AXIS2_TRUE);
/* Separate listner needs addressing, hence addressing stuff in options */
- /*AXIS2_OPTIONS_SET_ACTION(options, env,
+ /*axis2_options_set_action(options, env,
"http://127.0.0.1:5555/axis2/services/RMSampleService/anonOutInOp");*/
soap_action = axis2_string_create(env, "urn:wsrm:EchoString");
AXIS2_OPTIONS_SET_SOAP_ACTION(options, env, soap_action);
- AXIS2_OPTIONS_SET_ACTION(options, env, "urn:wsrm:EchoString");
+ axis2_options_set_action(options, env, "urn:wsrm:EchoString");
reply_to = axis2_endpoint_ref_create(env,
"http://localhost:7777/axis2/services/__ANONYMOUS_SERVICE__/"\
"__OPERATION_OUT_IN__");
@@ -165,7 +165,7 @@
SANDESHA2_SPEC_VERSION_1_0);
if(property)
{
- AXIS2_OPTIONS_SET_PROPERTY(options, env,
+ axis2_options_set_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
}
/* Set service client options */
@@ -194,7 +194,7 @@
wait_on_callback(env, callback2);*/
property = axis2_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, "Sandesha2LastMessage", property);
+ axis2_options_set_property(options, env, "Sandesha2LastMessage", property);
payload = build_om_payload_for_echo_svc(env, "echo3", "sequence1");
callback3 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback3, rm_echo_callback_on_complete);
@@ -204,7 +204,7 @@
AXIS2_SLEEP(2 * SANDESHA2_MAX_COUNT);
if (svc_client)
{
- /*AXIS2_SVC_CLIENT_FREE(svc_client, env);*/
+ /*axis2_svc_client_free(svc_client, env);*/
svc_client = NULL;
}
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Fri Mar 23 02:02:54 2007
@@ -159,7 +159,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, svc_client, NULL);
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(options == NULL)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
@@ -168,7 +168,7 @@
"Options object of the service client not set.");
return NULL;
}
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(to_epr == NULL)
{
AXIS2_ERROR_SET(env->error,
@@ -177,10 +177,10 @@
"To address is not set.");
}
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
seq_key = axis2_property_get_value(property, env);
- svc_ctx = (axis2_svc_ctx_t *)AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = (axis2_svc_ctx_t *)axis2_svc_client_get_svc_ctx(svc_client, env);
if(svc_ctx == NULL)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_CTX_NULL,
@@ -540,14 +540,14 @@
axis2_char_t *seq_key = NULL;
axis2_property_t *property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(!to_epr)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET,
@@ -565,12 +565,12 @@
axis2_char_t *offered_seq_id = NULL;
offered_seq_id = axis2_uuid_gen(env);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_OFFERED_SEQ_ID,
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_OFFERED_SEQ_ID,
offered_seq_id);
}
/* setting a new squence key if not already set.*/
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
if(property)
seq_key = axis2_property_get_value(property, env);
@@ -578,13 +578,13 @@
{
seq_key = axis2_uuid_gen(env);
property = axis2_property_create_with_args(env, 0, 0, 0, seq_key);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY,
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
property);
}
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
AXIS2_VALUE_TRUE);
- AXIS2_SVC_CLIENT_FIRE_AND_FORGET(svc_client, env, NULL);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
+ axis2_svc_client_fire_and_forget(svc_client, env, NULL);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_DUMMY_MESSAGE,
AXIS2_VALUE_FALSE);
return AXIS2_SUCCESS;
@@ -601,19 +601,19 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
property = axis2_property_create_with_args(env, 0, 0, 0, seq_key);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_create_seq_with_svc_client(env, svc_client, offer);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -648,7 +648,7 @@
if(!svc_client)
return AXIS2_FAILURE;
- svc_ctx = (axis2_svc_ctx_t *) AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client,
+ svc_ctx = (axis2_svc_ctx_t *) axis2_svc_client_get_svc_ctx(svc_client,
env);
if(!svc_ctx)
{
@@ -656,14 +656,14 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
rm_spec_version = axis2_property_get_value(property, env);
@@ -686,22 +686,22 @@
rm_namespc_value, NULL);
terminate_body_element = axiom_element_get_first_child_with_qname(element,
env, qname, node, &terminate_body_node);
- old_action = axis2_strdup(AXIS2_OPTIONS_GET_ACTION(options, env), env);
+ old_action = axis2_strdup(axis2_options_get_action(options, env), env);
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
if(action)
- AXIS2_OPTIONS_SET_ACTION(options, env, action);
+ axis2_options_set_action(options, env, action);
sandesha2_client_fire_and_forget(env, svc_client, options, NULL, callback,
terminate_body_node, listener_manager);
if(!AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_COULD_NOT_SEND_TERMINATE_MESSAGE, AXIS2_FAILURE);
- AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ axis2_options_set_action(options, env, old_action);
return AXIS2_FAILURE;
}
if(old_action)
- AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ axis2_options_set_action(options, env, old_action);
AXIS2_FREE(env->allocator, old_action);
return AXIS2_SUCCESS;
}
@@ -716,19 +716,19 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
property = axis2_property_create_with_args(env, 0, 0, 0, seq_key);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_terminate_seq_with_svc_client(env, svc_client, NULL, NULL);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -758,7 +758,7 @@
axis2_qname_t *qname = NULL;
axis2_property_t *property = NULL;
- svc_ctx = (axis2_svc_ctx_t *) AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = (axis2_svc_ctx_t *) axis2_svc_client_get_svc_ctx(svc_client, env);
if(!svc_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_CTX_NULL,
@@ -766,14 +766,14 @@
return AXIS2_FAILURE;
}
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
rm_spec_version = axis2_property_get_value(property, env);
@@ -794,21 +794,21 @@
rm_namespc_value, NULL);
close_body_element = axiom_element_get_first_child_with_qname(element, env,
qname, node, &close_body_node);
- old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = (axis2_char_t*)axis2_options_get_action(options, env);
action = sandesha2_spec_specific_consts_get_close_seq_action(env,
rm_spec_version);
- AXIS2_OPTIONS_SET_ACTION(options, env, action);
+ axis2_options_set_action(options, env, action);
- AXIS2_SVC_CLIENT_FIRE_AND_FORGET(svc_client, env, close_body_node);
+ axis2_svc_client_fire_and_forget(svc_client, env, close_body_node);
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_COULD_NOT_SEND_THE_CLOSE_SEQ_MESSAGE,
AXIS2_FAILURE);
- AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ axis2_options_set_action(options, env, old_action);
return AXIS2_FAILURE;
}
- AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ axis2_options_set_action(options, env, old_action);
return AXIS2_SUCCESS;
}
@@ -823,14 +823,14 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- spec_version = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ spec_version = (axis2_char_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(0 != axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
{
@@ -839,12 +839,12 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
property = axis2_property_create_with_args(env, 0, 0, 0, seq_key);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_close_seq_with_svc_client(env, svc_client);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -872,18 +872,18 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *)AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *)axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_wait_until_seq_completed_with_svc_client(env, svc_client);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -944,19 +944,19 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_wait_until_seq_completed_with_svc_client_and_max_waiting_time(
env, svc_client, max_waiting_time);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -984,14 +984,14 @@
axis2_conf_t *conf = NULL;
axis2_property_t *property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return NULL;
}
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(!to_epr)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET,
@@ -999,10 +999,10 @@
return NULL;
}
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
seq_key = axis2_property_get_value(property, env);
- svc_ctx = (axis2_svc_ctx_t *) AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = (axis2_svc_ctx_t *) axis2_svc_client_get_svc_ctx(svc_client, env);
if(!svc_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_CTX_NULL, AXIS2_FAILURE);
@@ -1072,21 +1072,21 @@
axis2_char_t *action = NULL;
axis2_property_t *property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- svc_ctx = (axis2_svc_ctx_t *) AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = (axis2_svc_ctx_t *) axis2_svc_client_get_svc_ctx(svc_client, env);
if(!svc_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SVC_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(!to_epr)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET,
@@ -1094,10 +1094,10 @@
return AXIS2_FAILURE;
}
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
seq_key = axis2_property_get_value(property, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
rm_spec_version = axis2_property_get_value(property, env);
@@ -1130,7 +1130,7 @@
return AXIS2_FAILURE;
}
out_seq_id = sandesha2_client_get_seq_id(env, svc_client);
- soap_ns_uri = (axis2_char_t *) AXIS2_OPTIONS_GET_SOAP_VERSION_URI(options, env);
+ soap_ns_uri = (axis2_char_t *) axis2_options_get_soap_version_uri(options, env);
if(0 == axis2_strcmp(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, soap_ns_uri))
{
dummy_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
@@ -1155,14 +1155,14 @@
rm_ns_value, NULL);
ack_requested_header_block = axiom_element_get_first_child_with_qname(
element, env, qname, node, &ack_requested_header_block_node);
- old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = (axis2_char_t*)axis2_options_get_action(options, env);
action = sandesha2_spec_specific_consts_get_ack_req_action(env,
rm_spec_version);
- AXIS2_OPTIONS_SET_ACTION(options, env, action);
- AXIS2_SVC_CLIENT_ADD_HEADER(svc_client, env, ack_requested_header_block_node);
- AXIS2_SVC_CLIENT_FIRE_AND_FORGET(svc_client, env, NULL);
- AXIS2_SVC_CLIENT_REMOVE_ALL_HEADERS(svc_client, env);
- AXIS2_OPTIONS_SET_ACTION(options, env, old_action);
+ axis2_options_set_action(options, env, action);
+ axis2_svc_client_add_header(svc_client, env, ack_requested_header_block_node);
+ axis2_svc_client_fire_and_forget(svc_client, env, NULL);
+ axis2_svc_client_remove_all_headers(svc_client, env);
+ axis2_options_set_action(options, env, old_action);
return AXIS2_SUCCESS;
}
@@ -1177,19 +1177,19 @@
axis2_property_t *property = NULL;
axis2_property_t *old_property = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- old_property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ old_property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
property = axis2_property_create_with_args(env, 0, 0, 0, seq_key);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, property);
sandesha2_client_send_ack_request_with_svc_client(env, svc_client);
- AXIS2_OPTIONS_SET_PROPERTY(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
+ axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY, old_property);
return AXIS2_SUCCESS;
}
@@ -1240,7 +1240,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(!to_epr)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET,
@@ -1248,7 +1248,7 @@
return AXIS2_FAILURE;
}
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
seq_key = axis2_property_get_value(property, env);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
@@ -1286,7 +1286,7 @@
AXIS2_FAILURE);
return NULL;
}
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
rm_spec_version = axis2_property_get_value(property, env);
@@ -1303,7 +1303,7 @@
AXIS2_FAILURE);
return NULL;
}
- soap_ns_uri = (axis2_char_t *) AXIS2_OPTIONS_GET_SOAP_VERSION_URI(options, env);
+ soap_ns_uri = (axis2_char_t *) axis2_options_get_soap_version_uri(options, env);
if(0 == axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_ns_uri))
{
dummy_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
@@ -1659,7 +1659,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to_epr = AXIS2_OPTIONS_GET_TO(options, env);
+ to_epr = axis2_options_get_to(options, env);
if(!to_epr)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET,
@@ -1667,7 +1667,7 @@
return AXIS2_FAILURE;
}
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
if(property)
seq_key = axis2_property_get_value(property, env);
@@ -1730,7 +1730,7 @@
AXIS2_FAILURE);
return NULL;
}
- property = AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = axis2_options_get_property(options, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
if(property)
rm_spec_version = axis2_property_get_value(property, env);
@@ -1741,8 +1741,8 @@
}
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
- AXIS2_OPTIONS_SET_ACTION(options, env, action);
- soap_ns_uri = (axis2_char_t *) AXIS2_OPTIONS_GET_SOAP_VERSION_URI(options,
+ axis2_options_set_action(options, env, action);
+ soap_ns_uri = (axis2_char_t *) axis2_options_get_soap_version_uri(options,
env);
if(0 == axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_ns_uri))
{
@@ -1794,11 +1794,11 @@
if(!op_qname)
op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
- svc_ctx = AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = axis2_svc_client_get_svc_ctx(svc_client, env);
conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- svc = AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
- op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env,
+ svc = axis2_svc_client_get_svc(svc_client, env);
+ op = axis2_svc_get_op_with_qname(svc, env,
op_qname);
op_client = axis2_op_client_create(env, op, svc_ctx, options);
if (!op_client)
@@ -1809,14 +1809,14 @@
return AXIS2_FAILURE;
AXIS2_OP_CLIENT_SET_CALLBACK(op_client, env, callback);
AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(op_client, env, msg_ctx);
- transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
+ transport_in_protocol = axis2_options_get_transport_in_protocol(
options, env);
axis2_listener_manager_make_sure_started(listener_manager, env,
transport_in_protocol, conf_ctx);
callback_recv = axis2_callback_recv_create(env);
if (!(callback_recv))
{
- AXIS2_SVC_CLIENT_FREE(svc_client, env);
+ axis2_svc_client_free(svc_client, env);
return AXIS2_FAILURE;
}
@@ -1850,11 +1850,11 @@
{
op_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
}
- svc_ctx = AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
+ svc_ctx = axis2_svc_client_get_svc_ctx(svc_client, env);
conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- svc = AXIS2_SVC_CLIENT_GET_AXIS_SERVICE(svc_client, env);
- op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
+ svc = axis2_svc_client_get_svc(svc_client, env);
+ op = axis2_svc_get_op_with_qname(svc, env, op_qname);
if (!fill_soap_envelope(env, msg_ctx, options, payload))
{
return;
@@ -1868,14 +1868,14 @@
{
AXIS2_OP_CLIENT_SET_CALLBACK(op_client, env, callback);
/*AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(op_client, env, msg_ctx);*/
- transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
+ transport_in_protocol = axis2_options_get_transport_in_protocol(
options, env);
axis2_listener_manager_make_sure_started(listener_manager, env,
transport_in_protocol, conf_ctx);
callback_recv = axis2_callback_recv_create(env);
if (!(callback_recv))
{
- AXIS2_SVC_CLIENT_FREE(svc_client, env);
+ axis2_svc_client_free(svc_client, env);
}
axis2_op_set_msg_recv(op, env, AXIS2_CALLBACK_RECV_GET_BASE(callback_recv,
env));
@@ -1897,7 +1897,7 @@
int soap_version;
axiom_soap_envelope_t *envelope = NULL;
- soap_version_uri = AXIS2_OPTIONS_GET_SOAP_VERSION_URI(options, env);
+ soap_version_uri = axis2_options_get_soap_version_uri(options, env);
if (!soap_version_uri)
{
@@ -1964,14 +1964,14 @@
axiom_soap_body_t *body = NULL;
axiom_node_t *result = NULL;
- options = (axis2_options_t *) AXIS2_SVC_CLIENT_GET_OPTIONS(svc_client, env);
+ options = (axis2_options_t *) axis2_svc_client_get_options(svc_client, env);
if(!options)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_OPTIONS_OBJECT_NOT_SET,
AXIS2_FAILURE);
return NULL;
}
- property = (axis2_property_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
+ property = (axis2_property_t *) axis2_options_get_property(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
client_seq_key = axis2_property_get_value(property, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
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=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Fri Mar 23 02:02:54 2007
@@ -238,9 +238,8 @@
}
if(!within_transaction && !rolled_back)
{
- printf("came26\n");
axis2_property_t *prop = NULL;
-
+ printf("came26\n");
sandesha2_transaction_commit(transaction, env);
prop = axis2_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_FALSE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Fri Mar 23 02:02:54 2007
@@ -148,7 +148,6 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx)
{
- printf("came10\n");
axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -169,6 +168,7 @@
axis2_char_t *anon_uri = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
axis2_op_ctx_t *op_ctx = NULL;
+ printf("came10\n");
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, 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=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Fri Mar 23 02:02:54 2007
@@ -1173,7 +1173,7 @@
sqlite3_free(*error_msg);
counter++;
/*AXIS2_SLEEP(SANDESHA2_BUSY_WAIT_TIME);*/
- usleep(100000);
+ AXIS2_USLEEP(100000);
rc = sqlite3_exec(dbconn, sql_stmt, callback_func, args, error_msg);
}
printf("in busy handler2\n");
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=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Fri Mar 23 02:02:54 2007
@@ -749,7 +749,7 @@
}
options = (axis2_options_t *) axis2_msg_ctx_get_options(msg_ctx, env);
- action = (axis2_char_t *) AXIS2_OPTIONS_GET_ACTION(options, env);
+ action = (axis2_char_t *) axis2_options_get_action(options, env);
sandesha2_msg_store_bean_set_action(bean, env, action);
prop_str = sandesha2_permanent_storage_mgr_get_property_string(env, msg_ctx);
if (prop_str)
@@ -908,7 +908,7 @@
{
axis2_qname_t *op_qname = axis2_qname_create_from_string(env,
op_name_str);
- op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, op_qname);
+ op = axis2_svc_get_op_with_qname(svc, env, op_qname);
}
if(!op && op_mep_str && svc)
{
@@ -1013,7 +1013,7 @@
{
axis2_char_t *action = sandesha2_msg_store_bean_get_action(
msg_store_bean, env);
- AXIS2_OPTIONS_SET_ACTION(options, env, action);
+ axis2_options_set_action(options, env, action);
}
persistent_prop_str =
sandesha2_msg_store_bean_get_persistent_property_str(msg_store_bean,
@@ -1049,10 +1049,11 @@
{
axis2_char_t *prop_str = "";
axis2_property_t *property = NULL;
+ axis2_hash_index_t *index = NULL;
+ axis2_hash_t *properties = NULL;
axis2_options_t *options = (axis2_options_t *) axis2_msg_ctx_get_options(
msg_ctx, env);
- axis2_hash_t *properties = AXIS2_OPTIONS_GET_PROPERTIES(options, env);
- axis2_hash_index_t *index = NULL;
+ properties = axis2_options_get_properties(options, env);
property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
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=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Fri Mar 23 02:02:54 2007
@@ -403,7 +403,7 @@
sqlite3_free(*error_msg);
counter++;
/*AXIS2_SLEEP(SANDESHA2_BUSY_WAIT_TIME);*/
- usleep(100000);
+ AXIS2_USLEEP(100000);
rc = sqlite3_exec(dbconn, sql_stmt, callback_func, args, error_msg);
}
printf("in busy handler4\n");
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=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Fri Mar 23 02:02:54 2007
@@ -486,7 +486,7 @@
return;
}
svc = axis2_msg_ctx_get_svc(msg_ctx, env);
- op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, tmp_qname);
+ op = axis2_svc_get_op_with_qname(svc, env, tmp_qname);
if(!op)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -499,7 +499,7 @@
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
info = axis2_conf_get_phases_info(conf, env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
+ axis2_phases_info_set_op_phases(info, env, op);
status = AXIS2_SVC_ADD_OP(svc, env, op);
if(AXIS2_SUCCESS == status)
{
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=521634&r1=521633&r2=521634
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Fri Mar 23 02:02:54 2007
@@ -456,7 +456,7 @@
* Once it is finished change to get from there
*/
/*options = AXIS2_CTX_GET_OPTIONS(ctx, env);
- transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(options, env);*/
+ transport_in_protocol = axis2_options_get_transport_in_protocol(options, env);*/
transport_in_protocol = AXIS2_TRANSPORT_ENUM_HTTP;
axis2_listener_manager_make_sure_started(listener_manager, env,
@@ -529,7 +529,7 @@
* Once it is finished change to get from there
*/
/* options = AXIS2_CTX_GET_OPTIONS(ctx, env);
- transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(options, env);*/
+ transport_in_protocol = axis2_options_get_transport_in_protocol(options, env);*/
transport_in_protocol = AXIS2_TRANSPORT_HTTP;
property = axis2_msg_ctx_get_property(msg_ctx, env, SANDESHA2_CLIENT_ACKS_TO,
AXIS2_FALSE);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org