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/08 10:35:49 UTC
svn commit: r331754 - in /webservices/axis2/trunk/c: include/axis2_env.h
include/axis2_svc.h include/axis2_wsdl_operation.h modules/util/src/env.c
Author: damitha
Date: Tue Nov 8 01:35:39 2005
New Revision: 331754
URL: http://svn.apache.org/viewcvs?rev=331754&view=rev
Log:
Create default error in env create with one para
Modified:
webservices/axis2/trunk/c/include/axis2_env.h
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
webservices/axis2/trunk/c/modules/util/src/env.c
Modified: webservices/axis2/trunk/c/include/axis2_env.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_env.h?rev=331754&r1=331753&r2=331754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/include/axis2_env.h Tue Nov 8 01:35:39 2005
@@ -24,7 +24,7 @@
*/
#include <axis2_allocator.h>
-#include <axis2_error.h>
+#include <axis2_error_default.h>
#include <axis2_stream.h>
#include <axis2_log.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=331754&r1=331753&r2=331754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Tue Nov 8 01:35:39 2005
@@ -27,6 +27,7 @@
#include <axis2_operation.h>
#include <axis2_svc_grp.h>
#include <axis2_qname.h>
+#include <axis2_error.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_operation.h?rev=331754&r1=331753&r2=331754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_operation.h Tue Nov 8 01:35:39 2005
@@ -38,10 +38,6 @@
{
#endif
-/** @cond */
-struct axis2_wsdl_operation_ops_s;
-struct axis2_wsdl_operation_s;
-/** @endcond */
typedef struct axis2_wsdl_operation_ops_s axis2_wsdl_operation_ops_t;
typedef struct axis2_wsdl_operation_s axis2_wsdl_operation_t;
@@ -51,50 +47,7 @@
* @{
*/
-/** @} */
-/**
- * @defgroup axis2_wsdl_operation WSDL Operation
- * @ingroup axis2_wsdl
- * @{
- */
-
-/**************************** Start of function macros ************************/
-
-#define AXIS2_WSDL_OPERATION_FREE(env, wsdl_opt) \
- ((wsdl_opt->ops)->free (env, wsdl_opt))
-
-#define AXIS2_WSDL_OPERATION_GET_MSG_EXCHANGE_PATTERN(env, wsdl_opt, pattern) \
- ((wsdl_opt->ops)->get_msg_exchange_pattern(env, wsdl_opt, pattern))
-
-#define AXIS2_WSDL_OPERATION_SET_MSG_EXCHANGE_PATTERN(env, wsdl_opt, pattern) \
- ((wsdl_opt->ops)->set_msg_exchange_pattern(env, wsdl_opt, pattern))
-
-#define AXIS2_WSDL_OPERATION_GET_NAME(env, wsdl_opt, name) \
- ((wsdl_opt->ops)->get_name(env, wsdl_opt, name))
-
-#define AXIS2_WSDL_OPERATION_SET_NAME(env, wsdl_opt, name) \
- ((wsdl_opt->ops)->set_name(env, wsdl_opt, name))
-
-#define AXIS2_WSDL_OPERATION_SET_STYLE(env, wsdl_opt, style) \
- ((wsdl_opt->ops)->get_style(env, wsdl_opt, style))
-
-#define AXIS2_WSDL_OPERATION_GET_STYLE(env, wsdl_opt, style) \
- ((wsdl_opt->ops)->set_style(env, wsdl_opt, style))
-
-#define AXIS2_WSDL_OPERATION_SET_COMPONENT_PROPERTIES(env, wsdl_opt, properties) \
- ((wsdl_opt->ops)->set_component_properties(env, wsdl_opt, properties))
-
-#define AXIS2_WSDL_OPERATION_GET_COMPONENT_PROPERTIES(env, wsdl_opt, properties) \
- ((wsdl_opt->ops)->get_component_properties(env, wsdl_opt, properties))
-
-#define AXIS2_WSDL_OPERATION_SET_COMPONENT_PROPERTY(env, wsdl_opt, property) \
- ((wsdl_opt->ops)->set_component_property(env, wsdl_opt, property))
-
-#define AXIS2_WSDL_OPERATION_GET_COMPONENT_PROPERTY(env, wsdl_opt, property) \
- ((wsdl_opt->ops)->get_component_property(env, wsdl_opt, property))
-
-/**************************** End of function macros **************************/
/**************************** Function pointers *******************************/
/** Deallocate memory
@@ -178,31 +131,42 @@
, const void *key, void *value);
-/**
- * Gets the component property
- *
- * @param void* key for the map search.
- * @return void* value for the key
- */
-typedef axis2_status_t (*axis2_wsdl_operation_get_component_property_t)
- (axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
- , const void *key, void **value) ;
+
+typedef ;
/*************************** End of function pointers *************************/
struct axis2_wsdl_operation_ops_s
{
axis2_wsdl_operation_free_t free;
+
axis2_wsdl_operation_get_msg_exchange_pattern_t get_msg_exchange_pattern;
+
axis2_wsdl_operation_set_msg_exchange_pattern_t set_msg_exchange_pattern;
+
axis2_wsdl_operation_get_name_t get_name;
+
axis2_wsdl_operation_set_name_t set_name;
+
axis2_wsdl_operation_get_style_t get_style;
+
axis2_wsdl_operation_set_style_t set_style;
+
axis2_wsdl_operation_set_component_properties_t set_component_properties;
+
axis2_wsdl_operation_get_component_properties_t get_component_properties;
+
axis2_wsdl_operation_set_component_property_t set_component_property;
- axis2_wsdl_operation_get_component_property_t get_component_property;
+
+ /**
+ * Gets the component property
+ *
+ * @param void* key for the map search.
+ * @return void* value for the key
+ */
+ axis2_status_t (*get_component_property)
+ (axis2_env_t *env, axis2_wsdl_operation_t *wsdl_opt
+ , const void *key, void **value) ;
};
@@ -213,6 +177,43 @@
axis2_status_t axis2_wsdl_operation_create
(axis2_env_t *env, axis2_wsdl_operation_t **wsdl_opt);
+
+/**************************** Start of function macros ************************/
+
+#define AXIS2_WSDL_OPERATION_FREE(wsdl_opt, env) \
+ ((wsdl_opt->ops)->free (wsdl_opt, env))
+
+#define AXIS2_WSDL_OPERATION_GET_MSG_EXCHANGE_PATTERN(wsdl_opt, env, pattern) \
+ ((wsdl_opt->ops)->get_msg_exchange_pattern(wsdl_opt, env, pattern))
+
+#define AXIS2_WSDL_OPERATION_SET_MSG_EXCHANGE_PATTERN(wsdl_opt, env, pattern) \
+ ((wsdl_opt->ops)->set_msg_exchange_pattern(wsdl_opt, env, pattern))
+
+#define AXIS2_WSDL_OPERATION_GET_NAME(wsdl_opt, env, name) \
+ ((wsdl_opt->ops)->get_name(wsdl_opt, env, name))
+
+#define AXIS2_WSDL_OPERATION_SET_NAME(wsdl_opt, env, name) \
+ ((wsdl_opt->ops)->set_name(wsdl_opt, env, name))
+
+#define AXIS2_WSDL_OPERATION_SET_STYLE(wsdl_opt, env, style) \
+ ((wsdl_opt->ops)->get_style(wsdl_opt, env, style))
+
+#define AXIS2_WSDL_OPERATION_GET_STYLE(wsdl_opt, env, style) \
+ ((wsdl_opt->ops)->set_style(wsdl_opt, env, style))
+
+#define AXIS2_WSDL_OPERATION_SET_COMPONENT_PROPERTIES(wsdl_opt, env, properties) \
+ ((wsdl_opt->ops)->set_component_properties(wsdl_opt, env, properties))
+
+#define AXIS2_WSDL_OPERATION_GET_COMPONENT_PROPERTIES(wsdl_opt, env, properties) \
+ ((wsdl_opt->ops)->get_component_properties(wsdl_opt, env, properties))
+
+#define AXIS2_WSDL_OPERATION_SET_COMPONENT_PROPERTY(wsdl_opt, env, property) \
+ ((wsdl_opt->ops)->set_component_property(wsdl_opt, env, property))
+
+#define AXIS2_WSDL_OPERATION_GET_COMPONENT_PROPERTY(wsdl_opt, env, property) \
+ ((wsdl_opt->ops)->get_component_property(wsdl_opt, env, property))
+
+/**************************** End of function macros **************************/
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/src/env.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/env.c?rev=331754&r1=331753&r2=331754&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/env.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/env.c Tue Nov 8 01:35:39 2005
@@ -51,6 +51,11 @@
return NULL;
environment->allocator = allocator;
+
+ /* Create default error */
+ environment->error = axis2_error_create (allocator);
+ if(NULL == environment->error)
+ return NULL;
return environment;