Author: sahan
Date: Wed Jul 12 22:25:27 2006
New Revision: 421503
URL: http://svn.apache.org/viewvc?rev=421503&view=rev
Log:
1. Addind fault_data
2. Fixing a build break
3. Correcting some typos
Added:
webservices/sandesha/trunk/c/src/util/fault_data.c
Modified:
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq.h
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_data.h
webservices/sandesha/trunk/c/src/Makefile.am
webservices/sandesha/trunk/c/src/fault_manager.c
webservices/sandesha/trunk/c/src/util/Makefile.am
webservices/sandesha/trunk/c/src/util/error.c
Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_constants.h Wed
Jul 12 22:25:27 2006
@@ -331,8 +331,6 @@
#define SANDESHA2_SOAP_FAULT_TYPE_LAST_MESSAGE_NO_EXCEEDED 5
- #define SANDESHA2_PROPERTIES_
-
#define SANDESHA2_PROPERTIES_RETRANSMISSION_INTERVAL
"RetransmissionInterval"
#define SANDESHA2_PROPERTIES_ACK_INTERVAL "AcknowledgementInterval"
Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq.h?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_create_seq.h Wed
Jul 12 22:25:27 2006
@@ -96,7 +96,7 @@
#define SANDESHA2_CREATE_SEQ_SET_SEQ_OFFER(create_seq, env, seq_offer) \
((create_seq)->ops->set_seq_offer(create_seq, env, seq_offer))
#define SANDESHA2_CREATE_SEQ_GET_SEQ_OFFER(create_seq, env) \
- ((create_seq)->ops->set_seq_offer (create_seq, env))
+ ((create_seq)->ops->get_seq_offer (create_seq, env))
/************************** End of function macros
****************************/
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_data.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_data.h?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_data.h
(original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_fault_data.h Wed
Jul 12 22:25:27 2006
@@ -89,7 +89,7 @@
set_code)
(sandesha2_fault_data_t *data,
const axis2_env_t *env,
- axis2_char_t *sub_code);
+ axis2_char_t *code);
int (AXIS2_CALL *
get_type)
Modified: webservices/sandesha/trunk/c/src/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/Makefile.am?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/Makefile.am Wed Jul 12 22:25:27 2006
@@ -1,5 +1,4 @@
-#SUBDIRS = wsrm storage util transport workers
-SUBDIRS =
+SUBDIRS = wsrm storage util transport workers
noinst_LTLIBRARIES = libsandesha2.la
libsandesha2_la_SOURCES = msg_ctx.c\
Modified: webservices/sandesha/trunk/c/src/fault_manager.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/fault_manager.c?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/fault_manager.c (original)
+++ webservices/sandesha/trunk/c/src/fault_manager.c Wed Jul 12 22:25:27 2006
@@ -29,7 +29,7 @@
/**
* @brief Fault Manager struct impl
- * Sandesha2 Message Context
+ * Sandesha2 Fault Manager
*/
typedef struct sandesha2_fault_mgr_impl sandesha2_fault_mgr_impl_t;
Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Wed Jul 12 22:25:27 2006
@@ -3,7 +3,8 @@
libsandesha_util_la_SOURCES = \
error.c \
utils.c \
- spec_specific_consts.c
+ spec_specific_consts.c\
+ fault_data.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
Modified: webservices/sandesha/trunk/c/src/util/error.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/error.c?rev=421503&r1=421502&r2=421503&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/error.c (original)
+++ webservices/sandesha/trunk/c/src/util/error.c Wed Jul 12 22:25:27 2006
@@ -125,7 +125,7 @@
if (!error)
return NULL;
- error->ops->get_extended_message = sandesha2_error_impl_get_message;
+ /*error->ops->get_extended_message = sandesha2_error_impl_get_message;*/
error->ops->set_error_number = sandesha2_error_impl_set_error_number;
error->ops->set_status_code = sandesha2_error_impl_set_status_code;
error->ops->get_status_code = sandesha2_error_impl_get_status_code;
Added: webservices/sandesha/trunk/c/src/util/fault_data.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_data.c?rev=421503&view=auto
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_data.c (added)
+++ webservices/sandesha/trunk/c/src/util/fault_data.c Wed Jul 12 22:25:27 2006
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <sandesha2_fault_data.h>
+#include <sandesha2/sandesha2_constants.h>
+#include <axis2_string.h>
+
+
+/**
+ * @brief Fault Data struct impl
+ * Sandesha2 Fault Data
+ */
+typedef struct sandesha2_fault_data_impl sandesha2_fault_data_impl_t;
+
+struct sandesha2_fault_data_impl
+{
+ sandesha2_fault_data_t data;
+ int type;
+ axis2_char_t *code;
+ axis2_char_t *sub_code;
+ axis2_char_t *reason;
+ axis2_char_t *seq_id;
+ axiom_node_t *detail;
+};
+
+#define SANDESHA2_INTF_TO_IMPL(data) \
+ ((sandesha2_fault_data_impl_t *)(data))
+
+/***************************** Function headers
*******************************/
+axiom_node_t *AXIS2_CALL
+sandesha2_fault_data_get_detail
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_detail
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axiom_node_t *detail);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_reason
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_reason
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *reason);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_sub_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_sub_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *sub_code);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *code);
+
+int AXIS2_CALL
+sandesha2_fault_data_get_type
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_type
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ int type);
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_seq_id
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_seq_id
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id);
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_free
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env);
+
+/***************************** End of function headers
************************/
+
+AXIS2_EXTERN sandesha2_fault_data_t* AXIS2_CALL
+sandesha2_fault_data_create(const axis2_env_t *env)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+ AXIS2_ENV_CHECK(env, NULL);
+
+ fault_data_impl = (sandesha2_fault_data_impl_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_fault_data_impl_t));
+
+ if(NULL == fault_data_impl)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
+ return NULL;
+ }
+ fault_data_impl->type = -1;
+ fault_data_impl->code = NULL;
+ fault_data_impl->sub_code = NULL;
+ fault_data_impl->reason = NULL;
+ fault_data_impl->seq_id = NULL;
+ fault_data_impl->detail = NULL;
+
+ fault_data_impl->data.ops = AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_fault_data_ops_t));
+ if(NULL == fault_data_impl->data.ops)
+ {
+
sandesha2_fault_data_free((sandesha2_fault_data_t*)fault_data_impl,
+ env);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ fault_data_impl->data.ops->get_detail = sandesha2_fault_data_get_detail;
+ fault_data_impl->data.ops->set_detail = sandesha2_fault_data_set_detail;
+ fault_data_impl->data.ops->get_reason = sandesha2_fault_data_get_reason;
+ fault_data_impl->data.ops->set_reason = sandesha2_fault_data_set_reason;
+ fault_data_impl->data.ops->get_sub_code =
sandesha2_fault_data_get_sub_code;
+ fault_data_impl->data.ops->set_sub_code =
sandesha2_fault_data_set_sub_code;
+ fault_data_impl->data.ops->get_code = sandesha2_fault_data_get_code;
+ fault_data_impl->data.ops->set_code = sandesha2_fault_data_set_code;
+ fault_data_impl->data.ops->get_type = sandesha2_fault_data_get_type;
+ fault_data_impl->data.ops->set_type = sandesha2_fault_data_set_type;
+ fault_data_impl->data.ops->get_seq_id = sandesha2_fault_data_get_seq_id;
+ fault_data_impl->data.ops->set_seq_id = sandesha2_fault_data_set_seq_id;
+ fault_data_impl->data.ops->free = sandesha2_fault_data_free;
+
+ return &(fault_data_impl->data);
+}
+
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_free(sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
+ fault_data_impl->type = -1;
+ if(NULL != fault_data_impl->code)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->code);
+ fault_data_impl->code = NULL;
+ }
+ if(NULL != fault_data_impl->sub_code)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->sub_code);
+ fault_data_impl->sub_code = NULL;
+ }
+ if(NULL != fault_data_impl->reason)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->reason);
+ fault_data_impl->reason = NULL;
+ }
+ if(NULL != fault_data_impl->seq_id)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->seq_id);
+ fault_data_impl->seq_id = NULL;
+ }
+ /* Not sure we have to free this.
+ * TODO consider in memory cleaning stage
+ */
+ fault_data_impl->detail = NULL;
+
+ if(NULL != data->ops)
+ {
+ AXIS2_FREE(env->allocator, data->ops);
+ data->ops = NULL;
+ }
+ AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(data));
+ return AXIS2_SUCCESS;
+}
+
+axiom_node_t *AXIS2_CALL
+sandesha2_fault_data_get_detail
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_INTF_TO_IMPL(data)->detail;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_detail
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axiom_node_t *detail)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, detail, AXIS2_FAILURE);
+
+ SANDESHA2_INTF_TO_IMPL(data)->detail = detail;
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_reason
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_INTF_TO_IMPL(data)->reason;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_reason
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *reason)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, reason, AXIS2_FAILURE);
+
+ fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
+ if(NULL != fault_data_impl->reason)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->reason);
+ fault_data_impl->reason = NULL;
+ }
+ fault_data_impl->reason = AXIS2_STRDUP(reason, env);
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_sub_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_INTF_TO_IMPL(data)->sub_code;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_sub_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *sub_code)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, sub_code, AXIS2_FAILURE);
+
+ fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
+ if(NULL != fault_data_impl->sub_code)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->sub_code);
+ fault_data_impl->sub_code = NULL;
+ }
+ fault_data_impl->sub_code = AXIS2_STRDUP(sub_code, env);
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_INTF_TO_IMPL(data)->code;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_code
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *code)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, code, AXIS2_FAILURE);
+
+ fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
+ if(NULL != fault_data_impl->code)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->code);
+ fault_data_impl->code = NULL;
+ }
+ fault_data_impl->code = AXIS2_STRDUP(code, env);
+ return AXIS2_SUCCESS;
+}
+
+int AXIS2_CALL
+sandesha2_fault_data_get_type
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, -1);
+ return SANDESHA2_INTF_TO_IMPL(data)->type;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_type
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ int type)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ SANDESHA2_INTF_TO_IMPL(data)->type = type;
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+sandesha2_fault_data_get_seq_id
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return SANDESHA2_INTF_TO_IMPL(data)->seq_id;
+}
+
+axis2_status_t AXIS2_CALL
+sandesha2_fault_data_set_seq_id
+ (sandesha2_fault_data_t *data,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
+{
+ sandesha2_fault_data_impl_t *fault_data_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
+
+ fault_data_impl = SANDESHA2_INTF_TO_IMPL(data);
+ if(NULL != fault_data_impl->seq_id)
+ {
+ AXIS2_FREE(env->allocator, fault_data_impl->seq_id);
+ fault_data_impl->seq_id = NULL;
+ }
+ fault_data_impl->seq_id = AXIS2_STRDUP(seq_id, env);
+ return AXIS2_SUCCESS;
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
