axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r314774 - in /webservices/axis2/trunk/c: include/ modules/common/src/ modules/common/test/ modules/core/description/src/ modules/xml/guththila/src/ modules/xml/om/src/
Date Wed, 12 Oct 2005 04:10:57 GMT
Author: damitha
Date: Tue Oct 11 21:10:28 2005
New Revision: 314774

URL: http://svn.apache.org/viewcvs?rev=314774&view=rev
Log:
System is not currently building because of new changes. Corrected some of these

Modified:
    webservices/axis2/trunk/c/include/axis2.h
    webservices/axis2/trunk/c/include/axis2_defines.h
    webservices/axis2/trunk/c/include/axis2_description_param_include.h
    webservices/axis2/trunk/c/include/axis2_errno.h
    webservices/axis2/trunk/c/include/axis2_om_document.h
    webservices/axis2/trunk/c/include/axis2_om_element.h
    webservices/axis2/trunk/c/include/axis2_om_node.h
    webservices/axis2/trunk/c/include/axis2_om_output.h
    webservices/axis2/trunk/c/include/axis2_om_text.h
    webservices/axis2/trunk/c/include/axis2_service_description.h
    webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h
    webservices/axis2/trunk/c/modules/common/src/axis2.c
    webservices/axis2/trunk/c/modules/common/test/common_test.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
    webservices/axis2/trunk/c/modules/core/description/src/axis2_service_description.c
    webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c
    webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c

Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Tue Oct 11 21:10:28 2005
@@ -6,20 +6,4 @@
  * @brief Axis2c specific global declarations
  */
 
-#include <apr_general.h>
-#include <apr.h>
-#include <apr_pools.h>
-#include <apr_hash.h>
-
-/* Parametrized macro definitions for memory handling */
-#define MALLOC(s) (malloc((s)))
-#define REALLOC(p,s) (realloc((p),(s)))
-#define FREE(p) (free((p)))
-
-/*enum boolean_s {false, true};
-typedef enum boolean_s boolean_t; */
-
-apr_hash_t *axis2_apr_hash_make(apr_pool_t *om_pool);                                   
    
-
-
 #endif /* AXIS2_H */

Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_defines.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Tue Oct 11 21:10:28 2005
@@ -1,5 +1,5 @@
-#ifndef AXIS2_H
-#define AXIS2_H
+#ifndef AXIS2_DEFINES_H
+#define AXIS2_DEFINES_H
 
 /**
  * @file axis2_defines.h
@@ -12,4 +12,4 @@
 #define AXIS2_TRUE 1
 #define AXIS2_FALSE 0
 
-#endif /* AXIS2_H */
+#endif /* AXIS2_DEFINES_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=314774&r1=314773&r2=314774&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 11 21:10:28
2005
@@ -14,15 +14,44 @@
  * @file axis2_description_param_include.h
  * @brief Parameter handling
  */
+struct axis2_description_param_include_ops_s;
+	
+struct axis2_description_param_include_s;
+	
+typedef struct axis2_description_param_include_s 
+		axis2_description_param_include_t;
+	
+typedef void (*axis2_description_param_include_add_parameter_t)
+    (axis2_description_param_include_t *param_include,
+     axis2_parameter_t * param);
+
+typedef axis2_parameter_t *(*axis2_description_param_include_get_parameter_t)
+    (axis2_description_param_include_t * param_include, char *name);
+
+typedef apr_hash_t *(*axis2_description_param_include_get_parameters_t)
+    (axis2_description_param_include_t * param_include);
+
+typedef int (*axis2_description_param_include_is_parameter_locked_t)
+    (axis2_description_param_include_t * param_include, char *param_name);
 
 /**
-  * Paramter can be any thing it can be XML element with number of child elements
+  * Paramter can be any thing it can be XML element with number of child 
+  * elements
   */
