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 da...@apache.org on 2006/07/12 07:26:43 UTC
svn commit: r421132 - in /webservices/sandesha/trunk/c: include/sandesha2/
src/client/ src/util/
Author: damitha
Date: Tue Jul 11 22:26:41 2006
New Revision: 421132
URL: http://svn.apache.org/viewvc?rev=421132&view=rev
Log:
Fixed compile errors of spec_specific_consts and utils.c
Modified:
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h
webservices/sandesha/trunk/c/include/sandesha2/sandesha2_spec_specific_consts.h
webservices/sandesha/trunk/c/src/client/sandesha_client.c
webservices/sandesha/trunk/c/src/util/Makefile.am
webservices/sandesha/trunk/c/src/util/error.c
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_error.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h?rev=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2/sandesha2_error.h Tue Jul 11 22:26:41 2006
@@ -95,6 +95,8 @@
SANDESHA2_ERROR_STORAGE_MAP_NOT_PRESENT,
/* Entry is not present for updating */
SANDESHA2_ERROR_ENTRY_IS_NOT_PRESENT_FOR_UPDATING,
+ /* Invalid namespace uri */
+ SANDESHA2_ERROR_INVALID_NS_URI,
/** The following has to be the last error value all the time.
All other error codes should appear above this.
SANDESHA_ERROR_LAST is used to track the number of error codes present
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=421132&r1=421131&r2=421132&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 Tue Jul 11 22:26:41 2006
@@ -22,6 +22,13 @@
* @brief
*/
+#include <axis2_allocator.h>
+#include <axis2_env.h>
+#include <axis2_error.h>
+#include <axis2_string.h>
+#include <axis2_utils.h>
+#include <axis2_hash.h>
+#include <axis2_uri.h>
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/src/client/sandesha_client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/sandesha_client.c?rev=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/client/sandesha_client.c (original)
+++ webservices/sandesha/trunk/c/src/client/sandesha_client.c Tue Jul 11 22:26:41 2006
@@ -16,6 +16,7 @@
#include <sandesha2_client.h>
#include <sandesha2_seq_report.h>
+#include <sandesha2_storage_mgr.h>
#include <sandesha2_client_constants.h>
#include <axis2_svc_client.h>
#include <axis2_svc_ctx.h>
@@ -185,7 +186,7 @@
}
sandesha2_seq_report_t *AXIS2_CALL
-sandesha2_client_get_outgoing_seq_report_with_seq_key(
+sandesha2_client_get_outgoing_seq_report_with_internal_seq_id(
sandesha2_client_t *sandesha2_client,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
@@ -193,10 +194,10 @@
{
sandesha2_client_impl_t *schema_impl = NULL;
sandesha2_seq_report_t *seq_report = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, to, NULL);
- AXIS2_PARAM_CHECK(env->error, seq_key, NULL);
+ AXIS2_PARAM_CHECK(env->error, internal_seq_id, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
schema_impl = SANDESHA2_INTF_TO_IMPL(schema);
@@ -204,7 +205,7 @@
SANDESHSA2_SEQ_REPORT_SET_SEQ_DIRECTION(seq_report, env,
SANDESHA2_SEQ_DIRECTION_OUT);
-
+ storage_mgr = SANDESHA2_UTIL_GET_STORAGE_MGR(
}
Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?rev=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Tue Jul 11 22:26:41 2006
@@ -1,7 +1,9 @@
noinst_LTLIBRARIES = libsandesha_util.la
libsandesha_util_la_SOURCES = \
- error.c
+ error.c \
+ utils.c \
+ spec_specific_consts.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=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/error.c (original)
+++ webservices/sandesha/trunk/c/src/util/error.c Tue Jul 11 22:26:41 2006
@@ -90,7 +90,12 @@
"Storage Map not present";
sandesha2_error_messages[SANDESHA2_ERROR_ENTRY_IS_NOT_PRESENT_FOR_UPDATING] =
"Entry is not present for updating";
-
+ sandesha2_error_messages[SANDESHA2_ERROR_INVALID_NS_URI] =
+ "Invalid namespace uri";
+ sandesha2_error_messages[SANDESHA2_ERROR_INVALID_SPEC_VERSION] =
+ "Invalid Spec Version";
+
+
return AXIS2_SUCCESS;
}
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=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/spec_specific_consts.c (original)
+++ webservices/sandesha/trunk/c/src/util/spec_specific_consts.c Tue Jul 11 22:26:41 2006
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#include <sandesha2/sandehsa2_spec_specific_consts.h>
-#include <sandesha2/sandehsa2_consts.h>
+#include <sandesha2/sandesha2_spec_specific_consts.h>
+#include <sandesha2/sandesha2_constants.h>
+#include <sandesha2/sandesha2_error.h>
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
sandesha2_spec_specific_consts_get_spec_ver_str(const axis2_env_t *env,
@@ -38,7 +39,7 @@
AXIS2_FAILURE);
return NULL;
}
- return NULL
+ return NULL;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
@@ -75,7 +76,7 @@
}
else
{
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VER,
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VERSION,
AXIS2_FAILURE);
return AXIS2_FALSE;
}
@@ -98,7 +99,7 @@
}
else
{
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VER,
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VERSION,
AXIS2_FAILURE);
return AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/util/utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/utils.c?rev=421132&r1=421131&r2=421132&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/utils.c Tue Jul 11 22:26:41 2006
@@ -20,7 +20,7 @@
#include <sandesha2/sandesha2_constants.h>
#include <sandesha2/sandesha2_in_order_invoker.h>
#include <sandesha2/sandesha2_transport_sender.h>
-#include <sandesha2/sandesha2_seq_property_bean_mgr.h>
+#include <sandesha2_seq_property_mgr.h>
#include <sandesha2/sandesha2_error.h>
#include <axis2_string.h>
#include <axis2_conf.h>
@@ -84,16 +84,16 @@
axis2_char_t *key,
sandesha2_storage_mgr_t *storage_man)
{
- sandesha2_seq_property_bean_mgr_t *seq_prop_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_man = NULL;
sandesha2_seq_property_bean_t *rm_version_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
- rm_version_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_man,
+ rm_version_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_man,
env, key, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(NULL == rm_version_bean)
return NULL;
@@ -137,7 +137,7 @@
axis2_char_t *name,
sandesha2_storage_mgr_t *storage_man)
{
- sandesha2_seq_property_bean_mgr_t *seq_prop_man = NULL;
+ sandesha2_seq_property_mgr_t *seq_prop_man = NULL;
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -145,9 +145,9 @@
AXIS2_PARAM_CHECK(env->error, name, NULL);
AXIS2_PARAM_CHECK(env->error, storage_man, NULL);
- seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_BEAN_MGR(
+ seq_prop_man = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
- seq_prop_bean = SANDESHA2_SEQ_PROPERTY_BEAN_MGR_RETRIEVE(seq_prop_man,
+ seq_prop_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_man,
env, id, name);
if(NULL == seq_prop_bean)
return NULL;
@@ -343,4 +343,3 @@
/*TODO implement when the persistent storage is avalable */
return NULL;
}
->>>>>>> .r420768
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org