axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r387127 [5/5] - in /webservices/axis2/trunk/c: include/ modules/core/deployment/ modules/xml/om/ modules/xml/soap/ test/unit/ test/xml/om/
Date Mon, 20 Mar 2006 03:56:00 GMT
Modified: webservices/axis2/trunk/c/include/axis2_svc_name.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc_name.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc_name.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc_name.h Sun Mar 19 19:55:55 2006
@@ -51,31 +51,42 @@
          *
          * @return
          */
-        axis2_qname_t* (AXIS2_CALL *get_qname)(struct axis2_svc_name *svc_name, 
-                                                       axis2_env_t **env);
+        axis2_qname_t* (AXIS2_CALL *
+		get_qname)(struct axis2_svc_name *svc_name, 
+                   axis2_env_t **env);
         /**
          * Method setName
          *
          * @param qname
          */
-        axis2_status_t (AXIS2_CALL *set_qname)(struct axis2_svc_name *svc_name, 
-                                                       axis2_env_t **env, axis2_qname_t *qname);
+        axis2_status_t (AXIS2_CALL *
+		set_qname)(struct axis2_svc_name *svc_name, 
+                   axis2_env_t **env, 
+				   axis2_qname_t *qname);
         /**
          * Method getEndpointName
          *
          * @return
          */
-        axis2_char_t* (AXIS2_CALL *get_endpoint_name)(struct axis2_svc_name *svc_name, 
-                                                       axis2_env_t **env);
+        axis2_char_t* (AXIS2_CALL *
+		get_endpoint_name)(struct axis2_svc_name *svc_name, 
+                           axis2_env_t **env);
         /**
          * Method setEndpointName
          *
          * @param endpoint_name
          */
-        axis2_status_t (AXIS2_CALL *set_endpoint_name)(struct axis2_svc_name *svc_name, 
-                                                       axis2_env_t **env, axis2_char_t *endpoint_name);
-        axis2_status_t (AXIS2_CALL *free)(struct axis2_svc_name *svc_name, 
-                                                       axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		set_endpoint_name)(struct axis2_svc_name *svc_name, 
+                           axis2_env_t **env, 
+						   axis2_char_t *endpoint_name);
+		
+		
+        axis2_status_t (AXIS2_CALL *
+		free)(struct axis2_svc_name *svc_name, 
+              axis2_env_t **env);
+		
+		
     } axis2_svc_name_ops_t;
 	
    /** 
@@ -94,13 +105,25 @@
  * @param value
  * @param relationship_type
  */
-AXIS2_DECLARE(axis2_svc_name_t*) axis2_svc_name_create(axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *endpoint_name) ;
+AXIS2_DECLARE(axis2_svc_name_t*) 
+axis2_svc_name_create(axis2_env_t **env, 
+					  axis2_qname_t *qname, 
+					  axis2_char_t *endpoint_name) ;
     
-#define AXIS2_SVC_NAME_GET_QNAME(svc_name, env) ((svc_name)->ops->get_qname(svc_name, env))
-#define AXIS2_SVC_NAME_SET_QNAME(svc_name, env, qname) ((svc_name)->ops->set_qname(svc_name, env, qname))
-#define AXIS2_SVC_NAME_GET_ENDPOINT_NAME(svc_name, env) ((svc_name)->ops->get_endpoint_name(svc_name, env))
-#define AXIS2_SVC_NAME_SET_ENDPOINT_NAME(svc_name, env, endpoint_name) ((svc_name)->ops->set_endpoint_name(svc_name, env, endpoint_name))
-#define AXIS2_SVC_NAME_FREE(svc_name, env) ((svc_name)->ops->free(svc_name, env))
+#define AXIS2_SVC_NAME_GET_QNAME(svc_name, env) \
+		((svc_name)->ops->get_qname(svc_name, env))
+	
+#define AXIS2_SVC_NAME_SET_QNAME(svc_name, env, qname) \
+		((svc_name)->ops->set_qname(svc_name, env, qname))
+	
+#define AXIS2_SVC_NAME_GET_ENDPOINT_NAME(svc_name, env) \
+		((svc_name)->ops->get_endpoint_name(svc_name, env))
+		
+#define AXIS2_SVC_NAME_SET_ENDPOINT_NAME(svc_name, env, endpoint_name) \
+		((svc_name)->ops->set_endpoint_name(svc_name, env, endpoint_name))
+		
+#define AXIS2_SVC_NAME_FREE(svc_name, env) \
+		((svc_name)->ops->free(svc_name, env))
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/include/axis2_thread_mutex.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_thread_mutex.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_thread_mutex.h (original)
+++ webservices/axis2/trunk/c/include/axis2_thread_mutex.h Sun Mar 19 19:55:55 2006
@@ -60,33 +60,38 @@
  * most optimial mutex based on a given platform's performance charateristics,
  * it will behave as either a nested or an unnested lock.
  */
-AXIS2_DECLARE(axis2_thread_mutex_t *) axis2_thread_mutex_create(axis2_allocator_t *allocator,
-                                                  unsigned int flags);
+AXIS2_DECLARE(axis2_thread_mutex_t *) 
+axis2_thread_mutex_create(axis2_allocator_t *allocator,
+                          unsigned int flags);
 /**
  * Acquire the lock for the given mutex. If the mutex is already locked,
  * the current thread will be put to sleep until the lock becomes available.
  * @param mutex the mutex on which to acquire the lock.
  */
-AXIS2_DECLARE(axis2_status_t) axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex);
+AXIS2_DECLARE(axis2_status_t) 
+axis2_thread_mutex_lock(axis2_thread_mutex_t *mutex);
 
 /**
  * Attempt to acquire the lock for the given mutex. If the mutex has already
  * been acquired, the call returns immediately 
  * @param mutex the mutex on which to attempt the lock acquiring.
  */
-AXIS2_DECLARE(axis2_status_t) axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex);
+AXIS2_DECLARE(axis2_status_t) 
+axis2_thread_mutex_trylock(axis2_thread_mutex_t *mutex);
 
 /**
  * Release the lock for the given mutex.
  * @param mutex the mutex from which to release the lock.
  */
-AXIS2_DECLARE(axis2_status_t) axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex);
+AXIS2_DECLARE(axis2_status_t) 
+axis2_thread_mutex_unlock(axis2_thread_mutex_t *mutex);
 
 /**
  * Destroy the mutex and free the memory associated with the lock.
  * @param mutex the mutex to destroy.
  */
-AXIS2_DECLARE(axis2_status_t) axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex);
+AXIS2_DECLARE(axis2_status_t) 
+axis2_thread_mutex_destroy(axis2_thread_mutex_t *mutex);
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_thread_pool.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/include/axis2_thread_pool.h Sun Mar 19 19:55:55 2006
@@ -54,34 +54,40 @@
 	* @param data arguments to be passed to the function
 	* @return pointer to a thread in ready state.
 	*/
