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/10/19 04:20:08 UTC

svn commit: r326329 - in /webservices/axis2/trunk/c: ides/anjuta/ include/ modules/core/description/src/

Author: damitha
Date: Tue Oct 18 19:19:51 2005
New Revision: 326329

URL: http://svn.apache.org/viewcvs?rev=326329&view=rev
Log:
updated axis2c.prj. Removed axis2_module_description.*.
Some work on information model

Modified:
    webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
    webservices/axis2/trunk/c/include/axis2_description_module.h
    webservices/axis2/trunk/c/include/axis2_description_operation.h
    webservices/axis2/trunk/c/include/axis2_description_param_include.h
    webservices/axis2/trunk/c/include/axis2_description_parameter.h
    webservices/axis2/trunk/c/include/axis2_description_service.h
    webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
    webservices/axis2/trunk/c/include/axis2_engine_config.h
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_module.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c

Modified: webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/ides/anjuta/axis2c.prj?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/anjuta/axis2c.prj (original)
+++ webservices/axis2/trunk/c/ides/anjuta/axis2c.prj Tue Oct 18 19:19:51 2005
@@ -121,7 +121,6 @@
 module.source.files=\
 	modules/common/src/axis2.c\
 	modules/core/description/src/axis2_description_param_include.c\
-	modules/core/description/src/axis2_module_description.c\
 	modules/core/engine/src/axis2_engine_config.c\
 	modules/core/description/test/description_test.c\
 	modules/common/test/common_test.c\

Modified: webservices/axis2/trunk/c/include/axis2_description_module.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_module.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_module.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_module.h Tue Oct 18 19:19:51 2005
@@ -1,18 +1,22 @@
-#ifndef AXIS2_MODULE_DESCRIPTION_H
-#define AXIS2_MODULE_DESCRIPTION_H
+#ifndef AXIS2_DESCRIPTION_MODULE_H
+#define AXIS2_DESCRIPTION_MODULE_H
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <axis2.h>
+#include <axis2_error.h>
+#include <axis2_defines.h>
+#include <axis2_environment.h>
+#include <axis2_allocator.h>
+#include <axis2_string.h>
+#include <axis2_hash.h>
+
 #include <axis2_qname.h>
-#include <axis2_operation_description.h>
+#include <axis2_description_operation.h>
 #include <axis2_engine_config.h>
 #include <axis2_description_param_include.h>
-#include <axis2_om_node.h>
-#include <apr_hash.h>
+/*#include <axis2_om_node.h> */
 
 /**
- * @file axis2_module_description.h
+ * @file axis2_description_module.h
  * @brief Parameter handling
  */
 
@@ -23,53 +27,53 @@
 {
     axis2_qname_t *qname;
     axis2_engine_config_t *parent;
-    axis2_parameter_t *parameters;
-    axis2_operation_description_t *operations;
+    axis2_description_param_t *paras;
+    axis2_description_operation_t *operation_desc;
 
-} axis2_module_description_t;
+} axis2_description_module_t;
 
