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 da...@apache.org on 2005/11/09 10:12:40 UTC
svn commit: r332009 - in /webservices/axis2/trunk/c: include/axis2_om_node.h
include/axis2_svc.h include/axis2_wsdl_svc.h
modules/core/description/src/svc.c modules/wsdl/src/wsdl_svc.c
Author: damitha
Date: Wed Nov 9 01:12:27 2005
New Revision: 332009
URL: http://svn.apache.org/viewcvs?rev=332009&view=rev
Log:
put and end of line to om_node.h. wsdl_svc.c is ok
Modified:
webservices/axis2/trunk/c/include/axis2_om_node.h
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
webservices/axis2/trunk/c/modules/core/description/src/svc.c
webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c
Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=332009&r1=332008&r2=332009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Wed Nov 9 01:12:27 2005
@@ -334,4 +334,4 @@
}
#endif
-#endif /* AXIS2_OM_NODE_H */
\ No newline at end of file
+#endif /* AXIS2_OM_NODE_H */
Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc.h?rev=332009&r1=332008&r2=332009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Wed Nov 9 01:12:27 2005
@@ -24,6 +24,7 @@
#include <axis2_core.h>
#include <axis2_param_container.h>
+#include <axis2_wsdl_svc.h>
#include <axis2_operation.h>
#include <axis2_svc_grp.h>
#include <axis2_qname.h>
@@ -76,6 +77,10 @@
struct axis2_svc_grp_s *(AXIS2_CALL *get_parent) (axis2_svc_t *svc,
axis2_env_t **env);
+ axis2_status_t (AXIS2_CALL *set_name) (const axis2_svc_t *svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
+
axis2_qname_t *(AXIS2_CALL *get_name) (const axis2_svc_t *svc,
axis2_env_t **env);
@@ -141,7 +146,9 @@
(svc, env, svc_grp));
#define AXIS2_SVC_GET_PARENT(svc, env) (svc->ops->get_parent (svc, env));
-
+
+#define AXIS2_SVC_SET_NAME(svc, env, qname) (svc->ops->set_name(svc , env, qname));
+
#define AXIS2_SVC_GET_NAME(svc, env) (svc->ops->get_name(svc , env));
#define AXIS2_SVC_ADD_PARAM(svc, env, param) (svc->ops->add_param(svc , env, param));
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_svc.h?rev=332009&r1=332008&r2=332009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_svc.h Wed Nov 9 01:12:27 2005
@@ -29,6 +29,7 @@
#include <axis2_allocator.h>
#include <axis2_string.h>
#include <axis2_hash.h>
+#include <axis2_qname.h>
#include <axis2_wsdl_component.h>
@@ -57,6 +58,20 @@
axis2_status_t (AXIS2_CALL *free) (axis2_wsdl_svc_t *wsdl_svc,
axis2_env_t **env);
+ /**
+ * Get wsdl service name
+ * @return wsdl service name
+ */
+ axis2_qname_t * (AXIS2_CALL *get_name)(axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env);
+
+ /**
+ * Set wsdl serivce name
+ * @param set wsdl service name
+ */
+ axis2_status_t (AXIS2_CALL *set_name) (axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
};
/**
@@ -66,6 +81,7 @@
struct axis2_wsdl_svc_s
{
axis2_wsdl_svc_ops_t *ops;
+
};
/** create Wsdl Service struct
@@ -79,7 +95,11 @@
#define AXIS2_WSDL_SERVICE_FREE(wsdl_svc, env) ((wsdl_svc->ops)->free (wsdl_svc, \
env))
+#define AXIS2_WSDL_SERVICE_GET_NAME(wsdl_svc, env) \
+ ((wsdl_svc->ops)->get_name (wsdl_svc, env))
+#define AXIS2_WSDL_SERVICE_SET_NAME(wsdl_svc, env, qname) \
+ ((wsdl_svc->ops)->set_name (wsdl_svc, env, qname))
/**************************** End of function macros **************************/
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=332009&r1=332008&r2=332009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Wed Nov 9 01:12:27 2005
@@ -10,6 +10,7 @@
{
axis2_svc_t svc;
axis2_param_container_t *param_container;
+ axis2_wsdl_svc_t *wsdl_svc;
axis2_svc_grp_t *parent;
axis2_hash_t *wasaction_opeartionmap;
axis2_qname_t *qname;
@@ -44,7 +45,12 @@
axis2_svc_grp_t * AXIS2_CALL
axis2_svc_get_parent (axis2_svc_t *svc, axis2_env_t **env);
-
+
+axis2_status_t AXIS2_CALL
+axis2_svc_set_name (const axis2_svc_t *svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
+
axis2_qname_t * AXIS2_CALL
axis2_svc_get_name (const axis2_svc_t *svc, axis2_env_t **env);
@@ -91,21 +97,31 @@
svc_impl->svc.ops->get_operations = axis2_svc_get_operations;
svc_impl->svc.ops->set_parent = axis2_svc_set_parent;
svc_impl->svc.ops->get_parent = axis2_svc_get_parent;
+ svc_impl->svc.ops->set_name = axis2_svc_set_name;
svc_impl->svc.ops->get_name = axis2_svc_get_name;
svc_impl->svc.ops->add_param = axis2_svc_add_param;
svc_impl->svc.ops->get_param = axis2_svc_get_param;
svc_impl->svc.ops->get_params = axis2_svc_get_params;
- axis2_param_container_t *param_container
- = (axis2_param_container_t *)
+ axis2_param_container_t *param_container = (axis2_param_container_t *)
axis2_param_container_create(env);
if(NULL == param_container)
{
AXIS2_FREE((*env)->allocator, svc_impl);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
}
+
+ svc_impl->param_container = param_container;
+
+ axis2_wsdl_svc_t *wsdl_svc = (axis2_wsdl_svc_t *)
+ axis2_param_container_create(env);
+ if(NULL == wsdl_svc)
+ {
+ AXIS2_FREE((*env)->allocator, svc_impl);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ }
- svc_impl->param_container = param_container;
+ svc_impl->wsdl_svc = wsdl_svc;
svc_impl->parent = NULL;
@@ -152,6 +168,10 @@
AXIS2_PARAM_CONTAINER_FREE(AXIS2_INTF_TO_IMPL(svc)->param_container
, env);
+ if(NULL != AXIS2_INTF_TO_IMPL(svc)->wsdl_svc)
+ AXIS2_PARAM_CONTAINER_FREE(AXIS2_INTF_TO_IMPL(svc)->wsdl_svc
+ , env);
+
if(NULL != AXIS2_INTF_TO_IMPL(svc)->parent)
AXIS2_SVC_GRP_FREE(AXIS2_INTF_TO_IMPL(svc)->parent, env);
@@ -262,12 +282,23 @@
return AXIS2_INTF_TO_IMPL(svc)->parent;
}
+axis2_status_t AXIS2_CALL
+axis2_svc_set_name (const axis2_svc_t *svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname)
+{
+ AXIS2_FUNC_PARAM_CHECK(svc, env, AXIS2_FAILURE);
+ AXIS2_WSDL_SERVICE_SET_NAME(AXIS2_INTF_TO_IMPL(svc)->wsdl_svc, env, qname);
+
+ return AXIS2_SUCCESS;
+}
+
axis2_qname_t * AXIS2_CALL
axis2_svc_get_name (const axis2_svc_t *svc,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
- return AXIS2_INTF_TO_IMPL(svc)->qname;
+ return AXIS2_WSDL_SERVICE_GET_NAME(AXIS2_INTF_TO_IMPL(svc)->wsdl_svc, env);
}
axis2_status_t AXIS2_CALL
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=332009&r1=332008&r2=332009&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c Wed Nov 9 01:12:27 2005
@@ -25,6 +25,7 @@
struct axis2_wsdl_svc_impl_s
{
axis2_wsdl_svc_t wsdl_svc;
+ axis2_qname_t *qname;
};
@@ -36,6 +37,14 @@
axis2_wsdl_svc_free(axis2_wsdl_svc_t *wsdl_svc,
axis2_env_t **env);
+axis2_qname_t * AXIS2_CALL
+axis2_svc_get_name(axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_set_name(axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
/***************************** End of function headers ************************/
@@ -62,6 +71,8 @@
}
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->set_name = axis2_svc_set_name;
return &(wsdl_svc_impl->wsdl_svc);
}
@@ -79,4 +90,24 @@
AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(wsdl_svc));
return AXIS2_SUCCESS;
+}
+
+axis2_qname_t * AXIS2_CALL
+axis2_svc_get_name(axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(wsdl_svc, env, AXIS2_FAILURE);
+ return AXIS2_INTF_TO_IMPL(wsdl_svc)->qname;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_svc_set_name(axis2_wsdl_svc_t *wsdl_svc,
+ axis2_env_t **env,
+ axis2_qname_t *qname)
+{
+ AXIS2_FUNC_PARAM_CHECK(wsdl_svc, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+ AXIS2_INTF_TO_IMPL(wsdl_svc)->qname = qname;
+
+ return AXIS2_SUCCESS;
}