-	axis2_thread_t * (AXIS2_CALL *get_thread) (axis2_thread_pool_t *pool, 
-					axis2_thread_start_t func, void *data);
+	axis2_thread_t * (AXIS2_CALL *
+	get_thread) (axis2_thread_pool_t *pool, 
+				 axis2_thread_start_t func, 
+	              void *data);
   /**
 	* Blocks until the desired thread stops executing.
 	* @param thd The thread to joined
 	* @return status of the operation
 	*/
-	axis2_status_t (AXIS2_CALL *join_thread) (axis2_thread_pool_t *pool, 
-					axis2_thread_t *thd);
+	axis2_status_t (AXIS2_CALL *
+	join_thread) (axis2_thread_pool_t *pool, 
+				  axis2_thread_t *thd);
   /**
 	* Stop the execution of current thread
 	* @param thd thread to be stopped
 	* @return status of the operation
 	*/
-	axis2_status_t (AXIS2_CALL *exit_thread) (axis2_thread_pool_t *pool, 
-					axis2_thread_t *thd);
+	axis2_status_t (AXIS2_CALL *
+	exit_thread) (axis2_thread_pool_t *pool, 
+				  axis2_thread_t *thd);
   /**
 	* Detaches a thread
 	* @param thd thread to be detached
 	* @return status of the operation
 	*/
-	axis2_status_t (AXIS2_CALL *thread_detach) (axis2_thread_pool_t *pool, 
+	axis2_status_t (AXIS2_CALL *
+	thread_detach) (axis2_thread_pool_t *pool, 
 					axis2_thread_t *thd);
   /**
 	* Frees resources used by thread_pool
 	* @param pool thread_pool to be freed
 	*/
-	axis2_status_t (AXIS2_CALL *free) (axis2_thread_pool_t *pool);
+	axis2_status_t (AXIS2_CALL *
+	free) (axis2_thread_pool_t *pool);
 };
 
 /**
@@ -101,14 +107,19 @@
 					axis2_allocator_t *allocator);
 
 #define AXIS2_THREAD_POOL_GET_THREAD(thread_pool, func, data) \
-						((thread_pool)->ops->get_thread(thread_pool, func, data))
+		((thread_pool)->ops->get_thread(thread_pool, func, data))
+
 #define AXIS2_THREAD_POOL_JOIN_THREAD(thread_pool, thd) \
-						((thread_pool)->ops->join_thread(thread_pool, thd))
+		((thread_pool)->ops->join_thread(thread_pool, thd))
+
 #define AXIS2_THREAD_POOL_EXIT_THREAD(thread_pool, thd) \
-						((thread_pool)->ops->exit_thread(thread_pool, thd))
+		((thread_pool)->ops->exit_thread(thread_pool, thd))
+
 #define AXIS2_THREAD_POOL_THREAD_DETACH(thread_pool, thd) \
-						((thread_pool)->ops->thread_detach(thread_pool, thd))
-#define AXIS2_THREAD_POOL_FREE(thread_pool) ((thread_pool)->free(thread_pool))
+		((thread_pool)->ops->thread_detach(thread_pool, thd))
+
+#define AXIS2_THREAD_POOL_FREE(thread_pool) \
+		((thread_pool)->free(thread_pool))
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/include/axis2_url.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_url.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/include/axis2_url.h Sun Mar 19 19:55:55 2006
@@ -47,26 +47,55 @@
  */  
 AXIS2_DECLARE_DATA struct axis2_url_ops
 {
-    axis2_char_t* (AXIS2_CALL *to_external_form) (axis2_url_t *url, 
-                    axis2_env_t **env);
-    axis2_status_t (AXIS2_CALL *set_protocol)(axis2_url_t *url, 
-                    axis2_env_t **env, axis2_char_t *protocol);
-	axis2_char_t* (AXIS2_CALL *get_protocol) (axis2_url_t *url, 
-                    axis2_env_t **env);
-	axis2_status_t (AXIS2_CALL *set_server)(axis2_url_t *url, 
-                    axis2_env_t **env, axis2_char_t *server);
-    axis2_char_t* (AXIS2_CALL *get_server)(axis2_url_t *url, 
-                    axis2_env_t **env);
-	axis2_status_t (AXIS2_CALL *set_port)(axis2_url_t *url, 
-                    axis2_env_t **env, int port);
-    int (AXIS2_CALL *get_port) (axis2_url_t *url, 
-                    axis2_env_t **env);
-	axis2_status_t (AXIS2_CALL *set_path)(axis2_url_t *url, 
-                    axis2_env_t **env, axis2_char_t *path);
-	axis2_char_t* (AXIS2_CALL *get_path)(axis2_url_t *url, 
-                    axis2_env_t **env);
-    axis2_status_t (AXIS2_CALL *free) (axis2_url_t *url, 
-                    axis2_env_t **env);
+    axis2_char_t* (AXIS2_CALL *
+	to_external_form) (axis2_url_t *url, 
+                       axis2_env_t **env);
+	
+    axis2_status_t (AXIS2_CALL *
+	set_protocol)(axis2_url_t *url, 
+                  axis2_env_t **env, 
+	              axis2_char_t *protocol);
+	
+	
+	axis2_char_t* (AXIS2_CALL *
+	get_protocol) (axis2_url_t *url, 
+                   axis2_env_t **env);
+	
+	axis2_status_t (AXIS2_CALL *
+	set_server)(axis2_url_t *url, 
+                axis2_env_t **env, 
+				axis2_char_t *server);
+	
+	
+    axis2_char_t* (AXIS2_CALL *
+	get_server)(axis2_url_t *url, 
+                axis2_env_t **env);
+				
+				
+	axis2_status_t (AXIS2_CALL *
+	set_port)(axis2_url_t *url, 
+              axis2_env_t **env, 
+			  int port);
+			  
+			  
+    int (AXIS2_CALL *
+	get_port) (axis2_url_t *url, 
+               axis2_env_t **env);
+			   
+			   
+	axis2_status_t (AXIS2_CALL *
+	set_path)(axis2_url_t *url, 
+              axis2_env_t **env, 
+			  axis2_char_t *path);
+			  
+			  
+	axis2_char_t* (AXIS2_CALL *
+	get_path)(axis2_url_t *url, 
+              axis2_env_t **env);
+			  
+    axis2_status_t (AXIS2_CALL *
+	free) (axis2_url_t *url, 
+           axis2_env_t **env);
 };
 
 /** 
@@ -80,27 +109,48 @@
 
 
 AXIS2_DECLARE(axis2_url_t *) 
-axis2_url_create (axis2_env_t **env, axis2_char_t *protocol, 
-						axis2_char_t *server, int port, axis2_char_t *path);
+axis2_url_create (axis2_env_t **env, 
+				  axis2_char_t *protocol, 
+				  axis2_char_t *server, 
+                  int port, 
+                  axis2_char_t *path);
+
+
 AXIS2_DECLARE(axis2_url_t *)
-axis2_url_parse_string(axis2_env_t **env, axis2_char_t *str_url);
+axis2_url_parse_string(axis2_env_t **env, 
+                       axis2_char_t *str_url);
+
 /************************** Start of function macros **************************/
 
 #define AXIS2_URL_TO_EXTERNAL_FORM(url, env) \