-void axis2_module_description_free (axis2_module_description_t *
+void axis2_description_module_free (axis2_description_module_t *
                                      module_description);
 
 /** Create a module description */
-axis2_module_description_t *axis2_module_description_create ();
+axis2_description_module_t *axis2_description_module_create ();
 
 /** To set a name */
-void setName (axis2_module_description_t * module_description,
+void setName (axis2_description_module_t * module_description,
               axis2_qname_t * name);
 
 axis2_qname_t
-    *axis2_module_description_get_name (axis2_module_description_t *
-                                         module_description);
+    *axis2_description_module_get_name (axis2_description_module_t *
+                                         module_desc);
 
 /** To add an parameter*/
-void axis2_module_description_add_parameter (axis2_module_description_t *
-                                              module_description,
-                                              axis2_parameter_t * param);
+void axis2_description_module_add_parameter (axis2_description_module_t *
+                                              module_desc,
+                                              axis2_description_param_t *param);
 
 /** To get all the parameters*/
-axis2_parameter_t *axis2_module_description_get_parameters (axis2_module_description_t *
-                                               module_description);
+axis2_description_param_t *axis2_description_module_get_parameters (axis2_description_module_t *
+                                               module_desc);
 
 /** To add an operation */
-void axis2_module_description_add_operation (axis2_module_description_t *
-                                              module_description,
-                                              axis2_operation_description_t *
+void axis2_description_module_add_operation (axis2_description_module_t *
+                                              module_desc,
+                                              axis2_description_operation_t *
                                               operation);
 
 /** To get all the module_operations*/
-axis2_operation_description_t
-    * axis2_module_description_get_operations (axis2_module_description_t *
-                                                module_description);
+axis2_description_operation_t
+    * axis2_description_module_get_operations (axis2_description_module_t *
+                                                module_desc);
 
-void axis2_module_description_set_parent (axis2_module_description_t *
-                                           module_description,
+void axis2_description_module_set_parent (axis2_description_module_t *
+                                           module_descr,
                                            axis2_engine_config_t *
                                            parent);
 
 axis2_engine_config_t
-    *axis2_module_description_get_parent (axis2_module_description_t *
-                                           module_description);
+    *axis2_description_module_get_parent (axis2_description_module_t *
+                                           module_desc);
 
 
-#endif //AXIS2_MODULE_DESCRIPTION_H
+#endif /*AXIS2_DESCRIPTION_MODULE_H */

Modified: webservices/axis2/trunk/c/include/axis2_description_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_operation.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_operation.h Tue Oct 18 19:19:51 2005
@@ -7,49 +7,91 @@
 #include <axis2_environment.h>
 #include <axis2_allocator.h>
 #include <axis2_string.h>
+#include <axis2_hash.h>
 
+#include <axis2_core.h>
 #include <axis2_description_param_include.h>
+#include <axis2_description_service.h>
 
-struct axis2_description_operation_s;
-struct axis2_description_operation_ops_s;
-typedef struct axis2_description_operation_s axis2_description_operation_t;
-typedef struct axis2_description_operation_ops_s 
-		axis2_description_operation_ops_t;
+/************************** Start of function macros **************************/
+	
+#define axis2_description_operation_free(env, operation_desc) \
+		(axis2_description_operation_get_ops(env, \
+		operation_desc)->free (env, operation_desc));
 
+#define axis2_description_operation_add_param(env, operation_desc, param) \
+		(axis2_description_operation_get_ops(env, \
+		operation_desc)->add_param (env, operation_desc, param));
 
-axis2_description_operation_t 
-		*axis2_description_operation_create (axis2_environment_t *env);
+#define axis2_description_operation_get_param get_param(env, operation_desc) \
+		(axis2_description_operation_get_ops(env, \
+		operation_desc)->get_param (env, operation_desc));
 
-axis2_description_operation_t 
-		*create_axis2_description_operation_with_param_include (
-		, axis2_environment_t *env
-		, axis2_description_param_include_t* param_include);
+#define axis2_description_operation_get_params get_params(env, operation_desc) \
+		(axis2_description_operation_get_ops(env, \
+		operation_desc)->get_params (env, operation_desc));
 
-axis2_description_operation_t *create_axis2_description_operation_with_name 
-		(axis2_environment_t *env
-		, axis2_description_param_include_t *param_include
-		, axis2_qname_t *name);
+#define axis2_description_operation_set_parent(env, operation_desc, \
+		service_desc) (axis2_description_operation_get_ops(env, \
+		operation_desc)->set_parent (env, operation_desc, service_desc));
+
+#define axis2_description_operation_get_parent(env, operation_desc) \
+		(axis2_description_operation_get_ops(env, \
+		operation_desc)->get_parent (env, operation_desc));
+	
 
-int axis2_description_operation_free (axis2_environment_t *env
+/************************** End of function macros ****************************/
+
+/************************** Start of function pointers ************************/
+
+typedef axis2_status_t (*axis2_description_operation_free_t) 
+		(axis2_environment_t *env
 		, axis2_description_operation_t *operation_desc);
 
-int axis2_description_operation_add_parameter(axis2_environment_t *env
-		, axis2_description_operation_t *operation_desc
+typedef axis2_status_t (*axis2_description_operation_add_param_t)
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
 		, axis2_description_param_t *param);
 
-axis2_description_param_t *axis2_description_operation_get_parameter
-		(axis2_description_operation_t *operation_desc
+typedef axis2_description_param_t *(*axis2_description_operation_get_param_t)
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *name);
 
-axis2_description_param_t *axis2_description_operation_get_params
-		(axis2_description_operation_t *operation_desc);
+typedef axis2_hash_t *(*axis2_description_operation_get_params_t)
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc);
 
-int axis2_description_operation_set_parent(axis2_environment_t *env
+typedef axis2_status_t (*axis2_description_operation_set_parent_t)
+		(axis2_environment_t *env
 		, axis2_description_operation_t *operation_desc
 		, axis2_description_service_t *service_desc);
 
-axis2_service_description_t *axis2_description_operation_get_parent
+typedef axis2_description_service_t *(*axis2_description_operation_get_parent_t)
 		(axis2_environment_t *env
 		, axis2_description_operation_t *operation_desc);
+		
+/**************************** End of function pointers ************************/
+
+struct axis2_description_operation_ops_s
+{
+	axis2_description_operation_free_t free;
+
+	axis2_description_operation_add_param_t add_param;
+
+	axis2_description_operation_get_param_t get_param;
+
+	axis2_description_operation_get_params_t get_params;
+
+	axis2_description_operation_set_parent_t set_parent;
+
+	axis2_description_operation_get_parent_t get_parent;
+};
+
+axis2_description_operation_t *axis2_description_operation_get_ops
+		(axis2_environment_t *env);
+
+axis2_description_operation_t 
+		*axis2_description_operation_create (axis2_environment_t *env);
 
-#endif //AXIS2_DESCRIPTION_OPERATION_H
+axis2_description_operation_t *axis2_description_operation_create_with_name 
+		(axis2_environment_t *env, axis2_qname_t *name);
+		
+#endif /* AXIS2_DESCRIPTION_OPERATION_H */

Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Tue Oct 18 19:19:51 2005
@@ -52,19 +52,31 @@
  * @{
  */	
 
-/** @cond */
-struct axis2_description_param_include_ops_s;
+/*************************** Function macros **********************************/
+
+#define axis2_description_param_include_free(env, param_include) \
+	(axis2_description_param_include_get_ops(env, param_include)->free (env, \
+	param_include))
+	
+#define axis2_description_param_include_add_param(env, param_include, \
+	param) (axis2_description_param_include_get_ops(env, \
+	param_include)->add_param (env, param_include, param))
 	
-struct axis2_description_param_include_s;
-/** @endcond */	
+#define axis2_description_param_include_get_param(env, param_include) \
+	(axis2_description_param_include_get_ops(env, \
+	param_include)->get_param (env, param_include))
 	
-typedef struct axis2_description_param_include_ops_s 
-		axis2_description_param_include_ops_t;
+#define axis2_description_param_include_get_params(env, param_include) \
+	(axis2_description_param_include_get_ops(env, \
+	param_include)->get_params (env, param_include))
 	
-typedef struct axis2_description_param_include_s 
-		axis2_description_param_include_t;
+#define axis2_description_param_include_is_param_locked(env, \
+	param_include) (axis2_description_param_include_get_ops(env, \
+	param_include)->is_param_locked (env, param_include))
 
-/* Function pointers */
+/*************************** End of function macros ***************************/
+
+/***************************** Function pointers ******************************/
 
 /** Deallocate memory
   * @return status code
@@ -77,7 +89,7 @@
   * @param parameters
   * @return status code
   */
-typedef axis2_status_t (*axis2_description_param_include_add_parameter_t)
+typedef axis2_status_t (*axis2_description_param_include_add_param_t)
     	(axis2_environment_t *env
 		, axis2_description_param_include_t *param_include
      	,const axis2_description_param_t *param);
@@ -86,7 +98,7 @@
   * @param parameter name
   * @return parameter
   */
-typedef axis2_description_param_t *(*axis2_description_param_include_get_parameter_t)
+typedef axis2_description_param_t *(*axis2_description_param_include_get_param_t)
     	(axis2_environment_t *env
 		, axis2_description_param_include_t *param_include
 		, const axis2_char_t *name);
@@ -94,7 +106,7 @@
 /** To get all the parameters in a given description
   * @return all the parameters contained
   */
-typedef axis2_hash_t *(*axis2_description_param_include_get_parameters_t)
+typedef axis2_hash_t *(*axis2_description_param_include_get_params_t)
     	(axis2_environment_t *env
 		, axis2_description_param_include_t *param_include);
 
@@ -102,12 +114,13 @@
   * @param parameter name
   * @return whether parameter is locked
   */
-typedef axis2_bool_t (*axis2_description_param_include_is_parameter_locked_t)
+typedef axis2_bool_t (*axis2_description_param_include_is_param_locked_t)
     	(axis2_environment_t *env
 		, axis2_description_param_include_t *param_include
 		, const axis2_char_t *param_name);
 
-/* End of function pointers */
+/****************************** End of function pointers **********************/
+
 /**
   * Paramter can be any thing it can be XML element with number of child 
   * elements
@@ -116,13 +129,13 @@
 {
 	axis2_description_param_include_free_t free;
 	
-    axis2_description_param_include_add_parameter_t add_parameter;
+    axis2_description_param_include_add_param_t add_param;
 	
-	axis2_description_param_include_get_parameter_t get_parameter;
+	axis2_description_param_include_get_param_t get_param;
 	
-	axis2_description_param_include_get_parameters_t get_parameters;
+	axis2_description_param_include_get_params_t get_params;
 	
-	axis2_description_param_include_is_parameter_locked_t is_parameter_locked;
+	axis2_description_param_include_is_param_locked_t is_param_locked;
 	
 };
 

Modified: webservices/axis2/trunk/c/include/axis2_description_parameter.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_parameter.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_parameter.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_parameter.h Tue Oct 18 19:19:51 2005
@@ -28,6 +28,7 @@
 #include <axis2_environment.h>
 #include <axis2_allocator.h>
 #include <axis2_string.h>
+#include <axis2_core.h>
 
 /*#include <axis2_om_element.h>*/
 
@@ -49,15 +50,36 @@
  * @{
  */	
  
-/** @cond */
-struct axis2_description_param_ops_s;
-struct axis2_description_param_s;
-/** @endcond */
+/************************* Start of function macros ***************************/
 
-typedef struct axis2_description_param_ops_s axis2_description_param_ops_t;
-typedef struct axis2_description_param_s axis2_description_param_t;
+#define axis2_description_param_free(env, param) \
+	(axis2_description_param_get_ops(env, param)->free (env, param))
+
+#define axis2_description_param_set_name(env, param, name) \
+	(axis2_description_param_get_ops(env, param)->set_name (env, param \
+	, name))
+
+#define axis2_description_param_get_name(env, param) \
+	(axis2_description_param_get_ops(env, param)->get_name (env, param))
+	
+#define axis2_description_param_set_value(env, param, value) \
+	(axis2_description_param_get_ops(env, param)->set_value (env \
+	, param, value))
+
+#define axis2_description_param_get_value(env, param) \
+	(axis2_description_param_get_ops(env, param)->get_value (env, param))
+	
+#define axis2_description_param_is_locked(env, param) \
+	(axis2_description_param_get_ops(env, param)->is_locked (env, param))
+	
+#define axis2_description_param_set_locked(env, param, locked) \
+	(axis2_description_param_get_ops(env, param)->set_locked (env \
+	, param, locked))
+	
+/*********************** End of function macros *******************************/
+
+/***********************Start of function pointers ****************************/
 
-/* Function pointers */
 /**
   * memeory deallocation operation
   * @return Status code
@@ -152,7 +174,7 @@
 typedef int (*axis2_description_param_get_type_t) 
 	(axis2_environment_t *env, axis2_description_param_t *param);
 
-/* End of function pointers */
+/************************ End of function pointers ****************************/
 
 typedef enum axis2_parameter_types {
     AXIS2_PARAMETER_INVALID = -1,
@@ -204,31 +226,6 @@
 axis2_description_param_t *axis2_description_param_create_with_name_value 
 	(axis2_environment_t *env, const axis2_char_t *name
 	, const axis2_char_t *value);
-
-
-#define axis2_description_param_free(env, param) \
-	(axis2_description_param_get_ops(env, param)->free (env, param))
-
-#define axis2_description_param_set_name(env, param, name) \
-	(axis2_description_param_get_ops(env, param)->set_name (env, param \
-	, name))
-
-#define axis2_description_param_get_name(env, param) \
-	(axis2_description_param_get_ops(env, param)->get_name (env, param))
-	
-#define axis2_description_param_set_value(env, param, value) \
-	(axis2_description_param_get_ops(env, param)->set_value (env \
-	, param, value))
-
-#define axis2_description_param_get_value(env, param) \
-	(axis2_description_param_get_ops(env, param)->get_value (env, param))
-	
-#define axis2_description_param_is_locked(env, param) \
-	(axis2_description_param_get_ops(env, param)->is_locked (env, param))
-	
-#define axis2_description_param_set_locked(env, param, locked) \
-	(axis2_description_param_get_ops(env, param)->set_locked (env \
-	, param, locked))
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_description_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_service.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_service.h Tue Oct 18 19:19:51 2005
@@ -7,44 +7,86 @@
 #include <axis2_environment.h>
 #include <axis2_allocator.h>
 #include <axis2_string.h>
+#include <axis2_hash.h>
 
+#include <axis2_core.h>
 #include <axis2_description_param_include.h>
 #include <axis2_description_operation.h>
 #include <axis2_description_servicegroup.h>
+#include <axis2_qname.h>
+	
+/**************************** Function pointers *******************************/
+
+typedef axis2_status_t *(*axis2_description_service_free_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
 
-struct axis2_description_service_s;
-struct axis2_description_service_ops_s;
-typedef axis2_description_service_s axis2_description_service_t;
-typedef axis2_description_service_ops_s axis2_description_service_ops_t;
+typedef axis2_status_t (*axis2_description_service_add_operation_t) 
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_description_operation_t *operation_desc);
+
+typedef axis2_status_t (*axis2_description_service_add_param_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_description_param_t *param);
+
+typedef axis2_description_param_t *(*axis2_description_service_get_param_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t *name);
+
+typedef axis2_hash_t *(*axis2_description_service_get_params_t) 
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+
+typedef axis2_description_operation_t *(*axis2_description_service_get_operation_with_qname_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_qname_t *operation_name);
+		
+typedef axis2_description_operation_t 
+		*(*axis2_description_service_get_operation_with_name_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t* operation_name);
 
-axis2_description_operation_t *axis2_description_service_get_operation_with_qname(
-	axis2_description_service_t *service_desc, axis2_qname_t *operation_name);
+typedef axis2_hash_t *(*axis2_description_service_get_operations_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+	
+typedef axis2_status_t (*axis2_description_service_set_parent_t) 
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		,axis2_description_servicegroup_t *servicegroup_desc);
+
+typedef axis2_description_servicegroup_t 
+		*(*axis2_description_service_get_parent_t)
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+
+/************************ End function pointers *******************************/
+
+struct axis2_description_service_ops_s
+{
+	axis2_description_service_free_t free;
+	
+	axis2_description_service_add_operation_t add_operation;
 
-void axis2_description_service_add_operation(axis2_description_service_t
-	*service_desc, axis2_description_operation_t *operation_desc);
+	axis2_description_service_add_param_t add_param;
 
-void axis2_description_service_add_parameter(axis2_description_service_t
-	*operation_desc, axis2_parameter_t *param);
+	axis2_description_service_get_param_t get_param;
 
-axis2_parameter_t *axis2_description_service_get_parameter(
-	axis2_description_service_t *service_desc, axis2_char_t *name);
+	axis2_description_service_get_params_t get_params;
 
-axis2_parameter_t *axis2_description_service_get_parameters(
-	axis2_description_operation_t *service_desc);
+	axis2_description_service_get_operation_with_qname_t 
+		get_operation_with_qname;
 
-axis2_description_operation_t *axis2_description_service_get_operation_with_char(
-	axis2_description_service_t *service_desc, axis2_char_t* operation_name);
+	axis2_description_service_get_operation_with_name_t get_operation_with_name;
 
-apr_hash_t *axis2_description_service_get_operations(
-	axis2_description_service_t *service_desc);
+	axis2_description_service_get_operations_t get_operations;
 	
-void setParent(axis2_description_service_t *service_description
-	,axis2_servicegroup_description_t *servicegroup_desc);
+	axis2_description_service_set_parent_t set_parent;
+
+	axis2_description_service_get_parent_t get_parent;
+
+};
 
-axis2_servicegroup_description_t *axis2_description_service_getParent
-(axis2_description_service_t *service_desc);
+/******************************************************************************/
+axis2_description_service_ops_t * axis2_description_service_get_ops
+		(axis2_environment_t *env);
 
 axis2_description_service_t *axis2_description_service_create_with_qname
-	(axis2_environment_t *env);
+		(axis2_environment_t *env);
 
 #endif /* AXIS2_DESCRIPTION_SERVICE_H */

Modified: webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_servicegroup.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_servicegroup.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_servicegroup.h Tue Oct 18 19:19:51 2005
@@ -7,18 +7,28 @@
 #include <axis2_environment.h>
 #include <axis2_allocator.h>
 #include <axis2_string.h>
+#include <axis2_hash.h>
 
+#include <axis2_core.h>
 #include <axis2_description_param_include.h>
 #include <axis2_description_service.h>
 
-struct axis2_description_servicegroup_s;
-struct axis2_description_servicegroup_ops_s;
-typedef axis2_description_servicegroup_s axis2_description_servicegroup_t;
-typedef axis2_description_servicegroup_ops_s 
-		axis2_description_servicegroup_ops_t;
+/**************************** Function pointers *******************************/
 
-void axis2_description_servicegroup_add_service(axis2_environment_t *env
+typedef axis2_status_t (*axis2_description_servicegroup_add_service_t)
+		(axis2_environment_t *env
 		, axis2_description_servicegroup_t* service_group);
 
+/*************************** End of function pointers *************************/
+
+struct axis2_description_servicegroup_ops_s
+{
+	axis2_description_servicegroup_add_service_t add_service;	
+};
+
+/******************************************************************************/
+
+axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
+		(axis2_environment_t *env);
 
 #endif /* AXIS2_DESCRIPTION_SERVICEGROUP_H	*/

Modified: webservices/axis2/trunk/c/include/axis2_engine_config.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_engine_config.h?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_engine_config.h (original)
+++ webservices/axis2/trunk/c/include/axis2_engine_config.h Tue Oct 18 19:19:51 2005
@@ -17,17 +17,24 @@
 #ifndef AXIS2_ENGINE_CONFIG_H
 #define AXIS2_ENGINE_CONFIG_H
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <axis2_description_param_include.h>
-#include <axis2_servicegroup_description.h>
-
 /**
  * @file axis2_engine_config.h
  * @brief Global states of all the Axis can
  *        can be accessed here
  */
+
+#include <axis2.h>
+#include <axis2_error.h>
+#include <axis2_defines.h>
+#include <axis2_environment.h>
+#include <axis2_allocator.h>
+#include <axis2_string.h>
+#include <axis2_core.h>
+
+#include <axis2_description_param_include.h>
+#include <axis2_description_servicegroup.h>
+
+
 /**
  * The palce where all the global states of Axis is accessed.
  * All the global states kept in the <code>EngineRegistry</code> and all the
@@ -42,15 +49,15 @@
 {
     axis2_description_param_include_t * param_include;
     axis2_qname_t *name;
-    apr_hash_t *service_groups;
+    axis2_hash_t *service_groups;
     
 } axis2_engine_config_t;
 
 void axis2_engine_config_add_service_group(axis2_engine_config_t *engine_config
-    , axis2_servicegroup_description_t *service_group_desc);
+    , axis2_description_servicegroup_t *service_group_desc);
 
 void axis2_engine_config_add_service(axis2_engine_config_t *engine_config, 
-    axis2_service_description_t *service_desc);
+    axis2_description_service_t *service_desc);
 
 void axis2_engine_config_get_service(axis2_engine_config_t *engine_config,
     char* service_name);

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_module.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_module.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_module.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_module.c Tue Oct 18 19:19:51 2005
@@ -1 +1 @@
-#include <axis2_module_description.h>
+#include <axis2_description_module.h>

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c Tue Oct 18 19:19:51 2005
@@ -7,107 +7,131 @@
   */
 struct axis2_description_operation_s
 {
+	axis2_description_operation_ops_t *ops;
 	axis2_description_param_include_t *param_include;
-	axis2_service_description_t *parent;
+	axis2_description_service_t *parent;
 	axis2_qname_t *name;	
 
 };
 
-axis2_description_operation_t *axis2_description_operation_create 
+	
+/*************************** Function headers *********************************/
+
+axis2_status_t axis2_description_operation_ops_free (axis2_environment_t *env
+		, axis2_description_operation_t *operation_desc);	
+
+axis2_status_t axis2_description_operation_ops_add_param
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		, axis2_description_param_t *param);
+
+axis2_description_param_t *axis2_description_operation_ops_get_param
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		, const axis2_char_t *name);
+
+axis2_hash_t *axis2_description_operation_ops_get_params
+		(axis2_environment_t *env
+		, axis2_description_operation_t *operation_desc);
+
+axis2_status_t axis2_description_operation_ops_set_parent
+		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
+		, axis2_description_service_t *service_desc);
+
+axis2_description_service_t *axis2_description_operation_ops_get_parent
+		(axis2_environment_t *env
+		, axis2_description_operation_t *operation_desc);
+		
+/************************* End of function headers ****************************/	
+
+axis2_description_operation_t *axis2_description_operation_get_ops
 		(axis2_environment_t *env)
 {
-	axis2_description_param_include_t * param_include = NULL;
-	axis2_description_operation_t *operation_desc 
-		= (axis2_description_operation_t *)
-			malloc (sizeof (axis2_description_operation_t));
-	if(operation_desc)
-	{
-		
-		param_include = (axis2_description_param_include_t *)
-			create_axis2_description_param_include();		
-		if(param_include)
-		{
-			operation_desc->param_include = param_include;
-			operation_desc->parent = NULL;			
-						
-			return operation_desc;
-		}
-		else
-			fprintf(stderr, "*** error_code:%d, %s\n"
-			, AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
-			
-	}
-	else
-		fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
 	return NULL;
 }
 
-axis2_description_operation_t 
-		*axis2_description_operation_create_with_param_include 
-		(axis2_environment_t *env
-		, axis2_description_param_include_t* param_include)
+axis2_description_operation_t *axis2_description_operation_create_local 
+		(axis2_environment_t *env)
 {
+	axis2_description_operation_ops_t *ops = NULL;
 	axis2_description_operation_t *operation_desc = 
-		(axis2_description_operation_t *)
-		malloc (sizeof (axis2_description_operation_t));
-	if(operation_desc)
-	{
-		if(!param_include)
-			param_include = (axis2_description_param_include_t *)
-				create_axis2_description_param_include();
-		if(param_include)
-		{
-			operation_desc->param_include = param_include;
-			operation_desc->parent = NULL;
-			return operation_desc;
-		}
-		else
-			fprintf(stderr, "*** error_code:%d, %s\n"
-			, AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
-			
+		(axis2_description_operation_t *) axis2_malloc (env->allocator
+		, sizeof (axis2_description_operation_t));
+	if(!operation_desc)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
 	}
-	else
-		fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
-	return NULL;
+	ops = (axis2_description_operation_ops_t *) axis2_malloc(env->allocator,
+		sizeof(axis2_description_operation_ops_t));
+	if(!ops)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
+	}		
+
+	ops->free = axis2_description_operation_ops_free;
+	ops->add_param = axis2_description_operation_ops_add_param;
+	ops->get_param = axis2_description_operation_ops_get_param;
+	ops->get_params = axis2_description_operation_ops_get_params;
+	/*ops->set_parent = axis2_description_operation_ops_set_parent;
+	ops->get_parent = axis2_description_ops_operation_ops_get_parent;*/
+	
+	operation_desc->ops = ops;
+	operation_desc->param_include = NULL;
+	operation_desc->name = NULL;
+	/*operation_desc->parent = NULL;*/
+						
+	return operation_desc;
 }
 
-axis2_description_operation_t *create_axis2_description_operation_with_name 
-		(axis2_environment_t *env
-		, axis2_description_param_include_t *param_include, axis2_qname_t *name)
+axis2_description_operation_t *axis2_description_operation_create 
+		(axis2_environment_t *env)
 {
-	axis2_description_operation_t *operation_desc = 
-		(axis2_description_operation_t *)
-		malloc (sizeof (axis2_description_operation_t));
-	if(operation_desc)
-	{
-		if(!param_include)
-			param_include = (axis2_description_param_include_t *)
-				create_axis2_description_param_include();
-		if(param_include)
-		{
-			operation_desc->param_include = param_include;
-			if(name)
-				operation_desc->name = name;
-			operation_desc->parent = NULL;
-			return operation_desc;
-		}
-		else
-			fprintf(stderr, "*** error_code:%d, %s\n"
-			, AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
+	axis2_description_param_include_t * param_include = NULL;
+	axis2_description_operation_t *operation_desc 
+		= axis2_description_operation_create_local(env);
+	
+	if(!operation_desc)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
+	}
 			
+	param_include = (axis2_description_param_include_t *)
+		axis2_description_param_include_create(env);		
+	if(!param_include)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
 	}
-	else
-		fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_MEMORY_ALLOCATION");
-	return NULL;
+
+	operation_desc->param_include = param_include;
+						
+	return operation_desc;
+}
+
+axis2_description_operation_t *axis2_description_operation_create_with_name 
+		(axis2_environment_t *env, axis2_qname_t *name)
+{
+	axis2_description_operation_t *operation_desc 
+		= axis2_description_operation_create_local(env);
+	
+	if(!operation_desc)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
+	}
+	if(!name)
+	{
+		env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+		return NULL;
+	}		
+						
+	return operation_desc;	
 }
 
-axis2_status_t axis2_description_operation_free (axis2_environment_t *env
+/******************************************************************************/
+
+axis2_status_t axis2_description_operation_ops_free (axis2_environment_t *env
 		, axis2_description_operation_t *operation_desc)
 {
 	if(operation_desc){
@@ -117,36 +141,53 @@
 	return AXIS2_FAILURE;
 }	
 	
-axis2_status_t axis2_description_operation_add_parameter
+axis2_status_t axis2_description_operation_ops_add_param
 		(axis2_environment_t *env, axis2_description_operation_t *operation_desc
-		, axis2_parameter_t *param)
+		, axis2_description_param_t *param)
 {
-	apr_hash_set (operation_desc->param_include->parameters, param->name
-		, APR_HASH_KEY_STRING, param);	
+	axis2_hash_set (axis2_description_param_include_get_params(env
+		, operation_desc->param_include), axis2_description_param_get_name(env
+		, param)
+		, AXIS2_HASH_KEY_STRING, param);	
 	return AXIS2_SUCCESS;
 	
 }
 
-axis2_description_param_t *axis2_description_operation_get_parameter(
+axis2_description_param_t *axis2_description_operation_ops_get_param(
 		axis2_environment_t *env, axis2_description_operation_t *operation_desc
 		, const axis2_char_t *name)
 {
-	if(operation_desc && operation_desc->param_include)
-		return (axis2_parameter_t *)(apr_hash_get 
-		(operation_desc->param_include->parameters, strdup(name)
-		, APR_HASH_KEY_STRING));
-	return NULL;
+	if(!operation_desc || !operation_desc->param_include)
+	{
+		env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+		return NULL;
+	}
+	axis2_char_t *tempname = axis2_strdup(env->string, name);
+	if(!tempname)
+	{
+		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
+		return NULL;
+	}
+		
+	return (axis2_description_param_t *)(axis2_hash_get 
+		(axis2_description_param_include_get_params(env
+		, operation_desc->param_include), tempname, AXIS2_HASH_KEY_STRING));
 }
 
-axis2_description_param_t *axis2_description_operation_get_parameters(
+axis2_hash_t *axis2_description_operation_ops_get_params(
 		axis2_environment_t *env, axis2_description_operation_t *operation_desc)
 {
-	if(operation_desc && operation_desc->param_include)
-		return (axis2_parameter_t *) operation_desc->param_include->parameters;
-	return NULL;
+	if(!operation_desc || !operation_desc->param_include)
+	{
+		env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+		return NULL;
+	}
+	
+	return axis2_description_param_include_get_params(env
+		, operation_desc->param_include);
 }	
 
-axis2_status_t axis2_description_operation_set_parent(axis2_environment_t *env
+axis2_status_t axis2_description_operation_ops_set_parent(axis2_environment_t *env
 		,axis2_description_operation_t *operation_desc
 		, axis2_description_service_t *service_desc)
 {
@@ -154,10 +195,10 @@
 		operation_desc->parent = service_desc;
 		return AXIS2_SUCCESS;
 	}
-	return AXIS2_FAILURE;
+	return AXIS2_ERROR_INVALID_NULL_PARAMETER;
 }
 
-axis2_description_service_t *axis2_description_operation_get_parent
+axis2_description_service_t *axis2_description_ops_operation_ops_get_parent
 		(axis2_environment_t *env
 		, axis2_description_operation_t *operation_desc)
 {

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Tue Oct 18 19:19:51 2005
@@ -28,29 +28,29 @@
     axis2_bool_t is_locked;	
 };
 
-/* Function prototypes */
+/************************* Function prototypes ********************************/
 
 axis2_status_t axis2_description_param_include_ops_free 
 	(axis2_description_param_include_t *param_include);
 
-axis2_status_t axis2_description_param_include_ops_add_parameter
+axis2_status_t axis2_description_param_include_ops_add_param
     (axis2_environment_t *environment
 	, axis2_description_param_include_t *param_include
     , const axis2_description_param_t *param);
 	 
-axis2_description_param_t *axis2_description_param_include_ops_get_parameter
+axis2_description_param_t *axis2_description_param_include_ops_get_param
     (axis2_environment_t *env, axis2_description_param_include_t *param_include
 	, const axis2_char_t *name);
 
-axis2_hash_t *axis2_description_param_include_ops_get_parameters
+axis2_hash_t *axis2_description_param_include_ops_get_params
     (axis2_environment_t *env
 	, axis2_description_param_include_t *param_include);
 
-axis2_status_t axis2_description_param_include_ops_is_parameter_locked
+axis2_status_t axis2_description_param_include_ops_is_param_locked
     (axis2_environment_t *env, axis2_description_param_include_t *param_include
 	, const axis2_char_t *param_name);
 
-/* End of function prototypes */
+/************************** End of function prototypes ************************/
 
 axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
 		(axis2_environment_t *env
@@ -84,14 +84,14 @@
 	}
 	ops->free = (axis2_description_param_include_free_t) 
 				axis2_description_param_include_ops_free;
-	ops->add_parameter = (axis2_description_param_include_add_parameter_t) 
-				axis2_description_param_include_ops_add_parameter;
-	ops->get_parameter = (axis2_description_param_include_get_parameter_t) 
-				axis2_description_param_include_ops_get_parameter;
-	ops->get_parameters = (axis2_description_param_include_get_parameters_t) 
-				axis2_description_param_include_ops_get_parameters;
-	ops->is_parameter_locked = (axis2_description_param_include_is_parameter_locked_t) 
-				axis2_description_param_include_ops_is_parameter_locked;
+	ops->add_param = (axis2_description_param_include_add_param_t) 
+				axis2_description_param_include_ops_add_param;
+	ops->get_param = (axis2_description_param_include_get_param_t) 
+				axis2_description_param_include_ops_get_param;
+	ops->get_params = (axis2_description_param_include_get_params_t) 
+				axis2_description_param_include_ops_get_params;
+	ops->is_param_locked = (axis2_description_param_include_is_param_locked_t) 
+				axis2_description_param_include_ops_is_param_locked;
 	param_include->ops = ops;
 				
 	param_include->params = axis2_hash_make (env);				
@@ -104,6 +104,8 @@
 	return param_include;
 }
 
+/*************************** Start of operation impls *************************/
+
 axis2_status_t axis2_description_param_include_ops_free 
 		(axis2_description_param_include_t *param_include)
 {
@@ -112,7 +114,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_description_param_include_ops_add_parameter
+axis2_status_t axis2_description_param_include_ops_add_param
     	(axis2_environment_t *env
 		, axis2_description_param_include_t *param_include
     	, const axis2_description_param_t *param)
@@ -137,7 +139,7 @@
 
 }
 
-axis2_description_param_t *axis2_description_param_include_ops_get_parameter
+axis2_description_param_t *axis2_description_param_include_ops_get_param
     	(axis2_environment_t* env
 		, axis2_description_param_include_t *param_include
 		, const axis2_char_t *name)
@@ -152,7 +154,7 @@
 		, AXIS2_HASH_KEY_STRING));
 }
 
-axis2_hash_t *axis2_descriptin_param_include_get_parameters
+axis2_hash_t *axis2_descriptin_param_include_get_params
     	(axis2_environment_t *env
 		, axis2_description_param_include_t * param_include)
 {

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c Tue Oct 18 19:19:51 2005
@@ -32,7 +32,8 @@
     axis2_bool_t is_locked;
 };
 
-/* Function prototypes */
+/***************************** Function prototypes ****************************/
+
 axis2_status_t axis2_description_param_ops_free (axis2_environment_t *env
 	, axis2_description_param_t * param);
 
@@ -67,7 +68,7 @@
 int axis2_description_param_ops_get_type (axis2_environment_t *env
 		, axis2_description_param_t * param);
 
-/* End of function prototypes */
+/************************** End of function prototypes ************************/
 
 axis2_description_param_ops_t *axis2_description_param_get_ops
 	(axis2_environment_t *env, axis2_description_param_t *param)
@@ -81,8 +82,9 @@
 	return (axis2_description_param_ops_t *) param->ops;	
 }
 
+
 axis2_description_param_t *axis2_description_param_create 
-	(axis2_environment_t *env)
+		(axis2_environment_t *env)
 {
 	axis2_description_param_t *param 
 	= (axis2_description_param_t *) axis2_malloc (env->allocator
@@ -122,41 +124,21 @@
 	param->is_locked = AXIS2_FALSE;
 	return param;	
 }	
-	
+
+
 axis2_description_param_t *axis2_description_param_create_with_name_value 
 		(axis2_environment_t *env, const axis2_char_t *name
 		, const axis2_char_t *value)
 {
 	
-	axis2_description_param_t *param 
-		= (axis2_description_param_t *) axis2_malloc (env->allocator
-		, sizeof(axis2_description_param_t));
+	
+	axis2_description_param_t *param = axis2_description_param_create(env);
 	if(!param)
 	{
 		/* set the error code*/
 		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
 	}
-	axis2_description_param_ops_t *ops
-		= (axis2_description_param_ops_t *) axis2_malloc (env->allocator
-		, sizeof(axis2_description_param_ops_t));
-	if(!ops)
-	{
-		env->error->errorno = AXIS2_ERROR_NO_MEMORY;
-		axis2_free(env->allocator, param);	
-	}
-	ops->free = axis2_description_param_ops_free;
-	ops->set_name = axis2_description_param_ops_set_name;
-	ops->get_name = axis2_description_param_ops_get_name;
-	ops->set_value = axis2_description_param_ops_set_value;
-	ops->get_value = axis2_description_param_ops_get_value;
-	ops->is_locked = axis2_description_param_ops_is_locked;
-	ops->set_locked = axis2_description_param_ops_set_locked;
-	/*ops->set_param_element = axis2_description_param_ops_set_param_element;*/
-	ops->get_param_element = axis2_description_param_ops_get_param_element;
-	ops->set_type = axis2_description_param_ops_set_type;
-	ops->get_type = axis2_description_param_ops_get_type;
 	
-	param->ops = ops;	
 	param->name = axis2_strdup (env->string, name);
 	if(!param->name)
 	{
@@ -175,6 +157,8 @@
 	param->is_locked = AXIS2_FALSE;
 	return param;
 }
+
+/**********************Start of operation impls********************************/
 
 axis2_status_t axis2_description_param_ops_free (axis2_environment_t *env
 		,axis2_description_param_t * param)

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c Tue Oct 18 19:19:51 2005
@@ -5,66 +5,137 @@
   * @brief DESCRIPTION service struct
   * This holds the information about service
   */
-struct axis2_service_description_s
+struct axis2_description_service_s
 {
+	axis2_description_service_ops_t *ops;
 	axis2_description_param_include_t *param_include;
-	axis2_servicegroup_description_t *parent;
+	axis2_description_servicegroup_t *parent;
 	axis2_hash_t *wasaction_opeartionmap;    
 
 };
 
-axis2_description_operation_t 
-	*axis2_description_service_get_operation_with_qname(
-	axis2_description_service_t *service_desc, axis2_qname_t *operation_name)
+/*************************** Function pointers ********************************/
+
+axis2_status_t axis2_description_service_ops_free (axis2_environment_t *env
+		, axis2_description_service_t *service_desc);
+
+axis2_status_t axis2_description_service_ops_add_operation
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_description_operation_t *operation_desc);
+
+axis2_status_t axis2_description_service_ops_add_param(axis2_environment_t *env
+		, axis2_description_service_t *operation_desc
+		, axis2_description_param_t *param);
+
+axis2_description_param_t *axis2_description_service_ops_get_param
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t *name);
+
+axis2_hash_t *axis2_description_service_ops_get_params
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+
+axis2_description_operation_t *
+		axis2_description_service_ops_get_operation_with_qname(
+		axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_qname_t *operation_name);
+		
+axis2_description_operation_t *
+		axis2_description_service_ops_get_operation_with_name
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t* operation_name);
+
+axis2_hash_t *axis2_description_service_ops_get_operations(
+		axis2_environment_t *env, axis2_description_service_t *service_desc);
+	
+axis2_status_t axis2_description_service_ops_set_parent(axis2_environment_t *env
+		, axis2_description_service_t *service_desc
+		,axis2_description_servicegroup_t *servicegroup_desc);
+
+axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
+		(axis2_environment_t *env, axis2_description_service_t *service_desc);
+		
+/************************* End of function pointers ***************************/
+
+axis2_description_service_ops_t * axis2_description_service_get_ops
+		(axis2_environment_t *env)
 {
-	return NULL;	
-}	
+	return NULL;
+}
 
