You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/02/15 03:22:49 UTC
svn commit: r377922 - in /webservices/axis2/trunk/c/modules/core:
clientapi/call.c clientapi/msg_sender.c clientapi/stub.c context/conf_ctx.c
util/core_utils.c
Author: samisa
Date: Tue Feb 14 18:22:46 2006
New Revision: 377922
URL: http://svn.apache.org/viewcvs?rev=377922&view=rev
Log:
Fixed the places where UUID was hard coded, using axis2_uuid_gen
Modified:
webservices/axis2/trunk/c/modules/core/clientapi/call.c
webservices/axis2/trunk/c/modules/core/clientapi/msg_sender.c
webservices/axis2/trunk/c/modules/core/clientapi/stub.c
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=377922&r1=377921&r2=377922&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Tue Feb 14 18:22:46 2006
@@ -24,6 +24,7 @@
#include <axis2_engine.h>
#include <axis2_soap_body.h>
#include <axis2_conf_init.h>
+#include <axis2_uuid_gen.h>
typedef struct axis2_call_impl
{
@@ -333,7 +334,7 @@
axis2_svc_ctx_t *svc_ctx = NULL;
axis2_svc_t *svc = NULL;
/* The message ID is sent all the time */
- axis2_char_t *message_id = "uuid:"; /* TODO UUIDGenerator.getUUID()*/
+ axis2_char_t *message_id = axis2_uuid_gen(env);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -492,7 +493,7 @@
return status;
/* Use message id all the time! */
- message_id = "uuid:"; /* TODO UUIDGenerator.getUUID() */
+ message_id = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, message_id);
if (call_impl->use_separate_listener)
Modified: webservices/axis2/trunk/c/modules/core/clientapi/msg_sender.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/msg_sender.c?rev=377922&r1=377921&r2=377922&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/msg_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/msg_sender.c Tue Feb 14 18:22:46 2006
@@ -19,6 +19,7 @@
#include <axis2_svc_ctx.h>
#include <axis2_engine.h>
#include <axis2_msg_info_headers.h>
+#include <axis2_uuid_gen.h>
typedef struct axis2_msg_sender_impl axis2_msg_sender_impl_t;
@@ -171,7 +172,7 @@
return AXIS2_FAILURE;
AXIS2_MSG_CTX_SET_MSG_INFO_HEADERS(msg_ctx, env,
msg_sender_impl->msg_info_headers);
- message_id = "uuid:"; /* TODO UUIDGenerator.getUUID()*/
+ message_id = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, message_id);
svc_ctx = AXIS2_MEP_CLIENT_GET_SVC_CTX(msg_sender_impl->base, env);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/stub.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/stub.c?rev=377922&r1=377921&r2=377922&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Tue Feb 14 18:22:46 2006
@@ -20,6 +20,7 @@
#include <axis2_om_stax_builder.h>
#include <axis2_soap_header.h>
#include <axis2_soap_body.h>
+#include <axis2_uuid_gen.h>
/**
* @brief
@@ -522,8 +523,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- /* TODO Get the UUID generator to generate values */
- return "uuid";
+ return axis2_uuid_gen(env);
}
axis2_om_node_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?rev=377922&r1=377921&r2=377922&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Tue Feb 14 18:22:46 2006
@@ -17,6 +17,7 @@
#include <axis2_conf_ctx.h>
#include <axis2_svc_grp.h>
#include <axis2.h>
+#include <axis2_uuid_gen.h>
typedef struct axis2_conf_ctx_impl
{
@@ -516,11 +517,7 @@
if (!svc_grp_ctx_id)
{
- /** TODO generate ID and set it*/
- /*
- svc_grp_ctx_id = UUIDGenerator.getUUID();
- */
- svc_grp_ctx_id = "uuid_svc_grp";
+ svc_grp_ctx_id = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_ctx_id);
}
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/util/core_utils.c?rev=377922&r1=377921&r2=377922&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Tue Feb 14 18:22:46 2006
@@ -20,6 +20,7 @@
#include <axis2_relates_to.h>
#include <axis2_addr.h>
#include <axis2_http_transport.h>
+#include <axis2_uuid_gen.h>
AXIS2_DECLARE(axis2_msg_ctx_t *)
axis2_core_utils_create_out_msg_ctx(axis2_env_t **env,
@@ -68,9 +69,7 @@
{
return NULL;
}
- /* TODO UUID is hard coded until it is generated */
- AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, "UUID");
- /*messageInformationHeaders.setMessageId(UUIDGenerator.getUUID());*/
+ AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, axis2_uuid_gen(env));
reply_to = AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(old_msg_info_headers, env);
AXIS2_MSG_INFO_HEADERS_SET_TO(msg_info_headers, env, reply_to);