You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/12/14 10:56:22 UTC
svn commit: r356762 - in /webservices/axis2/trunk/c: include/axis2_svc.h
modules/core/context/src/svc_ctx.c modules/core/description/src/svc.c
modules/core/description/src/svc_grp.c modules/core/engine/src/conf.c
modules/wsdl/src/wsdl_svc.c
Author: damitha
Date: Wed Dec 14 01:56:03 2005
New Revision: 356762
URL: http://svn.apache.org/viewcvs?rev=356762&view=rev
Log:
axis2_svc_get_name replaced with axis2_cvs_get_qname
Modified:
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/modules/core/context/src/svc_ctx.c
webservices/axis2/trunk/c/modules/core/description/src/svc.c
webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
webservices/axis2/trunk/c/modules/core/engine/src/conf.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c
Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc.h?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Wed Dec 14 01:56:03 2005
@@ -569,7 +569,7 @@
#define AXIS2_SVC_GET_ENDPOINT(svc, env, qname) \
(svc->ops->get_endpoint(svc, env, qname))
-#define AXIS2_SVC_GET_NAMESPACE(svc, env) \
+#define AXIS2_SVC_GET_QNAMESPACE(svc, env) \
(svc->ops->get_namespace(svc, env))
#define AXIS2_SVC_ADD_MAPPING(svc, env, mapping_key, axis2_opt) \
Modified: webservices/axis2/trunk/c/modules/core/context/src/svc_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/svc_ctx.c?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/svc_ctx.c Wed Dec 14 01:56:03 2005
@@ -88,7 +88,7 @@
if (svc)
{
svc_ctx_impl->svc = svc;
- svc_ctx_impl->svc_qname = AXIS2_SVC_GET_NAME(svc, env);
+ svc_ctx_impl->svc_qname = AXIS2_SVC_GET_QNAME(svc, env);
if (svc_ctx_impl->svc_qname)
{
svc_ctx_impl->svc_id = AXIS2_QNAME_GET_LOCALPART(svc_ctx_impl->svc_qname, env);
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Wed Dec 14 01:56:03 2005
@@ -226,7 +226,7 @@
axis2_qname_t * qname);
axis2_char_t * AXIS2_CALL
-axis2_svc_get_namespace(axis2_svc_t *svc,
+axis2_svc_get_qnamespace(axis2_svc_t *svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
@@ -446,7 +446,7 @@
svc_impl->svc.ops->get_endpoint = axis2_svc_get_endpoint;
- svc_impl->svc.ops->get_namespace = axis2_svc_get_namespace;
+ svc_impl->svc.ops->get_namespace = axis2_svc_get_qnamespace;
svc_impl->svc.ops->add_mapping = axis2_svc_add_mapping;
@@ -1372,7 +1372,7 @@
}
axis2_char_t * AXIS2_CALL
-axis2_svc_get_namespace(axis2_svc_t *svc,
+axis2_svc_get_qnamespace(axis2_svc_t *svc,
axis2_env_t **env)
{
return AXIS2_WSDL_SVC_GET_NAMESPACE(svc->wsdl_svc, env);
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c Wed Dec 14 01:56:03 2005
@@ -387,7 +387,7 @@
if(!svc_grp_impl->svcs)
return AXIS2_FAILURE;
}
- axis2_hash_set (svc_grp_impl->svcs, AXIS2_SVC_GET_NAME(svc, env),
+ axis2_hash_set (svc_grp_impl->svcs, AXIS2_SVC_GET_QNAME(svc, env),
sizeof(axis2_qname_t), svc);
handler_resolver = axis2_phase_resolver_create_with_config_and_svc(env,
@@ -396,7 +396,7 @@
if(NULL == handler_resolver)
{
/* Remove the previously added service */
- axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_NAME(svc, env), sizeof(
+ axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_QNAME(svc, env), sizeof(
axis2_qname_t), NULL);
return AXIS2_FAILURE;
@@ -406,7 +406,7 @@
if(AXIS2_FAILURE == status)
{
/* Remove the previously added service */
- axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_NAME(svc, env), sizeof(
+ axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_QNAME(svc, env), sizeof(
axis2_qname_t), NULL);
AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
return AXIS2_FAILURE;
@@ -416,7 +416,7 @@
if(AXIS2_FAILURE == status)
{
/* Remove the previously added service */
- axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_NAME(svc, env), sizeof(
+ axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_QNAME(svc, env), sizeof(
axis2_qname_t), NULL);
AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
return status;
@@ -426,7 +426,7 @@
if(AXIS2_FAILURE == status)
{
/* Remove the previously added service */
- axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_NAME(svc, env), sizeof(
+ axis2_hash_set(svc_grp_impl->svcs, AXIS2_SVC_GET_QNAME(svc, env), sizeof(
axis2_qname_t), NULL);
AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
return status;
Modified: webservices/axis2/trunk/c/modules/core/engine/src/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/conf.c?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/conf.c Wed Dec 14 01:56:03 2005
@@ -771,7 +771,7 @@
{
axis2_hash_this (index_i, NULL, NULL, &value);
desc = (struct axis2_svc *) value;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_NAME(desc, env), env);
+ svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(desc, env), env);
svc_name2 = axis2_hash_get(config_impl->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
@@ -796,7 +796,7 @@
{
axis2_hash_this (index_i, NULL, NULL, &value);
desc = (struct axis2_svc *) value;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_NAME(desc, env), env);
+ svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(desc, env), env);
axis2_hash_set(config_impl->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
desc);
/* notifyObservers(AxisEvent.SERVICE_DEPLOY ,description); */
@@ -878,7 +878,7 @@
}
- svc_grp_qname = AXIS2_SVC_GET_NAME(svc, env);
+ svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
if(NULL == svc_grp_qname)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC,
@@ -1261,7 +1261,7 @@
{
axis2_hash_this(index_j, NULL, NULL, &value2);
svc = (struct axis2_svc *) value2;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_NAME(svc, env), env);
+ svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(svc, env), env);
axis2_hash_set(config_impl->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c?rev=356762&r1=356761&r2=356762&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c Wed Dec 14 01:56:03 2005
@@ -50,7 +50,7 @@
axis2_env_t **env);
axis2_qname_t * AXIS2_CALL
-axis2_svc_get_name(axis2_wsdl_svc_t *wsdl_svc,
+axis2_svc_get_qname(axis2_wsdl_svc_t *wsdl_svc,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
@@ -139,7 +139,7 @@
}
wsdl_svc_impl->wsdl_svc.ops->free = axis2_wsdl_svc_free;
- wsdl_svc_impl->wsdl_svc.ops->get_name = axis2_svc_get_name;
+ wsdl_svc_impl->wsdl_svc.ops->get_name = axis2_svc_get_qname;
wsdl_svc_impl->wsdl_svc.ops->set_name = axis2_svc_set_name;
wsdl_svc_impl->wsdl_svc.ops->get_endpoints = axis2_wsdl_svc_get_endpoints;
wsdl_svc_impl->wsdl_svc.ops->set_endpoints = axis2_wsdl_svc_set_endpoints;