-typedef struct axis2_description_param_include_t
+typedef struct axis2_description_param_include_ops_s
+{
+    axis2_description_param_include_add_parameter_t add_parameter;
+	axis2_description_param_include_get_parameter_t get_parameter;
+	axis2_description_param_include_get_parameters_t get_parameters;
+	axis2_description_param_include_is_parameter_locked_t is_parameter_locked;
+} axis2_description_param_include_ops_t;
+
+struct axis2_description_param_include_s
 {
     apr_hash_t *parameters;
     int is_locked;
-} axis2_description_param_include_t;
+	axis2_description_param_include_ops_t *ops;	
+};
 
 /*
  *	Create a param
@@ -31,20 +60,5 @@
 
 void free_axis2_description_param_include (axis2_description_param_include_t
     *param_include);
-
-void axis2_description_param_include_add_parameter
-    (axis2_description_param_include_t *param_include,
-     axis2_parameter_t * param);
-
-axis2_parameter_t *axis2_description_param_include_get_parameter
-    (axis2_description_param_include_t * param_include, char *name);
-
-/* To get all the parameters in a given description */
-apr_hash_t *axis2_description_param_include_get_parameters
-    (axis2_description_param_include_t * param_include);
-
-/* To check whether the paramter is locked at any level */
-int axis2_description_param_include_is_parameter_locked
-    (axis2_description_param_include_t * param_include, char *param_name);
 
 #endif //AXIS2_DESCRIPTION_PARAM_INCLUDE_H

Modified: webservices/axis2/trunk/c/include/axis2_errno.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_errno.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_errno.h (original)
+++ webservices/axis2/trunk/c/include/axis2_errno.h Tue Oct 11 21:10:28 2005
@@ -6,7 +6,7 @@
  * @brief Axis2c Error Codes
  */
 
-//#include <apr_errno.h>
+/*#include <apr_errno.h>*/
 
 /**
  * AXIS2_START_ERROR is where the AXIS2 specific error values start.

Modified: webservices/axis2/trunk/c/include/axis2_om_document.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_document.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_document.h Tue Oct 11 21:10:28 2005
@@ -18,7 +18,7 @@
 #define AXIS2_OM_DOCUMENT_H
 #include <axis2_om_node.h>
 
-//typedef struct axis2_stax_om_builder_t axis2_stax_om_builder_t;
+/*typedef struct axis2_stax_om_builder_t axis2_stax_om_builder_t;*/
 
 /**
  * @file axis2_om_node.h
@@ -111,4 +111,4 @@
 
 
 
-#endif // AXIS2_OM_DOCUMENT_H
+#endif // AXIS2_OM_DOCUMENT_H

Modified: webservices/axis2/trunk/c/include/axis2_om_element.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_element.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_element.h Tue Oct 11 21:10:28 2005
@@ -27,11 +27,11 @@
 
 
 struct axis2_om_element_s{
-	axis2_om_namespace_t *ns;			// current namespace
+	axis2_om_namespace_t *ns;			/* current namespace*/
 	char *localname;			
-	int pns_counter;            // prefix namespace counter
-	apr_hash_t *attributes;     // a hashtable for storing attributes 
-	apr_hash_t *namespaces;		// hashtable for storing namespaces
+	int pns_counter;            /* prefix namespace counter*/
+	apr_hash_t *attributes;     /* a hashtable for storing attributes */
+	apr_hash_t *namespaces;		/* hashtable for storing namespaces*/
 };
 
 

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=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Tue Oct 11 21:10:28 2005
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_NODE_H
-#define AXIS2_NODE_H
+#ifndef AXIS2_OM_NODE_H
+#define AXIS2_OM_NODE_H
 
 /**
  * @file axis2_om_node.h
@@ -25,10 +25,6 @@
 
 
 #include <axis2.h>
-#include <axis2_errno.h>
-//#include <apr.h>
-//#include <apr_pools.h>
-
 
 typedef struct axis2_stax_om_builder_s axis2_stax_om_builder_t;
 typedef struct axis2_om_output_s axis2_om_output_t;
@@ -114,7 +110,7 @@
 void axis2_om_node_insert_sibling_before(axis2_om_node_t *current_ele,axis2_om_node_t *nodeto_insert);
 
 
-//int axis2_om_node_build(axis2_om_node_t *node);
+/*int axis2_om_node_build(axis2_om_node_t *node);*/
 
 /**
  *	set a parent node to a given node
@@ -130,4 +126,4 @@
 
 int *axis2_om_node_serialize(axis2_om_node_t *om_node, axis2_om_output_t * om_output);
 
-#endif // AXIS2_NODE_H
+#endif /* AXIS2_OM_NODE_H */

Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Tue Oct 11 21:10:28 2005
@@ -28,8 +28,8 @@
     guththila_xml_stream_writer_t* xml_writer;
     int do_optimize;
     FILE* out_stream;