-						((url)->ops->to_external_form(url, env))
+		((url)->ops->to_external_form(url, env))
+
 #define AXIS2_URL_SET_PROTOCOL(url, env, protocol) \
-                        ((url)->ops->set_prtocol(url, env, protocol))
-#define AXIS2_URL_GET_PROTOCOL(url, env) ((url)->ops->get_protocol(url, env))
+        ((url)->ops->set_prtocol(url, env, protocol))
+		
+#define AXIS2_URL_GET_PROTOCOL(url, env) \
+		((url)->ops->get_protocol(url, env))
+		
 #define AXIS2_URL_SET_SERVER(url, env, server) \
-                        ((url)->ops->set_server(url, env, server))
-#define AXIS2_URL_GET_SERVER(url, env) ((url)->ops->get_server(url, env))
+        ((url)->ops->set_server(url, env, server))
+		
+#define AXIS2_URL_GET_SERVER(url, env) \
+		((url)->ops->get_server(url, env))
+		
 #define AXIS2_URL_SET_PORT(url, env, port) \
-						((url)->ops->set_port(url, env, port))
-#define AXIS2_URL_GET_PORT(url, env) ((url)->ops->get_port(url, env))
+		((url)->ops->set_port(url, env, port))
+		
+#define AXIS2_URL_GET_PORT(url, env) \
+		((url)->ops->get_port(url, env))
+		
 #define AXIS2_URL_SET_PATH(url, env, path) \
-                        ((url)->ops->set_path(url, env, path))
-#define AXIS2_URL_GET_PATH(url, env) ((url)->ops->get_path(url, env))
-#define AXIS2_URL_FREE(url, env) ((url)->ops->free(url, env))
+        ((url)->ops->set_path(url, env, path))
+		
+#define AXIS2_URL_GET_PATH(url, env) \
+		((url)->ops->get_path(url, env))
+		
+#define AXIS2_URL_FREE(url, env) \
+		((url)->ops->free(url, env))
 
 /************************** End of function macros ****************************/    
 

Modified: webservices/axis2/trunk/c/include/axis2_xml_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_xml_reader.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/include/axis2_xml_reader.h Sun Mar 19 19:55:55 2006
@@ -71,8 +71,10 @@
          *          axis2_xml_reader_event_types
          */
         
-        int (AXIS2_CALL *next)(axis2_xml_reader_t *parser,
-                               axis2_env_t **env);
+        int (AXIS2_CALL *
+		next)(axis2_xml_reader_t *parser,
+              axis2_env_t **env);
+		
          /**
          * free pull_parser
          * @param parser axis2_xml_reader struct 
@@ -80,8 +82,9 @@
          * @returns axis2_status_code
          */
         
-        axis2_status_t (AXIS2_CALL *free)(axis2_xml_reader_t *parser,
-                                          axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		free)(axis2_xml_reader_t *parser,
+              axis2_env_t **env);
         /**
          * Get the Number of attributes in the current element 
          * @param parser axis2_xml_reader  
@@ -89,8 +92,10 @@
          * @returns Number of attributes , AXIS2_FAILURE on error 
          */  
         
-        int (AXIS2_CALL *get_attribute_count)(axis2_xml_reader_t *parser,
-                                              axis2_env_t **env);
+        int (AXIS2_CALL *
+		get_attribute_count)(axis2_xml_reader_t *parser,
+                             axis2_env_t **env);
+							 
                                               
        /** This is used to get an attribute's localname using an index relative to 
          * current element.The iterations are not zero based. 
@@ -101,10 +106,10 @@
          * @returns the attribute localname 
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro         
          */
-        axis2_char_t* (AXIS2_CALL *get_attribute_name_by_number)
-                                                    (axis2_xml_reader_t *parser,
-                                                     axis2_env_t **env,
-                                                     int i);
+        axis2_char_t* (AXIS2_CALL *
+		get_attribute_name_by_number)(axis2_xml_reader_t *parser,
+                                      axis2_env_t **env,
+                                      int i);
                                                      
        /** This is used to get an attribute's prefix using an index relative to 
          * current element. The iterations are not zero based. 
@@ -116,10 +121,10 @@
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro         
          */                                                     
         
-        axis2_char_t* (AXIS2_CALL *get_attribute_prefix_by_number)
-                                                    (axis2_xml_reader_t *parser,
-                                                     axis2_env_t **env,
-                                                     int i);
+        axis2_char_t* (AXIS2_CALL *
+		get_attribute_prefix_by_number)(axis2_xml_reader_t *parser,
+                                        axis2_env_t **env,
+                                        int i);
                                                      
         /** get an attribute's value using an index relative to 
          * current element. The iterations are not zero based. 
@@ -131,10 +136,10 @@
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro         
          */        
                                              
-        axis2_char_t* (AXIS2_CALL *get_attribute_value_by_number)
-                                                    (axis2_xml_reader_t *parser,
-                                                     axis2_env_t **env,
-                                                     int i);
+        axis2_char_t* (AXIS2_CALL *
+		get_attribute_value_by_number)(axis2_xml_reader_t *parser,
+                                       axis2_env_t **env,
+                                       int i);
         
         /** get an attribute's namespace uri using an index relative to 
          * current element. The iterations are not zero based. 
@@ -146,10 +151,11 @@
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro        
          */ 
         
-        axis2_char_t* (AXIS2_CALL *get_attribute_namespace_by_number)
-                                                    (axis2_xml_reader_t *parser,
-                                                     axis2_env_t **env,
-                                                     int i);
+        axis2_char_t* (AXIS2_CALL *
+		get_attribute_namespace_by_number)(axis2_xml_reader_t *parser,
+                                           axis2_env_t **env,
+                                           int i);
+										   
        /** returns the text value of current element
          * @param parser pointer to parser
          * @param env environment, MUST not be NULL
@@ -157,8 +163,9 @@
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro 
          */
                                 
