You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/08/07 12:51:18 UTC
svn commit: r429298 - in /webservices/sandesha/trunk/c: config/
src/handlers/ src/msgprocessors/ src/util/ src/wsrm/
Author: damitha
Date: Mon Aug 7 03:51:16 2006
New Revision: 429298
URL: http://svn.apache.org/viewvc?rev=429298&view=rev
Log:
Some fixes along getting rm working
Modified:
webservices/sandesha/trunk/c/config/axis2.xml
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/util/msg_init.c
webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
Modified: webservices/sandesha/trunk/c/config/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/axis2.xml?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/config/axis2.xml (original)
+++ webservices/sandesha/trunk/c/config/axis2.xml Mon Aug 7 03:51:16 2006
@@ -158,9 +158,9 @@
<phaseOrder type="Outfaultflow">
<!-- user can add his own phases to this area -->
<phase name="RMPhase"/>
+ <phase name="MessageOut"/>
<!--phase name="userphase1"/-->
<!--phase name="PolicyDetermination"/-->
- <phase name="MessageOut"/>
</phaseOrder>
</axisconfig>
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?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon Aug 7 03:51:16 2006
@@ -182,7 +182,7 @@
if(AXIS2_TRUE == sandesha2_utils_is_retriable_on_faults(env,
req_msg_ctx))
{
- /* TODO we need to notify the listners */
+ /* TODO we need to notify the listeners */
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
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?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Mon Aug 7 03:51:16 2006
@@ -176,7 +176,8 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_WITHIN_TRANSACTION,
prop, AXIS2_FALSE);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot initialize the message");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Cannot initialize the message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_INIT_MSG,
AXIS2_FAILURE);
return AXIS2_FAILURE;
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?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Aug 7 03:51:16 2006
@@ -367,7 +367,7 @@
highest_in_msg_key_str);
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env,
highest_in_msg_key_str);
- SANDESHA2_STORAGE_MGR_store_MSG_CTX(storage_man, env,
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env,
highest_in_msg_key_str, msg_ctx1);
if(NULL != highest_in_msg_no_str)
{
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?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Mon Aug 7 03:51:16 2006
@@ -126,7 +126,8 @@
if(NULL != prop)
addressing_ns = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(prop, env);
- if(addressing_ns == NULL && AXIS2_TRUE != AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
+ if(addressing_ns == NULL && AXIS2_TRUE != AXIS2_MSG_CTX_GET_SERVER_SIDE(
+ msg_ctx, env))
{
addressing_ns = AXIS2_STRDUP(AXIS2_WSA_NAMESPACE, env);
}
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?rev=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Mon Aug 7 03:51:16 2006
@@ -304,8 +304,10 @@
axiom_node_t* AXIS2_CALL
-sandesha2_ack_requested_to_om_node(sandesha2_iom_rm_element_t *ack_requested,
- const axis2_env_t *env, void *om_node)
+sandesha2_ack_requested_to_om_node(
+ sandesha2_iom_rm_element_t *ack_requested,
+ const axis2_env_t *env,
+ void *om_node)
{
sandesha2_ack_requested_impl_t *ack_requested_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -449,8 +451,10 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_ack_requested_to_soap_env(sandesha2_iom_rm_part_t *ack_requested,
- const axis2_env_t *env, axiom_soap_envelope_t *envelope)
+sandesha2_ack_requested_to_soap_env(
+ sandesha2_iom_rm_part_t *ack_requested,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope)
{
sandesha2_ack_requested_impl_t *ack_requested_impl = NULL;
axiom_soap_header_t *soap_header = NULL;
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=429298&r1=429297&r2=429298&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Mon Aug 7 03:51:16 2006
@@ -352,16 +352,12 @@
if(NULL == elements_impl->rm_ns_val)
return AXIS2_SUCCESS;
- addr_ns_val = sandesha2_rm_elements_get_addr_ns_val_from_env(
+ elements_impl->addr_ns_val =
+ sandesha2_rm_elements_get_addr_ns_val_from_env(
rm_elements, env, soap_envelope, action);
- if(NULL != addr_ns_val)
- elements_impl->addr_ns_val = addr_ns_val;
-
- addr_ns_val = NULL;
-
if(NULL == elements_impl->addr_ns_val)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cant find the"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot find the"
" addressing version");
return AXIS2_FAILURE;
}
@@ -372,8 +368,6 @@
soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
body_element = AXIOM_NODE_GET_DATA_ELEMENT(body_node, env);
-
-
rm_ns_val = elements_impl->rm_ns_val;
addr_ns_val = elements_impl->addr_ns_val;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org