-    //apr_array_t binary_node_list;
-    //buffered_soap_out_stream;
+    /*apr_array_t binary_node_list;*/
+    /*buffered_soap_out_stream;*/
     char* mime_boundary;
     char*  root_content_id;
     int next_id;

Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Tue Oct 11 21:10:28 2005
@@ -69,13 +69,13 @@
    /**
     * The following fields are for MTOM
     */
-	//axis2_om_namespace_t *ns;
+	/*axis2_om_namespace_t *ns;*/
 	axis2_char *mime_type;
 	int optimize;
 	axis2_char *localname;
 	int is_binary;
 	axis2_char *content_id;
-	//axis2_om_attribute_t *attribute;
+	/*axis2_om_attribute_t *attribute;*/
 } axis2_om_text_t;
 
 

Modified: webservices/axis2/trunk/c/include/axis2_service_description.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_service_description.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_service_description.h (original)
+++ webservices/axis2/trunk/c/include/axis2_service_description.h Tue Oct 11 21:10:28 2005
@@ -22,7 +22,7 @@
 axis2_operation_description_t *axis2_service_description_get_operation_with_char(
 	axis2_service_description_t *service_desc, char* name);
 
-apr_hash_t axis2_service_description_get_operations(
+apr_hash_t *axis2_service_description_get_operations(
 	axis2_service_description_t *service_desc);
 	
 void setParent(axis2_service_description_t *service_description

Modified: webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stax_ombuilder.h Tue Oct 11 21:10:28 2005
@@ -26,19 +26,19 @@
 
 
 
-#include <xmlpullparser.h>
+#include <guththila_xml_pull_parser.h>
 #include <axis2_om_node.h>
 #include <axis2_om_document.h>
 
 struct axis2_stax_om_builder_s
 {
-	XML_PullParser			*parser;	
+	guththila_xml_pull_parser_t			*parser;	
 	axis2_om_node_t			*lastnode;
 	axis2_om_document_t	*document;
 	int				done;
 	int				parser_accessed;
 	int				cache;
-	//apr_array_header_t *element_stack;
+	/*apr_array_header_t *element_stack;*/
 };
 
 /**
@@ -47,7 +47,7 @@
  *				   [ Guththila ]	
  */
 
-axis2_stax_om_builder_t *axis2_stax_om_builder_create(XML_PullParser *parser);
+axis2_stax_om_builder_t *axis2_stax_om_builder_create(guththila_xml_pull_parser_t *parser);
 
 /**
  *	Create an om element and adds to the document
@@ -136,4 +136,4 @@
 
 
 
-#endif // AXIS2_STAX_OMBUILDER_H
+#endif // AXIS2_STAX_OMBUILDER_H

Modified: webservices/axis2/trunk/c/modules/common/src/axis2.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/src/axis2.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/axis2.c (original)
+++ webservices/axis2/trunk/c/modules/common/src/axis2.c Tue Oct 11 21:10:28 2005
@@ -1,14 +1 @@
 #include <axis2.h>
-
-apr_hash_t *axis2_apr_hash_make(apr_pool_t *om_pool)
-{
-	apr_status_t status;
-
-	if (!om_pool)
-	{
-		status = apr_pool_create (&om_pool, NULL);
-		// error handling should go hear
-	}
-		
-	return apr_hash_make (om_pool);
-}

Modified: webservices/axis2/trunk/c/modules/common/test/common_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/test/common_test.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/test/common_test.c (original)
+++ webservices/axis2/trunk/c/modules/common/test/common_test.c Tue Oct 11 21:10:28 2005
@@ -1,8 +1,62 @@
 #include <CuTest.h>
 #include <string.h>
 #include <stdio.h>
-#include <axis2c.h>
+#include <axis2_allocator.h>
+#include <axis2_environment.h>
+
+void Testaxis2_stream_ops_read(CuTest *tc) {
+
+    char actual[10];
+    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
+    axis2_stream_read(env->stream, actual, 10);
+    char *expected = strdup("aaaaaaaaa");
+    CuAssertStrEquals(tc, expected, actual);
+}
+
+void Testaxis2_stream_ops_write(CuTest *tc) {
+
+    char actual[10];
+    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
+    axis2_stream_read(env->stream, actual, 10);
+    axis2_stream_write(env->stream, actual, 10);
+    char *expected = strdup("aaaaaaaaa");
+    CuAssertStrEquals(tc, expected, actual);
+}
+
+void Testaxis2_log_ops_write(CuTest *tc) {
+
+    char actual[10];
+    axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+    axis2_environment_t *env = axis2_environment_create(allocator, NULL, NULL, NULL);
+    axis2_stream_read(env->stream, actual, 10);
+    axis2_log_write(env->log, actual, 10);
+    char *expected = strdup("aaaaaaaaa");
+    CuAssertStrEquals(tc, expected, actual);
+}
+
+CuSuite* axis2_commonGetSuite() {
+    CuSuite* suite = CuSuiteNew();
+    SUITE_ADD_TEST(suite, Testaxis2_stream_ops_read);
+    SUITE_ADD_TEST(suite, Testaxis2_stream_ops_write);
+    SUITE_ADD_TEST(suite, Testaxis2_log_ops_write);
+    return suite;
+}
+
+void RunAllTests(void) {
+    CuString *output = CuStringNew();
+    CuSuite* suite = CuSuiteNew();
+
+    CuSuiteAddSuite(suite, axis2_commonGetSuite());
+
+    CuSuiteRun(suite);
+    CuSuiteSummary(suite, output);
+    CuSuiteDetails(suite, output);
+    printf("%s\n", output->buffer);
+}
 
 int main(void) {
+    RunAllTests();
     return 0;
 }

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=314774&r1=314773&r2=314774&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 11 21:10:28 2005
@@ -3,26 +3,69 @@
 
 static apr_pool_t *om_pool;
 
+void axis2_description_param_include_add_parameter
+    (axis2_description_param_include_t *param_include,
+     axis2_parameter_t * param);
+	 
+axis2_parameter_t *axis2_description_param_include_get_parameter
+    (axis2_description_param_include_t *param_include, char *name);
+
+/* To get all the parameters in a given description */
+apr_hash_t *axis2_description_param_include_get_parameters
+    (axis2_description_param_include_t *param_include);
+
+/* To check whether the paramter is locked at any level */
+int axis2_description_param_include_is_parameter_locked
+    (axis2_description_param_include_t *param_include, char *param_name);
+	 
 axis2_description_param_include_t *create_axis2_description_param_include ()
 {
-	axis2_description_param_include_t *param_include = (axis2_description_param_include_t *)
+	axis2_description_param_include_t *param_include = 
+		(axis2_description_param_include_t *)
 		malloc(sizeof(axis2_description_param_include_t));
 	if(param_include)
 	{
-        apr_pool_create (&om_pool, NULL);
-		param_include->parameters = (apr_hash_t *) axis2_apr_hash_make (om_pool);
-		if(param_include->parameters)
+		axis2_description_param_include_ops_t *ops = 
+			malloc(sizeof(axis2_description_param_include_ops_t));
+		if(ops)
 		{
-			param_include->is_locked = FALSE;
-			return param_include;
+			param_include->ops->add_parameter = 
+				(axis2_description_param_include_add_parameter_t) 
+						axis2_description_param_include_add_parameter;
+			param_include->ops->get_parameter = 
+				(axis2_description_param_include_get_parameter_t) 
+						axis2_description_param_include_get_parameter;
+			param_include->ops->get_parameters = 
+				(axis2_description_param_include_get_parameters_t) 
+						axis2_description_param_include_get_parameters;
+			param_include->ops->is_parameter_locked = 
+				(axis2_description_param_include_is_parameter_locked_t) 
+						axis2_description_param_include_is_parameter_locked;
+			
+			apr_pool_create (&om_pool, NULL);
+			param_include->parameters = 
+				(apr_hash_t *) axis2_apr_hash_make (om_pool);
+			if(param_include->parameters)
+			{
+				
+				param_include->is_locked = FALSE;
+				return param_include;
+			}
+			else
+				fprintf(stderr, "*** error_code:%d, %s\n",
+					AXIS2_ERROR_OM_MEMORY_ALLOCATION,
+					"AXIS2_ERROR_OM_MEMORY_ALLOCATION");
+		}else
+		{
+			fprintf(stderr, "*** error_code:%d, %s\n", 
+					AXIS2_ERROR_OM_MEMORY_ALLOCATION,
+			 		"AXIS2_ERROR_OM_MEMORY_ALLOCATION");
 		}
-		else
-			fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_OM_MEMORY_ALLOCATION
-			, "AXIS2_ERROR_OM_MEMORY_ALLOCATION");
 		
 	}
 	else
-		fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_OM_MEMORY_ALLOCATION
+		fprintf(stderr, "*** error_code:%d, %s\n", 
+			AXIS2_ERROR_OM_MEMORY_ALLOCATION
 			, "AXIS2_ERROR_OM_MEMORY_ALLOCATION");
 	
 	
@@ -45,11 +88,13 @@
 		if (!(param_include->parameters))
 		{        
             apr_pool_create (&om_pool, NULL);
-			param_include->parameters = (apr_hash_t *) axis2_apr_hash_make (om_pool);
+			param_include->parameters = 
+				(apr_hash_t *) axis2_apr_hash_make (om_pool);
 		}
 		if(param)
 		{
-			apr_hash_set (param_include->parameters, param->name, APR_HASH_KEY_STRING, param);
+			apr_hash_set (param_include->parameters, param->name,
+				APR_HASH_KEY_STRING, param);
 		}
 	}
 	fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_NULL_MEMORY_ACCESS
@@ -80,6 +125,7 @@
     (axis2_description_param_include_t * param_include, char *param_name)
 {
 	return ((axis2_parameter_t *)(apr_hash_get 
-		(param_include->parameters, strdup(param_name), APR_HASH_KEY_STRING)))->is_locked;
+		(param_include->parameters, strdup(param_name), 
+			APR_HASH_KEY_STRING)))->is_locked;
 	return FALSE;
 }

Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_service_description.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_service_description.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_service_description.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_service_description.c Tue
Oct 11 21:10:28 2005
@@ -1 +1,57 @@
 #include <axis2_service_description.h>