-        axis2_char_t* (AXIS2_CALL *get_value)(axis2_xml_reader_t *parser,
-                                              axis2_env_t **env);
+        axis2_char_t* (AXIS2_CALL *
+		get_value)(axis2_xml_reader_t *parser,
+                   axis2_env_t **env);
         
         /**
          * Returns the namespace count of current element 
@@ -166,8 +173,9 @@
          * @param env environment
          * @returns namespace count of current element,
          */
-        int (AXIS2_CALL *get_namespace_count)(axis2_xml_reader_t *parser,
-                                              axis2_env_t **env);
+        int (AXIS2_CALL *
+		get_namespace_count)(axis2_xml_reader_t *parser,
+                             axis2_env_t **env);
         /**
          * access the namespace uri of the namespaces declared in current element 
          * using an index 
@@ -177,10 +185,10 @@
          * @returns namespace uri of corresponding namespace 
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro         
          */
-        axis2_char_t* (AXIS2_CALL *get_namespace_uri_by_number)
-                                              (axis2_xml_reader_t *parser,
-                                               axis2_env_t **env,
-                                               int i);
+        axis2_char_t* (AXIS2_CALL *
+		get_namespace_uri_by_number)(axis2_xml_reader_t *parser,
+                                     axis2_env_t **env,
+                                     int i);
         /**
          * access the namespace prefix of the namespaces declared in current element 
          * using an index 
@@ -190,10 +198,10 @@
          * @returns namespace prefix of corresponding namespace 
          * caller must free the value using AXIS2_XML_READER_XML_FREE macro         
          */                                               
-        axis2_char_t* (AXIS2_CALL *get_namespace_prefix_by_number)
-                                               (axis2_xml_reader_t *parser,
-                                                axis2_env_t **env,
-                                                int i); 
+        axis2_char_t* (AXIS2_CALL *
+		get_namespace_prefix_by_number)(axis2_xml_reader_t *parser,
+                                        axis2_env_t **env,
+                                        int i); 
         /**
          * Used to obtain the current element prefix
          * @param parser parser struct 
@@ -202,8 +210,9 @@
          * caller must free the value using AXIS2_XML_READER_XML_FREE macro
          */         
         
-        axis2_char_t* (AXIS2_CALL *get_prefix)(axis2_xml_reader_t *parser,
-                                               axis2_env_t **env);   
+        axis2_char_t* (AXIS2_CALL *
+		get_prefix)(axis2_xml_reader_t *parser,
+                    axis2_env_t **env);   
         /**
          *  Used to obtain the current element localname
          * @param parser parser struct 
@@ -211,8 +220,9 @@
          * @returns localname , NULL on error 
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro
          */         
-        axis2_char_t* (AXIS2_CALL *get_name)(axis2_xml_reader_t *parser,
-                                             axis2_env_t **env); 
+        axis2_char_t* (AXIS2_CALL *
+		get_name)(axis2_xml_reader_t *parser,
+                  axis2_env_t **env); 
         /**
          * Used to get the processingInstruction target
          * @param parser parser struct
@@ -220,8 +230,9 @@
          * @returns target value of processingInstruction
          *          caller must free the value using AXIS2_XML_READER_XML_FREE macro
          */        
-        axis2_char_t* (AXIS2_CALL *get_pi_target)(axis2_xml_reader_t *parser,
-                                                  axis2_env_t **env);
+        axis2_char_t* (AXIS2_CALL *
+		get_pi_target)(axis2_xml_reader_t *parser,
+                       axis2_env_t **env);
         /**
          *  gets the processingInstruction data
          *@param parser parser struct
@@ -231,8 +242,9 @@
          */        
 
 
-        axis2_char_t* (AXIS2_CALL *get_pi_data)(axis2_xml_reader_t *parser,
-                                                axis2_env_t **env);
+        axis2_char_t* (AXIS2_CALL *
+		get_pi_data)(axis2_xml_reader_t *parser,
+                     axis2_env_t **env);
         /**
          *  used to get the DTD 
          * @param parser pointer to pull parser struct
@@ -240,8 +252,9 @@
          * @return text of doctype declaration. NULL is returns of no data 
          *         exists.
          */         
-        axis2_char_t* (AXIS2_CALL *get_dtd)(axis2_xml_reader_t *parser,
-                                            axis2_env_t **env);                                                
+        axis2_char_t* (AXIS2_CALL *
+		get_dtd)(axis2_xml_reader_t *parser,
+                 axis2_env_t **env);                                                
         /**
          *  Free function , this function wraps the underlying parser's 
          *  xml free function. For freeing values obatined by calling
@@ -252,13 +265,14 @@
          * @return status of the op, AXIS2_SUCCESS on success,
          *                  AXIS2_FAILURE on error.
          */         
-        axis2_status_t (AXIS2_CALL *xml_free)(axis2_xml_reader_t *parser,
-                                   axis2_env_t **env,
-                                   void *data);
+        axis2_status_t (AXIS2_CALL *
+		xml_free)(axis2_xml_reader_t *parser,
+                  axis2_env_t **env,
+                  void *data);
                                    
-        axis2_char_t* (AXIS2_CALL *get_char_set_encoding)
-                                             (axis2_xml_reader_t *parser,
-                                              axis2_env_t **env);                                                                                   
+        axis2_char_t* (AXIS2_CALL *
+		get_char_set_encoding)(axis2_xml_reader_t *parser,
+                               axis2_env_t **env);                                                                                   
     };
      
 /** 
@@ -362,6 +376,7 @@
 /** macro to free values returned by pull parser */        
 #define AXIS2_XML_READER_XML_FREE(parser, env, data) \
         ((parser)->ops->xml_free(parser, env, data))
+		
 #define AXIS2_XML_READER_GET_CHAR_SET_ENCODING(parser, env) \
         ((parser)->ops->get_char_set_encoding(parser, env))        
 

Modified: webservices/axis2/trunk/c/include/axis2_xml_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_xml_writer.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/include/axis2_xml_writer.h Sun Mar 19 19:55:55 2006
@@ -57,8 +57,9 @@
         *       AXIS2_SUCCESS on success and AXIS2_FAILURE on error
         */
         
-        axis2_status_t (AXIS2_CALL *free)(axis2_xml_writer_t *writer,
-                                          axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		free)(axis2_xml_writer_t *writer,
+              axis2_env_t **env);
        /**
         *  Write a start tag to output stream with localname.
         *  Internally the writer keeps track of the opened tags 
@@ -68,9 +69,10 @@
         *  @return the status of the op, AXIS2_SUCCESS on success
                     AXIS2_FAILURE on error.
         */