-void axis2_description_service_add_operation(axis2_description_service_t
-	*service_desc, axis2_description_operation_t *operation_desc)
+axis2_description_service_t *axis2_description_service_create_with_qname
+		(axis2_environment_t *env)
 {
+	return NULL;
+}
 
+/******************************************************************************/
+
+axis2_status_t axis2_description_service_ops_free
+		(axis2_environment_t *env, axis2_description_service_t *service_desc)
+{
+	if(service_desc)
+		axis2_free(env->allocator, service_desc);
+	return AXIS2_SUCCESS;
 }
 
-void axis2_description_service_add_parameter(axis2_description_service_t
-	*operation_desc, axis2_parameter_t *param)
+axis2_status_t axis2_description_service_ops_add_operation
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_description_operation_t *operation_desc)
 {
+	return AXIS2_ERROR_INVALID_NULL_PARAMETER;
+}
 
+axis2_status_t axis2_description_service_ops_add_param(axis2_environment_t *env
+		, axis2_description_service_t *operation_desc
+		, axis2_description_param_t *param)
+{
+	return NULL;
 }
 
-axis2_description_param_t *axis2_description_service_get_parameter(
-	axis2_description_service_t *service_desc, char *name)
+axis2_description_param_t *axis2_description_service_ops_get_param(
+		axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t *name)
 {
 	return NULL;
 }
 