+
+axis2_operation_description_t 
+	*axis2_service_description_get_operation_with_qname(
+	axis2_service_description_t *service_desc, axis2_qname_t *operation_name)
+{
+	return NULL;	
+}	
+
+void axis2_service_description_add_operation(axis2_service_description_t
+	*service_desc, axis2_operation_description_t *operation_desc)
+{
+
+}
+
+void axis2_service_description_add_parameter(axis2_service_description_t
+	*operation_desc, axis2_parameter_t *param)
+{
+
+}
+
+axis2_parameter_t *axis2_service_description_get_parameter(
+	axis2_service_description_t *service_desc, char *name)
+{
+	return NULL;
+}
+
+axis2_parameter_t *axis2_service_description_get_parameters(
+	axis2_operation_description_t *service_desc)
+{
+	return NULL;
+}
+
+axis2_operation_description_t 
+	*axis2_service_description_get_operation_with_char(
+	axis2_service_description_t *service_desc, char* name)
+{
+	return NULL;
+}
+
+apr_hash_t *axis2_service_description_get_operations(
+	axis2_service_description_t *service_desc)
+{
+	return NULL;
+}
+	
+void setParent(axis2_service_description_t *service_description
+	,axis2_servicegroup_description_t *servicegroup_desc)
+{
+	
+}
+
+axis2_servicegroup_description_t *axis2_service_description_getParent
+(axis2_service_description_t *service_desc)
+{
+	return NULL;
+}

Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c Tue
Oct 11 21:10:28 2005
@@ -32,7 +32,7 @@
         stream_writer->encoding = encoding;
     stream_writer->prefix_defaulting = prefix_defaulting;
 