-        axis2_status_t (AXIS2_CALL *write_start_element)(
-                                    axis2_xml_writer_t *writer,
-                                    axis2_env_t **env, axis2_char_t *localname);
+        axis2_status_t (AXIS2_CALL *
+		write_start_element)(axis2_xml_writer_t *writer,
+                             axis2_env_t **env, 
+							 axis2_char_t *localname);
        /**
         *  write an end tag to the output relying on the internal
         *  state of writer to determine the prefix and localname of
@@ -80,8 +82,9 @@
         *  @return status of the op. AXIS2_SUCCESS on success.
         *           AXIS2_FAILURE on error.
         */
-        axis2_status_t (AXIS2_CALL *end_start_element)(axis2_xml_writer_t *writer,
-                                                       axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		end_start_element)(axis2_xml_writer_t *writer,
+                           axis2_env_t **env);
         /**
          * Write an element tag with localname and namespace uri 
          * @param writer pointer to xml writer struct
@@ -92,11 +95,11 @@
          * @returns status of the op, AXIS2_SUCCESS on success.
          *          AXIS2_FAILURE on error
          */
-        axis2_status_t (AXIS2_CALL *write_start_element_with_namespace)(
-                                        axis2_xml_writer_t *writer,
-                                        axis2_env_t **env,
-                                        axis2_char_t *localname,
-                                        axis2_char_t *namespace_uri);
+        axis2_status_t (AXIS2_CALL *
+		write_start_element_with_namespace)(axis2_xml_writer_t *writer,
+											axis2_env_t **env,
+											axis2_char_t *localname,
+											axis2_char_t *namespace_uri);
        
         /**
          * write a start tag to output
@@ -108,12 +111,12 @@
          * @return status of the op 
                    AXIS2_SUCCESS on success. AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_start_element_with_namespace_prefix)(
-                                        axis2_xml_writer_t *writer,
-                                        axis2_env_t **env,
-                                        axis2_char_t *localname,
-                                        axis2_char_t *namespace_uri,
-                                        axis2_char_t *prefix);       
+        axis2_status_t (AXIS2_CALL *
+		write_start_element_with_namespace_prefix)(axis2_xml_writer_t *writer,
+													axis2_env_t **env,
+													axis2_char_t *localname,
+													axis2_char_t *namespace_uri,
+													axis2_char_t *prefix);       
         /**
          * write an element tag with localname 
          * @param writer xml_writer
@@ -122,10 +125,10 @@
          * @return status of the op AXIS2_SUCCESS on success,
          *                AXIS2_FAILURE on error.
          */         
-        axis2_status_t (AXIS2_CALL *write_empty_element)(
-                                        axis2_xml_writer_t *writer,
-                                        axis2_env_t **env,
-                                        axis2_char_t *localname);
+        axis2_status_t (AXIS2_CALL *
+		write_empty_element)(axis2_xml_writer_t *writer,
+		                     axis2_env_t **env,
+							 axis2_char_t *localname);
         /**
          * write empty_element with localname and namespace uri.
          * @param writer xml writer
@@ -136,11 +139,11 @@
          *               AXIS2_FAILURE on error.
          */
         
-        axis2_status_t (AXIS2_CALL *write_empty_element_with_namespace)(
-                                        axis2_xml_writer_t *writer,
-                                        axis2_env_t **env,
-                                        axis2_char_t *localname,
-                                        axis2_char_t *namespace_uri);
+        axis2_status_t (AXIS2_CALL *
+		write_empty_element_with_namespace)(axis2_xml_writer_t *writer,
+											axis2_env_t **env,
+											axis2_char_t *localname,
+											axis2_char_t *namespace_uri);
         /**
          * write empty element with namespace uri and prefix 
          * @param writer xml_writer
@@ -151,12 +154,12 @@
          * @return status of the op, AXIS2_SUCCESS on success,
          *                    AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_empty_element_with_namespace_prefix)(
-                                        axis2_xml_writer_t *writer,
-                                        axis2_env_t **env,
-                                        axis2_char_t *localname,
-                                        axis2_char_t *namespace_uri,
-                                        axis2_char_t *prefix);
+        axis2_status_t (AXIS2_CALL *
+		write_empty_element_with_namespace_prefix)(axis2_xml_writer_t *writer,
+													axis2_env_t **env,
+													axis2_char_t *localname,
+													axis2_char_t *namespace_uri,
+													axis2_char_t *prefix);
         /**
          * write end tag with correct localname prefix resolved internally 
          * @param writer xml writer
@@ -164,8 +167,9 @@
          * @return status of the op, AXIS2_SUCCESS on success,
          *            AXIS2_FAILURE on failure 
          */
-        axis2_status_t (AXIS2_CALL *write_end_element)(axis2_xml_writer_t *writer,
-                                                       axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		write_end_element)(axis2_xml_writer_t *writer,
+                           axis2_env_t **env);
         /**
          * write end document
          * @param writer xml writer
@@ -173,8 +177,9 @@
          * @return status of the op AXIS2_SUCCESS on success,
          *              AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_end_document)(axis2_xml_writer_t *writer,
-                                                       axis2_env_t **env);
+        axis2_status_t (AXIS2_CALL *
+		write_end_document)(axis2_xml_writer_t *writer,
+                            axis2_env_t **env);
         /**
          * write attribute with localname and value
          * @param writer writer
@@ -184,10 +189,11 @@
          * @return status of the op AXIS2_SUCCESS on success,
          *                 AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_attribute)(axis2_xml_writer_t *writer,
-                                                     axis2_env_t **env,
-                                                     axis2_char_t *localname,
-                                                     axis2_char_t *value);
+        axis2_status_t (AXIS2_CALL *
+		write_attribute)(axis2_xml_writer_t *writer,
+						 axis2_env_t **env,
+						 axis2_char_t *localname,
+						 axis2_char_t *value);
         /**
          *  @param writer
          *  @param env environment
@@ -197,12 +203,12 @@
          *  @return status code of the op AXIS2_SUCCESS on success,
          *                    AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_attribute_with_namespace)(
-                                                  axis2_xml_writer_t *writer,
-                                                  axis2_env_t **env,
-                                                  axis2_char_t *localname,
-                                                  axis2_char_t *value,
-                                                  axis2_char_t *namespace_uri);
+        axis2_status_t (AXIS2_CALL *
+		write_attribute_with_namespace)(axis2_xml_writer_t *writer,
+										  axis2_env_t **env,
+										  axis2_char_t *localname,
+										  axis2_char_t *value,
+										  axis2_char_t *namespace_uri);
         /**
          * @param writer xml_writer
          * @param env environment
@@ -211,8 +217,8 @@
          * @param namespace uri namespaceuri
          * @param prefix prefix 
          */         
