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 sa...@apache.org on 2006/07/13 09:32:54 UTC
svn commit: r421524 - in /webservices/sandesha/trunk/c: include/sandesha2/
src/ src/msgprocessors/ src/util/
Author: sahan
Date: Thu Jul 13 00:32:53 2006
New Revision: 421524
URL: http://svn.apache.org/viewvc?rev=421524&view=rev
Log:
1. Adding some utils functions
2. changed the location of fault manager
Added:
webservices/sandesha/trunk/c/src/util/fault_manager.c
- copied unchanged from r421503, webservices/sandesha/trunk/c/src/fault_manager.c
Removed:
webservices/sandesha/trunk/c/src/fault_manager.c
Modified:
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
webservices/sandesha/trunk/c/src/Makefile.am
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/util/Makefile.am
webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
webservices/sandesha/trunk/c/src/util/utils.c
Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h Thu Jul 13 00:32:53 2006
@@ -55,6 +55,13 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_spec_specific_consts_is_ack_none_allowed(const axis2_env_t *env,
axis2_char_t *rm_spec_ver);
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_spec_specific_consts_get_default_spec_version(const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_spec_specific_consts_get_anon_uri(const axis2_env_t *env,
+ axis2_char_t *addr_ns_val);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_utils.h Thu Jul 13 00:32:53 2006
@@ -105,6 +105,12 @@
sandesha2_utils_get_permanent_storage_mgr(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_utils_get_svr_side_incoming_seq_id(const axis2_env_t *env,
+ axis2_char_t *incoming_seq_id);
+
+
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/Makefile.am?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/Makefile.am Thu Jul 13 00:32:53 2006
@@ -1,8 +1,7 @@
SUBDIRS = wsrm storage util transport workers
noinst_LTLIBRARIES = libsandesha2.la
-libsandesha2_la_SOURCES = msg_ctx.c\
- fault_manager.c
+libsandesha2_la_SOURCES = msg_ctx.c
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@
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=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Jul 13 00:32:53 2006
@@ -682,7 +682,7 @@
axis2_char_t *req_seq_id = NULL;
sandesha2_seq_property_bean_t *spec_ver_bean = NULL;
- incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
+ incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(env,
internal_seq_id);
incoming_to_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
@@ -708,8 +708,8 @@
return AXIS2_FAILURE;
}
req_rm_msg_ctx = sandesha2_msg_initilizer_init_msg(env, req_msg_ctx);
- seq = SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ);
+ seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg_ctx,
+ env, SANDESHA2_MSG_PART_SEQ);
req_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
spec_ver_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
@@ -792,8 +792,8 @@
axis2_char_t *incoming_seq_id = NULL;
sandesha2_seq_property_bean_t *reply_to_epr_bean = NULL;
- incoming_seq_id = sandesha2_utils_get_incoming_seq_id(env,
- internal_seq_id);
+ incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(
+ env, internal_seq_id);
reply_to_epr_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, incoming_seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Thu Jul 13 00:32:53 2006
@@ -4,7 +4,8 @@
error.c \
utils.c \
spec_specific_consts.c\
- fault_data.c
+ fault_data.c\
+ fault_manager.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
Modified: webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/spec_specific_consts.c?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/spec_specific_consts.c (original)
+++ webservices/sandesha/trunk/c/src/util/spec_specific_consts.c Thu Jul 13 00:32:53 2006
@@ -17,6 +17,8 @@
#include <sandesha2/sandesha2_spec_specific_consts.h>
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_error.h>
+#include <axis2_string.h>
+#include <axis2_addr.h>
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_spec_specific_consts_get_spec_ver_str(const axis2_env_t *env,
@@ -107,4 +109,24 @@
}
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_spec_specific_consts_get_default_spec_version(const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_SPEC_VERSION_1_0;
+}
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_spec_specific_consts_get_anon_uri(const axis2_env_t *env,
+ axis2_char_t *addr_ns_val)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK(env->error, addr_ns_val, NULL);
+
+ if(0 == AXIS2_STRCMP(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_val))
+ return AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
+ else if(0 == AXIS2_STRCMP(AXIS2_WSA_NAMESPACE, addr_ns_val))
+ return AXIS2_WSA_ANONYMOUS_URL;
+
+ return NULL;
+}
Modified: webservices/sandesha/trunk/c/src/util/utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/utils.c?rev=421524&r1=421523&r2=421524&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/utils.c Thu Jul 13 00:32:53 2006
@@ -343,3 +343,23 @@
/*TODO implement when the persistent storage is avalable */
return NULL;
}
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+sandesha2_utils_get_svr_side_incoming_seq_id(const axis2_env_t *env,
+ axis2_char_t *incoming_seq_id)
+{
+ axis2_char_t *start_str = NULL;
+ axis2_char_t *ret = NULL;
+ int start_len = 0;
+
+ AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_PARAM_CHECK(env->error, incoming_seq_id, NULL);
+
+ start_str = axis2_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", NULL);
+ start_len = AXIS2_STRLEN(start_str);
+ if(0 != AXIS2_STRNCMP(incoming_seq_id, start_str, start_len))
+ return NULL;
+ ret = AXIS2_STRDUP((incoming_seq_id + start_len * sizeof(axis2_char_t)), env);
+
+ return ret;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org