-      //initialize APR pool, we ned this pool to allocate memory to hash map and stack
+      /*initialize APR pool, we ned this pool to allocate memory to hash map and stack*/
 
     
 
@@ -64,7 +64,7 @@
             return GUTHTHILA_STREAM_WRITER_ERROR_WRITING_TO_STREAM;
         }
 
-          //pop last element and delete that elelemt
+          /*pop last element and delete that elelemt */
         del_element = (char***) apr_array_pop( stream_writer->element_stack );
         if (del_element)
         {
@@ -76,7 +76,7 @@
         }
         del_element = 0;
         
-          //end pop element
+          /*end pop element*/
           
 
         stream_writer->empty_element = 0;
@@ -95,16 +95,16 @@
     if (!local_name)
         return GUTHTHILA_STREAM_WRITER_ERROR_LOCAL_NAME_NULL;
     guththila_xml_stream_writer_end_start_element(stream_writer);
-          //namespaces.pushContext();
+          /*namespaces.pushContext();*/
     fputs("<", stream_writer->writer);
     fputs(local_name, stream_writer->writer);
 
-          //push element to stack
+          /*push element to stack*/
     new_element = (char***)apr_array_push(stream_writer->element_stack);
     *new_element = (char**) malloc( sizeof(char**) * 2 );
     (*new_element)[0] = 0;
     (*new_element)[1] = strdup(local_name);