-        axis2_status_t (AXIS2_CALL *write_attribute_with_namespace_prefix)(
-                                                  axis2_xml_writer_t *writer,
+        axis2_status_t (AXIS2_CALL *
+		write_attribute_with_namespace_prefix)(axis2_xml_writer_t *writer,
                                                   axis2_env_t **env,
                                                   axis2_char_t *localname,
                                                   axis2_char_t *value,
@@ -227,10 +233,11 @@
          *               AXIS2_FAILURE on error.
          */
         
-        axis2_status_t (AXIS2_CALL *write_namespace)(axis2_xml_writer_t *writer,
-                                                     axis2_env_t **env,
-                                                     axis2_char_t *prefix,
-                                                     axis2_char_t *namespace_uri);   
+        axis2_status_t (AXIS2_CALL *
+		write_namespace)(axis2_xml_writer_t *writer,
+						 axis2_env_t **env,
+						 axis2_char_t *prefix,
+						 axis2_char_t *namespace_uri);   
         /**
          * @param writer xml_writer
          * @param env environment
@@ -239,10 +246,10 @@
          *               AXIS2_FAILURE on error.
          */
 
-        axis2_status_t (AXIS2_CALL *write_default_namespace)
-                                                    (axis2_xml_writer_t *writer,
-                                                     axis2_env_t **env,
-                                                    axis2_char_t *namespace_uri);  
+        axis2_status_t (AXIS2_CALL *
+		write_default_namespace)(axis2_xml_writer_t *writer,
+								 axis2_env_t **env,
+								 axis2_char_t *namespace_uri);  
         /**
          * @param writer xml_writer
          * @param env environment
@@ -252,9 +259,10 @@
          */
                                                     
 
-        axis2_status_t (AXIS2_CALL *write_comment)(axis2_xml_writer_t *writer,
-                                                   axis2_env_t **env,
-                                                   axis2_char_t *value);
+        axis2_status_t (AXIS2_CALL *
+		write_comment)(axis2_xml_writer_t *writer,
+					   axis2_env_t **env,
+					   axis2_char_t *value);
         /**
          * @param writer xml_writer
          * @param env environment
@@ -264,10 +272,10 @@
          */
 
 
-        axis2_status_t (AXIS2_CALL *write_processing_instruction)(
-                                                   axis2_xml_writer_t *writer,
-                                                   axis2_env_t **env,
-                                                   axis2_char_t *target);
+        axis2_status_t (AXIS2_CALL *
+		write_processing_instruction)(axis2_xml_writer_t *writer,
+									   axis2_env_t **env,
+									   axis2_char_t *target);
                                    
         /**
          * @param writer xml_writer
@@ -278,11 +286,11 @@
          *               AXIS2_FAILURE on error.
          */
                                    
-        axis2_status_t (AXIS2_CALL *write_processing_instruction_data)(
-                                                   axis2_xml_writer_t *writer,
-                                                   axis2_env_t **env,
-                                                   axis2_char_t *target,
-                                                   axis2_char_t *data);
+        axis2_status_t (AXIS2_CALL *
+		write_processing_instruction_data)(axis2_xml_writer_t *writer,
+										   axis2_env_t **env,
+										   axis2_char_t *target,
+										   axis2_char_t *data);
          
         /**
          * @param writer xml_writer
@@ -291,9 +299,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */                                           
-        axis2_status_t (AXIS2_CALL *write_cdata)(axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *data);
+        axis2_status_t (AXIS2_CALL *
+		write_cdata)(axis2_xml_writer_t *writer,
+					 axis2_env_t **env,
+					 axis2_char_t *data);
         
          
         /**
@@ -303,9 +312,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_dtd)(axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *dtd); 
+        axis2_status_t (AXIS2_CALL *
+		write_dtd)(axis2_xml_writer_t *writer,
+				   axis2_env_t **env,
+				   axis2_char_t *dtd); 
         
          
         /**
@@ -315,10 +325,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_entity_ref)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *name); 
+        axis2_status_t (AXIS2_CALL *
+		write_entity_ref)(axis2_xml_writer_t *writer,
+                          axis2_env_t **env,
+                          axis2_char_t *name); 
          
         /**
          * @param writer xml_writer
@@ -326,9 +336,9 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_start_document)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env);  
+        axis2_status_t (AXIS2_CALL *
+		write_start_document)(axis2_xml_writer_t *writer,
+                              axis2_env_t **env);  
         
          
         /**
@@ -338,10 +348,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_start_document_with_version)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *version);   
+        axis2_status_t (AXIS2_CALL *
+		write_start_document_with_version)(axis2_xml_writer_t *writer,
+                                           axis2_env_t **env,
+                                           axis2_char_t *version);   
          
         /**
          * @param writer xml_writer
@@ -351,11 +361,11 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_start_document_with_version_encoding)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *version,
-                                                 axis2_char_t *encoding);
+        axis2_status_t (AXIS2_CALL *
+		write_start_document_with_version_encoding)(axis2_xml_writer_t *writer,
+                                                    axis2_env_t **env,
+                                                    axis2_char_t *version,
+                                                    axis2_char_t *encoding);
          
         /**
          * @param writer xml_writer
@@ -364,10 +374,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */                                         
-        axis2_status_t (AXIS2_CALL *write_characters)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *text);   
+        axis2_status_t (AXIS2_CALL *
+		write_characters)(axis2_xml_writer_t *writer,
+                          axis2_env_t **env,
+                          axis2_char_t *text);   
          
         /**
          * @param writer xml_writer
@@ -376,9 +386,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-       axis2_char_t* (AXIS2_CALL *get_prefix)(  axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *uri);
+       axis2_char_t* (AXIS2_CALL *
+	   get_prefix)(axis2_xml_writer_t *writer,
+                   axis2_env_t **env,
+                   axis2_char_t *uri);
          
         /**
          * @param writer xml_writer
@@ -388,10 +399,11 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-       axis2_status_t (AXIS2_CALL *set_prefix)(  axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *prefix,
-                                                 axis2_char_t *uri);
+       axis2_status_t (AXIS2_CALL *
+	   set_prefix)(axis2_xml_writer_t *writer,
+                   axis2_env_t **env,
+                   axis2_char_t *prefix,
+                   axis2_char_t *uri);
          
         /**
          * @param writer xml_writer
@@ -400,10 +412,10 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */                                                 
-       axis2_status_t (AXIS2_CALL *set_default_prefix)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *uri);                                                 
+       axis2_status_t (AXIS2_CALL *
+	   set_default_prefix)(axis2_xml_writer_t *writer,
+                           axis2_env_t **env,
+                           axis2_char_t *uri);                                                 
          
         /**
          * @param writer xml_writer
@@ -413,14 +425,15 @@
          * @return status of op AXIS2_SUCCESS on success,
          *               AXIS2_FAILURE on error.
          */