-axis2_description_param_t *axis2_description_service_get_params(
-	axis2_description_service_t *service_desc)
+axis2_hash_t *axis2_description_service_ops_get_params
+		(axis2_environment_t *env, axis2_description_service_t *service_desc)
 {
 	return NULL;
 }
 
 axis2_description_operation_t 
-	*axis2_description_service_get_operation_with_char(
-	axis2_description_service_t *service_desc, char* name)
+		*axis2_description_service_ops_get_operation_with_qname
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, axis2_qname_t *operation_name)
+{
+	return NULL;	
+}	
+
+axis2_description_operation_t 
+		*axis2_description_service_ops_get_operation_with_name
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		, const axis2_char_t* name)
 {
 	return NULL;
 }
 
-axis2_hash_t *axis2_description_service_get_operations(
-	axis2_description_service_t *service_desc)
+axis2_hash_t *axis2_description_service_ops_get_operations
+		(axis2_environment_t *env, axis2_description_service_t *service_desc)
 {
 	return NULL;
 }
 	
-void setParent(axis2_description_service_t *service_desc
-	,axis2_description_servicegroup_t *servicegroup_desc)
+axis2_status_t axis2_description_operation_ops_set_parent
+		(axis2_environment_t *env, axis2_description_service_t *service_desc
+		,axis2_description_servicegroup_t *servicegroup_desc)
 {
-	
+	return NULL;
 }
 
-axis2_description_servicegroup_t *axis2_description_service_getParent
-(axis2_description_service_t *service_desc)
+axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
+		(axis2_environment_t *env, axis2_description_service_t *service_desc)
 {
 	return NULL;
 }

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c?rev=326329&r1=326328&r2=326329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c Tue Oct 18 19:19:51 2005
@@ -11,3 +11,23 @@
 	axis2_hash_t *services;
 	
 };
+
+/***************************** Function headers *******************************/
+
+axis2_status_t axis2_description_servicegroup_ops_add_service
+		(axis2_environment_t *env
+		, axis2_description_servicegroup_t* service_group);
+
+/***************************** End of function headers ************************/
+
+axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
+		(axis2_environment_t *env);
+
+/******************************************************************************/
+
+axis2_status_t axis2_description_servicegroup_ops_add_service
+		(axis2_environment_t *env
+		, axis2_description_servicegroup_t* service_group)
+{
+	return 0;
+}