-          //end push element
+          /*end push element*/
 
     stream_writer->in_start_element = 1;
 
@@ -153,8 +153,8 @@
         if (prefix)
             guththila_xml_stream_writer_write_namespace(stream_writer, prefix, namespace_uri);
     }
-        //push element to stack
-    //char** new_element = (char**)apr_array_push(stream_writer->element_stack);
+        /*push element to stack*/
+    /*char** new_element = (char**)apr_array_push(stream_writer->element_stack);*/
     new_element = (char***)apr_array_push(stream_writer->element_stack);
     *new_element = (char**) malloc( sizeof(char**) * 2 );
     if(prefix)
@@ -162,7 +162,7 @@
     else
         (*new_element)[0] = 0;
     (*new_element)[1] = strdup(local_name);
-          //end push element
+          /*end push element*/
       
     stream_writer->in_start_element = 1;
       
@@ -205,8 +205,8 @@
                 guththila_xml_stream_writer_write_namespace(stream_writer, prefix, namespace_uri);
         }
 
-        //push element to stack
-        //char** new_element = (char**)apr_array_push(stream_writer->element_stack);
+        /*push element to stack*/
+        /*char** new_element = (char**)apr_array_push(stream_writer->element_stack);*/
         new_element = (char***)apr_array_push(stream_writer->element_stack);
         
         *new_element = (char**) malloc( sizeof(char**) * 2 );
@@ -215,7 +215,7 @@
         else
             (*new_element)[0] = 0;
         (*new_element)[1] = strdup(local_name);