-        axis2_status_t (AXIS2_CALL *write_encoded)(
-                                                 axis2_xml_writer_t *writer,
-                                                 axis2_env_t **env,
-                                                 axis2_char_t *text,
-                                                 int in_attr);
+        axis2_status_t (AXIS2_CALL *
+		write_encoded)(axis2_xml_writer_t *writer,
+                       axis2_env_t **env,
+                       axis2_char_t *text,
+                       int in_attr);
                                                  
-        axis2_char_t* (AXIS2_CALL *get_xml)(axis2_xml_writer_t *,
-                                             axis2_env_t **env);                                                 
+        axis2_char_t* (AXIS2_CALL *
+		get_xml)(axis2_xml_writer_t *writer,
+                 axis2_env_t **env);                                                 
 
     };
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Sun Mar 19 19:55:55 2006
@@ -353,7 +353,7 @@
             file, type);
         if(AXIS2_SUCCESS != status)
         {
-            int size_j = NULL;
+            int size_j = 0;
             int j = 0;
 
             size_j = AXIS2_ARRAY_LIST_SIZE(current_info_list, env);

Modified: webservices/axis2/trunk/c/modules/xml/om/axis2_om_node_internal.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/axis2_om_node_internal.h?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/axis2_om_node_internal.h (original)
+++ webservices/axis2/trunk/c/modules/xml/om/axis2_om_node_internal.h Sun Mar 19 19:55:55 2006
@@ -145,7 +145,9 @@
                           axis2_env_t **env,
                           struct axis2_om_stax_builder *builder);                           
 
-  
+AXIS2_DECLARE(struct axis2_om_stax_builder *)
+axis2_om_node_get_builder(axis2_om_node_t *om_node,
+                          axis2_env_t **env);                                
 /** @} */
     
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c Sun Mar 19 19:55:55 2006
@@ -112,7 +112,11 @@
     if(given_qname)
     {
            iterator_impl->given_qname = AXIS2_QNAME_CLONE(given_qname, env);  
-        /* iterator_impl->given_qname = given_qname; */
+           if(!(iterator_impl->given_qname))
+           {     
+                AXIS2_OM_CHILDREN_QNAME_ITERATOR_FREE(&(iterator_impl->iterator), env);
+                return NULL;
+           }                
     }
     iterator_impl->iterator.ops->free_fn = 
             axis2_om_children_qname_iterator_free;
@@ -138,7 +142,7 @@
         AXIS2_FREE((*env)->allocator, iterator->ops);
     if(iterator_impl->given_qname)
     {
-        /**AXIS2_QNAME_FREE(iterator_impl->given_qname, env); */
+        AXIS2_QNAME_FREE(iterator_impl->given_qname, env); 
         iterator_impl->given_qname = NULL;
     }
     AXIS2_FREE((*env)->allocator, iterator_impl);

Modified: webservices/axis2/trunk/c/modules/xml/om/om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_element.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_element.c Sun Mar 19 19:55:55 2006
@@ -19,6 +19,7 @@
 #include <axis2_om_attribute.h>
 #include <axis2_om_namespace.h>
 #include <axis2_xml_writer.h>
+#include <axis2_om_stax_builder.h>
 #include <string.h>
 
                                  
@@ -97,7 +98,7 @@
                                     axis2_env_t **env);
                                                                                                                                                                                                                                
 axis2_hash_t* AXIS2_CALL 
-axis2_om_element_get_all_namespaces(axis2_om_element_t *om_element,
+axis2_om_element_get_namespaces(axis2_om_element_t *om_element,
                                     axis2_env_t **env);                                                                                                                  
                                      
                                      
@@ -154,7 +155,10 @@
                                     axis2_env_t **env,
                                     axis2_om_node_t *element_node);                                                                                                                
                                                                       
-                                         
+axis2_status_t AXIS2_CALL
+axis2_om_element_build(axis2_om_element_t *om_ele,
+                       axis2_env_t **env,
+                       axis2_om_node_t *om_ele_node);
                                          
 /************************** end function prototypes **********************/
 typedef struct axis2_om_element_impl
@@ -303,8 +307,8 @@
         axis2_om_element_find_declared_namespace;  
     element->om_element.ops->get_all_attributes =
         axis2_om_element_get_all_attributes;   
-    element->om_element.ops->get_all_namespaces =
-        axis2_om_element_get_all_namespaces;
+    element->om_element.ops->get_namespaces =
+        axis2_om_element_get_namespaces;
     element->om_element.ops->get_qname =
         axis2_om_element_get_qname; 
         
@@ -330,7 +334,11 @@
     element->om_element.ops->to_string =
         axis2_om_element_to_string;
     element->om_element.ops->get_child_elements =
-        axis2_om_element_get_child_elements;        
+        axis2_om_element_get_child_elements;   
+
+    element->om_element.ops->build =
+        axis2_om_element_build;
+
     return &(element->om_element);
 }
 
@@ -964,9 +972,9 @@
 } 
 
 axis2_hash_t* AXIS2_CALL
-axis2_om_element_get_all_namespaces
-                                (axis2_om_element_t *om_element,
-                                 axis2_env_t **env)
+axis2_om_element_get_namespaces
+                     (axis2_om_element_t *om_element,
+                      axis2_env_t **env)
 {
     AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_element)->namespaces;
@@ -1294,3 +1302,32 @@
    }
    return NULL;
 }
+
+axis2_status_t AXIS2_CALL
+axis2_om_element_build(axis2_om_element_t *om_ele,
+                       axis2_env_t **env,
+                       axis2_om_node_t *om_ele_node)
+{
+    axis2_om_element_impl_t *om_ele_impl = NULL;
+    axis2_om_stax_builder_t *builder = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    
+    AXIS2_PARAM_CHECK((*env)->error, om_ele_node, AXIS2_FAILURE);
+    if(AXIS2_OM_NODE_GET_NODE_TYPE(om_ele_node, env) != AXIS2_OM_ELEMENT)
+        return AXIS2_FAILURE;
+        
+    om_ele_impl = AXIS2_INTF_TO_IMPL(om_ele);
+    
+    builder = axis2_om_node_get_builder(om_ele_node, env);
+    if(!builder)
+        return AXIS2_FAILURE;
+    while(!AXIS2_OM_NODE_GET_BUILD_STATUS(om_ele_node, env) && 
+            !AXIS2_OM_STAX_BUILDER_IS_COMPLETE(builder, env))
+    {
+        void *value  = NULL;
+        value   = AXIS2_OM_STAX_BUILDER_NEXT(builder, env);
+        if(!value)
+            return AXIS2_FAILURE;
+    }            
+    return AXIS2_SUCCESS;
+}                       