-          //end push element
+          /*end push element*/
 
         stream_writer->in_start_element = 1;
 
@@ -264,12 +264,12 @@
         char*** element_data;
         guththila_xml_stream_writer_end_start_element(stream_writer);
     
-            // pop element stack
+            /* pop element stack*/
         element_data = (char***) apr_array_pop(stream_writer->element_stack);
         if (!element_data )
             return GUTHTHILA_STREAM_WRITER_ERROR_guththila_element_t_guththila_stack_t_EMPTY;
 
-            //end pop element stack
+            /*end pop element stack*/
 
         fputs("</", stream_writer->writer);
 
@@ -549,7 +549,7 @@
         if (!version)
             version = "1.0";
     
-        encoding = "UTF-8"; // The parameter is ignored
+        encoding = "UTF-8"; /* The parameter is ignored*/
     
         if ( (strcmp("1.0", version) != 0) && (strcmp("1.1", version) != 0 ) )
             return GUTHTHILA_STREAM_WRITER_ERROR_ILLEGAL_XML_VERSION;
@@ -599,7 +599,7 @@
             return GUTHTHILA_STREAM_WRITER_ERROR_ILLEGAL_PREFIX;
 
         apr_hash_set(stream_writer->namespace_hash, uri, APR_HASH_KEY_STRING, prefix);
-        apr_hash_set(stream_writer->prefix_hash, prefix, APR_HASH_KEY_STRING, uri); //over
write another prefix
+        apr_hash_set(stream_writer->prefix_hash, prefix, APR_HASH_KEY_STRING, uri); /*over
write another prefix*/
         return GUTHTHILA_SUCCESS;
     }
 
@@ -629,7 +629,7 @@
                 {
                     fputs( to_write, stream_writer->writer);
 
-                    //free (to_write);
+                    /*free (to_write);*/
                 }
                 else
                     return GUTHTHILA_STREAM_WRITER_ERROR_OUT_OF_MEMORY;
@@ -651,7 +651,7 @@
                 {
                     fputs( to_write, stream_writer->writer);
 
-                    //free (to_write);
+                    /*free (to_write);*/
                 }
                 else
                     return GUTHTHILA_STREAM_WRITER_ERROR_OUT_OF_MEMORY;
@@ -674,7 +674,7 @@
             {
                 fputs( to_write, stream_writer->writer);
 
-                //free (to_write);
+                /*free (to_write);*/
             }
             else
                 return GUTHTHILA_STREAM_WRITER_ERROR_OUT_OF_MEMORY;
@@ -682,4 +682,3 @@
 
         return GUTHTHILA_SUCCESS;
     }
-

Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h Tue
Oct 11 21:10:28 2005
@@ -30,7 +30,7 @@
 
 #define  GUTHTHILA_DEFAULT_NS_PREFIX    ""
 
-static apr_pool_t *guththila_apr_pool; // a memory pool to be used for this module
+static apr_pool_t *guththila_apr_pool; /* a memory pool to be used for this module */
             
 
 /**
@@ -42,9 +42,9 @@
     FILE* writer;
     char* encoding;
     int prefix_defaulting;
-    apr_array_header_t *element_stack; //stack of element names (apr array is FILO)
-    apr_hash_t* namespace_hash; //hash map with key:namespace and value:prefix
-    apr_hash_t* prefix_hash; //hash map with key:prefix and value:namespace
+    apr_array_header_t *element_stack; /*stack of element names (apr array is FILO)*/
+    apr_hash_t* namespace_hash; /*hash map with key:namespace and value:prefix */
+    apr_hash_t* prefix_hash; /*hash map with key:prefix and value:namespace*/
     int in_start_element;
     int empty_element;
 } guththila_xml_stream_writer_t;
@@ -131,4 +131,3 @@
 
 
 #endif //GUTHTHILA_XML_STREAM_WRITER_H