Modified: webservices/axis2/trunk/c/modules/xml/om/om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_node.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_node.c Sun Mar 19 19:55:55 2006
@@ -94,11 +94,6 @@
 axis2_om_node_get_document(axis2_om_node_t *om_node,
                            axis2_env_t **env);
 
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_build_next(axis2_om_node_t *om_node,
-                         axis2_env_t **env);                                                                                     
-
-
 /************************************************************************************/
 
 typedef struct axis2_om_node_impl
@@ -189,7 +184,6 @@
     node->om_node.ops->get_build_status = axis2_om_node_get_build_status;
     node->om_node.ops->get_data_element = axis2_om_node_get_data_element;
     node->om_node.ops->get_document = axis2_om_node_get_document;
-    node->om_node.ops->build_next = axis2_om_node_build_next;
         
     return &(node->om_node);
 }
@@ -669,23 +663,6 @@
     return AXIS2_INTF_TO_IMPL(om_node)->om_doc;
 }                           
 
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_build_next(axis2_om_node_t *om_node,
-                         axis2_env_t **env)
-{
-    axis2_om_stax_builder_t *builder = NULL;
-    axis2_om_node_impl_t *om_node_impl = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
-
-    om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
-    
-    builder = om_node_impl->builder;
-    if(!builder)
-        return NULL;
-    
-    return AXIS2_OM_STAX_BUILDER_NEXT(om_node_impl->builder, env);
-}
-
 void* AXIS2_CALL 
 axis2_om_node_get_data_element(axis2_om_node_t *om_node,
                                axis2_env_t **env)
@@ -826,4 +803,15 @@
     AXIS2_INTF_TO_IMPL(om_node)->builder = builder;
     return AXIS2_SUCCESS;
 
+}
+/**
+ * This is an internal function 
+ */
+AXIS2_DECLARE(axis2_om_stax_builder_t *)
+axis2_om_node_get_builder(axis2_om_node_t *om_node,
+                          axis2_env_t **env)
+{
+    if(!om_node)
+        return NULL;
+    return AXIS2_INTF_TO_IMPL(om_node)->builder;
 }

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c Sun Mar 19 19:55:55 2006
@@ -229,13 +229,19 @@
                                         axis2_char_t* exception)
 {
     axis2_soap_fault_t *fault = NULL;
+    axis2_status_t status = AXIS2_SUCCESS;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, body, NULL);
     AXIS2_PARAM_CHECK((*env)->error, exception, NULL);
     fault = axis2_soap_fault_create_with_parent(env, body);
     if(!fault)
         return NULL;
-    axis2_soap_fault_set_exception(fault, env, exception);
+    status = axis2_soap_fault_set_exception(fault, env, exception);
+    if(status == AXIS2_FAILURE)
+    {
+        axis2_soap_fault_free(fault, env);
+        return NULL;
+    }
     return fault;
 }
 
@@ -632,8 +638,11 @@
     if(!detail)
     {
         detail = axis2_soap_fault_detail_create_with_parent(env, fault);
+        if(!detail)
+            return AXIS2_FAILURE;
     }
-
+    /** create an om element with the exception enrty */
+    
     fault_detail_ele = axis2_om_element_create(env, NULL, 
                             AXIS2_SOAP_FAULT_DETAIL_EXCEPTION_ENTRY,
                             NULL, &fault_detail_entry_node);
@@ -641,10 +650,10 @@
     {
         return AXIS2_FAILURE;
     }
-    
+    /** set the exception string as a text node of newly created om element */
     AXIS2_OM_ELEMENT_SET_TEXT(fault_detail_ele,
          env, exception, fault_detail_entry_node);
-
+    /** now add this om element as a child of soap fault detail om element node */
     return AXIS2_SOAP_FAULT_DETAIL_ADD_DETAIL_ENTRY(detail, env, fault_detail_entry_node);             
 }                                                                                                                                                                                                                                                                                        
                                   

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_message.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_message.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_message.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_message.c Sun Mar 19 19:55:55 2006
@@ -45,10 +45,6 @@
 axis2_soap_message_get_soap_envelope(axis2_soap_message_t *message,
                                      axis2_env_t **env);
                                         
-axis2_status_t AXIS2_CALL 
-axis2_soap_message_set_soap_envelope(axis2_soap_message_t *message,
-                                      axis2_env_t **env,
-                                      axis2_soap_envelope_t *envelope);
                                         
 axis2_status_t AXIS2_CALL
 axis2_soap_message_serialize(axis2_soap_message_t *message,
@@ -96,7 +92,6 @@
             axis2_soap_message_free;
     soap_message_impl->soap_message.ops->serialize =
             axis2_soap_message_serialize;
-            
     soap_message_impl->soap_message.ops->get_soap_envelope =
             axis2_soap_message_get_soap_envelope;
                         
@@ -149,18 +144,6 @@
         return soap_message_impl->soap_envelope;        
     }
 }    
-
-axis2_status_t AXIS2_CALL
-axis2_soap_message_set_soap_envelope(axis2_soap_message_t *message,
-                                     axis2_env_t **env,
-                                     axis2_soap_envelope_t *soap_envelope)
-{
-    axis2_soap_message_impl_t *soap_message_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK((*env)->error, soap_envelope, AXIS2_FAILURE);
-    soap_message_impl->soap_envelope = soap_envelope;
-    return AXIS2_SUCCESS;    
-}
 
 axis2_status_t AXIS2_CALL
 axis2_soap_message_serialize(axis2_soap_message_t *message,

Modified: webservices/axis2/trunk/c/test/unit/main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/main.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/main.c (original)
+++ webservices/axis2/trunk/c/test/unit/main.c Sun Mar 19 19:55:55 2006
@@ -5,6 +5,7 @@
 #include "core/description/description_test.h"
 #include "core/engine/engine_test.h"
 #include "wsdl/wsdl_test.h"
+#include <stdio.h>
 
 void RunAllTests(void) {
     CuString *output = CuStringNew();

Modified: webservices/axis2/trunk/c/test/xml/om/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/test_om.c?rev=387127&r1=387126&r2=387127&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/test_om.c (original)
+++ webservices/axis2/trunk/c/test/xml/om/test_om.c Sun Mar 19 19:55:55 2006
@@ -256,6 +256,7 @@
         AXIS2_FREE(environment->allocator, output_buffer); 
      }        
      printf ("\nDONE\n");
+     
 
     return 0;
 }
@@ -272,7 +273,7 @@
     error = axis2_error_create(allocator);
     
     environment = axis2_env_create_with_error_log(allocator, error,  axis_log);
-/*    test_om_build (file_name); */
+    test_om_build (file_name); 
     test_om_serialize(); 
 
     axis2_env_free(environment); 



Mime
View raw message