-

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_attribute.c Tue Oct 11 21:10:28
2005
@@ -16,6 +16,7 @@
 
 #include <axis2_om_attribute.h>
 #include <string.h>
+#include <axis2_defines.h>
 
 
 axis2_om_attribute_t *axis2_om_attribute_create(const char *localname,
@@ -76,8 +77,8 @@
 
 int axis2_om_attribute_serialize(axis2_om_attribute_t *attribute, axis2_om_output_t* om_output)
 {
-    int status = AXIS2_SUCCESS;
-    // TODO : handle null pointer errors
+    int status = AXIS2_TRUE;
+    /* TODO : handle null pointer errors*/
     if (attribute->ns && attribute->ns->uri && attribute->ns->prefix)
         status = axis2_om_output_write (om_output, AXIS2_OM_ATTRIBUTE, 4,
                                attribute->localname, attribute->value, attribute->ns->uri,
@@ -90,4 +91,3 @@
                                attribute->localname, attribute->value);
     return status;
 }
-

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c Tue Oct 11 21:10:28 2005
@@ -17,7 +17,8 @@
 
 #include <axis2_om_document.h>
 #include <stdlib.h>
-#include <axis2_errno.h>
+#include <axis2_error.h>
+#include <axis2_defines.h>
 #include <axis2_stax_ombuilder.h>
 
 axis2_om_document_t *axis2_om_document_create(axis2_om_node_t * root_ele,axis2_stax_om_builder_t
* builder)
@@ -26,7 +27,7 @@
     axis2_om_document_t *doc = (axis2_om_document_t *) malloc(sizeof(axis2_om_document_t));
     if (!doc)
     {
-		fprintf(stderr,"%d Error",AXIS2_ERROR_OM_MEMORY_ALLOCATION);
+		/*fprintf(stderr,"%d Error",AXIS2_ERROR_NO_MEMORY);*/
 		return NULL;
     }
     doc->builder = builder;
@@ -35,7 +36,7 @@
     doc->last_child = NULL;
     doc->char_set_encoding = CHAR_SET_ENCODING;
     doc->xml_version = XML_VERSION;
-    doc->done = FALSE;
+    doc->done = AXIS2_FALSE;
     if(builder)
     {
         builder->document=doc;
@@ -104,7 +105,7 @@
 
 void axis2_om_document_build_next(axis2_om_document_t *document)
 {
-   // printf("next");
+   /* printf("next");*/
 	axis2_stax_om_builder_next(document->builder);
 }
 
@@ -164,4 +165,4 @@
 axis2_om_node_t *axis2_om_document_get_child(axis2_om_document_t *document)
 {
     return document->builder->lastnode;
-}
+}

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=314774&r1=314773&r2=314774&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Tue Oct 11 21:10:28 2005
@@ -32,7 +32,7 @@
     node->prev_sibling = NULL;
     node->parent = NULL;
     node->element_type = AXIS2_OM_INVALID;
-    node->done = FALSE;
+    node->done = AXIS2_FALSE;
     node->builder = NULL;
     node->data_element = NULL;
 	node->current_child = NULL;
@@ -198,13 +198,13 @@
 	axis2_om_node_t *node=NULL;
 	if(parent_node && !(parent_node->first_child))
 	{
-		fprintf(stderr,"Error ");
+		/*fprintf(stderr,"Error ");*/
 		return NULL;	
 	}
 	
 	if(parent_node && parent_node->first_child  && !(parent_node->current_child))

 	{
-		fprintf(stderr,"Error first call get_first_child");
+		/*fprintf(stderr,"Error first call get_first_child");*/
 		return NULL;		
 	}
 	if(parent_node->current_child->next_sibling)
@@ -236,7 +236,7 @@
             break;
     }
 
-    // handle children
+    /* handle children*/
     axis2_om_node_t *child_node = axis2_om_node_get_first_child(om_node);
 
     while (child_node)
@@ -259,4 +259,3 @@
     return status;
 
 }
-



Mime
View raw message