axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r365296 - in /webservices/axis2/trunk/c: include/ modules/xml/soap/
Date Mon, 02 Jan 2006 05:44:42 GMT
Author: nandika
Date: Sun Jan  1 21:43:53 2006
New Revision: 365296

URL: http://svn.apache.org/viewcvs?rev=365296&view=rev
Log:
removed axis2_ prefix from c files 

Added:
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_code.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_detail.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_node.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_node.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_reason.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_role.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_role.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_sub_code.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_text.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_text.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_value.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_value.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_header.c
      - copied, changed from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_header_block.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header_block.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_utils.c
      - copied unchanged from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_utils.c
Removed:
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_code.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_detail.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_node.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_reason.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_role.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_sub_code.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_text.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_fault_value.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header_block.c
    webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_utils.c
Modified:
    webservices/axis2/trunk/c/include/axis2_soap_body.h
    webservices/axis2/trunk/c/include/axis2_soap_envelope.h
    webservices/axis2/trunk/c/include/axis2_soap_fault.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_code.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_detail.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_node.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_reason.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_role.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_sub_code.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_text.h
    webservices/axis2/trunk/c/include/axis2_soap_fault_value.h
    webservices/axis2/trunk/c/include/axis2_soap_header.h
    webservices/axis2/trunk/c/include/axis2_soap_header_block.h
    webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c

Modified: webservices/axis2/trunk/c/include/axis2_soap_body.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_body.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_body.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_body.h Sun Jan  1 21:43:53 2006
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
  
- 
- #ifndef AXIS2_SOAP_BODY_H
- #define AXIS2_SOAP_BODY_H
+#ifndef AXIS2_SOAP_BODY_H
+#define AXIS2_SOAP_BODY_H
  
     /**
     * @file axis2_soap_body.h
@@ -26,7 +25,8 @@
 #include <axis2_om_node.h>
 #include <axis2_om_element.h>
 #include <axis2_om_namespace.h>
-#include <axis2_soap_fault.h>    
+#include <axis2_soap_fault.h>
+#include <axis2_soap_envelope.h>    
 
 
 #ifdef __cplusplus
@@ -37,7 +37,6 @@
 
 typedef struct axis2_soap_body axis2_soap_body_t;
 typedef struct axis2_soap_body_ops axis2_soap_body_ops_t;
-struct axis2_soap_envelope;
     
 /**
  * @defgroup axis2_soap_body
@@ -63,7 +62,7 @@
  AXIS2_DECLARE_DATA   struct axis2_soap_body_ops
     {
         axis2_status_t (AXIS2_CALL *free)(axis2_soap_body_t *body,
-                               axis2_env_t **env);
+                                          axis2_env_t **env);
         /**
          * Indicates whether a <code>SOAPFault</code> object exists in
          * this <code>SOAPBody</code> object.
@@ -72,8 +71,8 @@
          *         this <code>SOAPBody</code> object; <code>false</code>
          *         otherwise
          */
-        axis2_bool_t (AXIS2_CALL *get_has_fault)(axis2_soap_body_t *body,
-            axis2_env_t **env);
+        axis2_bool_t (AXIS2_CALL *has_fault)(axis2_soap_body_t *body,
+                                                 axis2_env_t **env);
         /**
          * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code>
          * object.
@@ -82,7 +81,7 @@
          *         object
          */
         axis2_soap_fault_t* (AXIS2_CALL *get_fault)(axis2_soap_body_t *body,
-            axis2_env_t **env);
+                                                    axis2_env_t **env);
         /**
          * @param soapFault
          * @throws org.apache.axis2.om.OMException
@@ -90,15 +89,22 @@
          * @throws OMException
          */
         axis2_status_t (AXIS2_CALL *add_fault)(axis2_soap_body_t *body,
-            axis2_env_t **env,
-            axis2_soap_fault_t *soap_fault);
-        axis2_om_node_t* (AXIS2_CALL *get_base)(axis2_soap_body_t *body,
-                                        axis2_env_t **env);
+                                               axis2_env_t **env,
+                                               axis2_soap_fault_t *soap_fault);
+                                                
+        axis2_om_node_t* (AXIS2_CALL *get_base_node)(axis2_soap_body_t *body,
+                                                     axis2_env_t **env);
+                                                     
+        axis2_status_t* (AXIS2_CALL *set_base_node)(axis2_soap_body_t *body,
+                                                    axis2_env_t **env,
+                                                    axis2_om_node_t *om_node);
+        
         int (AXIS2_CALL *get_soap_version)(axis2_soap_body_t *body,
                                            axis2_env_t **env);
+         
         axis2_status_t (AXIS2_CALL *set_soap_version)(axis2_soap_body_t *body,
-                                           axis2_env_t **env,
-                                           int soap_version);
+                                                      axis2_env_t **env,
+                                                      int soap_version);
 };                                                      
 
   /**
@@ -117,24 +123,39 @@
     * @param env Environment. MUST NOT be NULL
     */
 AXIS2_DECLARE(axis2_soap_body_t *)
-axis2_soap_body_create(axis2_env_t **env, struct axis2_soap_envelope *envelope, 
-    axis2_om_namespace_t *ns);
+axis2_soap_body_create(axis2_env_t **env);    
     
-/******************** Macros **************************************************/
     
+AXIS2_DECLARE(axis2_soap_body_t *)
+axis2_soap_body_create_with_parent(axis2_env_t **env, 
+                                   struct axis2_soap_envelope *envelope,
+                                   axis2_om_namespace_t *ns);
+    
+/******************** Macros **************************************************/
     
 /** free soap_body */
 #define AXIS2_SOAP_BODY_FREE(body , env) \
         ((body)->ops->free(body, env))
-#define AXIS2_SOAP_BODY_GET_HAS_FAULT(body, env) ((body)->ops->get_has_fault(body, env))
-#define AXIS2_SOAP_BODY_GET_FAULT(body, env) ((body)->ops->get_fault(body, env))
-#define AXIS2_SOAP_BODY_ADD_FAULT(body, env, soap_fault) ((body)->ops->add_fault(body, env, soap_fault))
-#define AXIS2_SOAP_BODY_GET_BASE(body, env) ((body)->ops->get_base(body, env))
-#define AXIS2_SOAP_BODY_GET_SOAP_VERSION(body, env) ((body)->ops->get_soap_version(body, env))
-#define AXIS2_SOAP_BODY_SET_SOAP_VERSION(body, env, soap_version) ((body)->ops->set_soap_version(body, env, soap_version))        
+        
+#define AXIS2_SOAP_BODY_HAS_FAULT(body, env) \
+        ((body)->ops->has_fault(body, env))
+        
+#define AXIS2_SOAP_BODY_GET_FAULT(body, env) \
+        ((body)->ops->get_fault(body, env))
+        
+#define AXIS2_SOAP_BODY_ADD_FAULT(body, env, soap_fault) \
+        ((body)->ops->add_fault(body, env, soap_fault))
+        
+#define AXIS2_SOAP_BODY_GET_BASE_NODE(body, env) \
+        ((body)->ops->get_base(body, env))
+        
+#define AXIS2_SOAP_BODY_GET_SOAP_VERSION(body, env) \
+        ((body)->ops->get_soap_version(body, env))
+        
+#define AXIS2_SOAP_BODY_SET_SOAP_VERSION(body, env, soap_version) \
+        ((body)->ops->set_soap_version(body, env, soap_version))        
 
 /** @} */
-
 #ifdef __cplusplus
 }
 #endif

Modified: webservices/axis2/trunk/c/include/axis2_soap_envelope.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_envelope.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_envelope.h Sun Jan  1 21:43:53 2006
@@ -64,18 +64,20 @@
          *                     object
          * @throws OMException
          */
-        struct axis2_soap_header* (AXIS2_CALL *get_header)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env);
+        struct axis2_soap_header* (AXIS2_CALL *get_header)
+                                            (axis2_soap_envelope_t *envelope,
+                                             axis2_env_t **env);
         /**
          * Convenience method to add a SOAP header to this envelope
          *
          * @param namespaceURI
          * @param name
          */
-        struct axis2_soap_header_block* (AXIS2_CALL *add_header)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env,
-            axis2_char_t *namespace_uri, 
-            axis2_char_t *name);
+        struct axis2_soap_header_block* (AXIS2_CALL *add_header)
+                                            (axis2_soap_envelope_t *envelope,
+                                             axis2_env_t **env,
+                                             axis2_char_t *namespace_uri, 
+                                             axis2_char_t *name);
         /**
          * Returns the <CODE>SOAPBody</CODE> object associated with this
          * <CODE>SOAPEnvelope</CODE> object. <P> This SOAPBody will just be a
@@ -88,27 +90,47 @@
          *                     the <CODE>SOAPBody</CODE> object
          * @throws OMException
          */
-        struct axis2_soap_body* (AXIS2_CALL *get_body)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env);
-        axis2_status_t (AXIS2_CALL *serialize)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env,
-            axis2_om_output_t *om_output, 
-            axis2_bool_t cache);
+        struct axis2_soap_body* (AXIS2_CALL *get_body)
+                                        (axis2_soap_envelope_t *envelope,
+                                         axis2_env_t **env);
+        
+        axis2_status_t (AXIS2_CALL *serialize)
+                                        (axis2_soap_envelope_t *envelope,
+                                         axis2_env_t **env,
+                                         axis2_om_output_t *om_output, 
+                                         axis2_bool_t cache);
+                                         
         axis2_status_t (AXIS2_CALL *free)(axis2_soap_envelope_t *envelope,
-                               axis2_env_t **env);
-        axis2_om_node_t* (AXIS2_CALL *get_base)(axis2_soap_envelope_t *envelope,
-                                        axis2_env_t **env);
+                                          axis2_env_t **env);
+                                          
+        axis2_om_node_t* (AXIS2_CALL *get_base_node)
+                                        (axis2_soap_envelope_t *envelope,
+                                         axis2_env_t **env);
+                                         
+        axis2_status_t (AXIS2_CALL *set_base_node)
+                                        (axis2_soap_envelope_t *envelope,
+                                         axis2_env_t **env,
+                                         axis2_om_node_t *base_node);                                        
+                                         
         int (AXIS2_CALL *get_soap_version)(axis2_soap_envelope_t *envelope,
                                            axis2_env_t **env);
-        axis2_status_t (AXIS2_CALL *set_soap_version)(axis2_soap_envelope_t *envelope,
+                                           
+        axis2_status_t (AXIS2_CALL *set_soap_version)
+                                          (axis2_soap_envelope_t *envelope,
                                            axis2_env_t **env,
                                            int soap_version);
+                                           
         axis2_status_t (AXIS2_CALL *set_body)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env, struct axis2_soap_body *body);
+                                              axis2_env_t **env, 
+                                              struct axis2_soap_body *body);
+                                              
         axis2_status_t (AXIS2_CALL *set_header)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env, struct axis2_soap_header *header);
-        axis2_om_namespace_t* (AXIS2_CALL *get_namespace)(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env);
+                                                axis2_env_t **env, 
+                                                struct axis2_soap_header *header);
+                                                
+        axis2_om_namespace_t* (AXIS2_CALL *get_namespace)
+                                                (axis2_soap_envelope_t *envelope,
+                                                 axis2_env_t **env);
 
     };
 
@@ -132,17 +154,41 @@
                            
 /******************** Macros **************************************************/
 
-#define AXIS2_SOAP_ENVELOPE_GET_HEADDER(envelope, env) ((envelope)->ops->get_header(envelope, env))
-#define AXIS2_SOAP_ENVELOPE_ADD_HEADER(envelope, env, namespace_uri, name) ((envelope)->ops->add_header(envelope, env, namespace_uri, name))
-#define AXIS2_SOAP_ENVELOPE_GET_BODY(envelope, env) ((envelope)->ops->get_body(envelope, env))
-#define AXIS2_SOAP_ENVELOPE_SERIALIZE(envelope, env, om_output, cache) ((envelope)->ops->serialize(envelope, env, om_output, cache))
-#define AXIS2_SOAP_ENVELOPE_FREE(envelope, env) ((envelope)->ops->free(envelope, env))
-#define AXIS2_SOAP_ENVELOPE_GET_BASE(envelope, env) ((envelope)->ops->get_base(envelope, env))
-#define AXIS2_SOAP_ENVELOPE_GET_SOAP_VERSION(envelope, env) ((envelope)->ops->get_soap_version(envelope, env))
-#define AXIS2_SOAP_ENVELOPE_SET_SOAP_VERSION(envelope, env, soap_version) ((envelope)->ops->set_soap_version(envelope, env, soap_version))
-#define AXIS2_SOAP_ENVELOPE_SET_BODY(envelope, env, body) ((envelope)->ops->set_body(envelope, env, body))
-#define AXIS2_SOAP_ENVELOPE_SET_HEADER(envelope, env, header) ((envelope)->ops->set_header(envelope, env, header))
-#define AXIS2_SOAP_ENVELOPE_GET_NAMESPACE(envelope, env) ((envelope)->ops->get_namespace(envelope, env))
+#define AXIS2_SOAP_ENVELOPE_GET_HEADDER(envelope, env) \
+        ((envelope)->ops->get_header(envelope, env))
+        
+#define AXIS2_SOAP_ENVELOPE_ADD_HEADER(envelope, env, namespace_uri, name) \
+        ((envelope)->ops->add_header(envelope, env, namespace_uri, name))
+        
+#define AXIS2_SOAP_ENVELOPE_GET_BODY(envelope, env) \
+        ((envelope)->ops->get_body(envelope, env))
+        
+#define AXIS2_SOAP_ENVELOPE_SERIALIZE(envelope, env, om_output, cache) \
+        ((envelope)->ops->serialize(envelope, env, om_output, cache))
+        
+#define AXIS2_SOAP_ENVELOPE_FREE(envelope, env) \
+        ((envelope)->ops->free(envelope, env))
+        
+#define AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env) \
+        ((envelope)->ops->get_base_node(envelope, env))
+
+#define AXIS2_SOAP_ENVELOPE_SET_BASE_NODE(envelope, env, node) \
+        ((envelope)->ops->set_base_node(envelope, env, node))
+        
+#define AXIS2_SOAP_ENVELOPE_GET_SOAP_VERSION(envelope, env) \
+        ((envelope)->ops->get_soap_version(envelope, env))
+        
+#define AXIS2_SOAP_ENVELOPE_SET_SOAP_VERSION(envelope, env, soap_version) \
+        ((envelope)->ops->set_soap_version(envelope, env, soap_version))
+        
+#define AXIS2_SOAP_ENVELOPE_SET_BODY(envelope, env, body) \
+        ((envelope)->ops->set_body(envelope, env, body))
+        
+#define AXIS2_SOAP_ENVELOPE_SET_HEADER(envelope, env, header) \
+        ((envelope)->ops->set_header(envelope, env, header))
+        
+#define AXIS2_SOAP_ENVELOPE_GET_NAMESPACE(envelope, env) \
+        ((envelope)->ops->get_namespace(envelope, env))
 
 /** @} */
 

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault.h Sun Jan  1 21:43:53 2006
@@ -36,15 +36,14 @@
 typedef struct axis2_soap_fault axis2_soap_fault_t;
 typedef struct axis2_soap_fault_ops axis2_soap_fault_ops_t;
     
-typedef struct axis2_soap_fault_reason    axis2_soap_fault_reason_t;
-typedef struct axis2_soap_fault_detail    axis2_soap_fault_detail_t;
-typedef struct axis2_soap_fault_sub_code  axis2_soap_fault_sub_code_t;
-typedef struct axis2_soap_fault_code      axis2_soap_fault_code_t;
-typedef struct axis2_soap_fault_node      axis2_soap_fault_node_t;
-typedef struct axis2_soap_fault_role      axis2_soap_fault_role_t;
-typedef struct axis2_soap_fault_text      axis2_soap_fault_text_t;
-typedef struct axis2_soap_fault_value     axis2_soap_fault_value_t;
-    
+struct axis2_soap_fault_reason;
+struct axis2_soap_fault_detail;
+struct axis2_soap_fault_sub_code;
+struct axis2_soap_fault_code;
+struct axis2_soap_fault_node;
+struct axis2_soap_fault_role;
+struct axis2_soap_fault_text;
+struct axis2_soap_fault_value;
 struct axis2_soap_body;
     
     typedef enum axis2_soap_fault_types
@@ -86,43 +85,43 @@
         
         axis2_status_t (AXIS2_CALL *set_code)(axis2_soap_fault_t *fault,
                                               axis2_env_t **env,
-                                              axis2_soap_fault_code_t *code);
+                                              struct axis2_soap_fault_code *code);
                                               
-        axis2_soap_fault_code_t * (AXIS2_CALL *get_code)
+        struct axis2_soap_fault_code * (AXIS2_CALL *get_code)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env);
                                          
         axis2_status_t (AXIS2_CALL *set_reason)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env,
-                                              axis2_soap_fault_reason_t *reason);
+                                              struct axis2_soap_fault_reason *reason);
                                               
-        axis2_soap_fault_reason_t* (AXIS2_CALL *get_reason)
+        struct axis2_soap_fault_reason *(AXIS2_CALL *get_reason)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env);
                                              
         axis2_status_t (AXIS2_CALL *set_node)(axis2_soap_fault_t *fault,
                                               axis2_env_t **env,
-                                              axis2_soap_fault_node_t *node);
+                                              struct axis2_soap_fault_node *node);
                                               
-        axis2_soap_fault_node_t* (AXIS2_CALL *get_node)
+        struct axis2_soap_fault_node* (AXIS2_CALL *get_node)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env);
                                              
         axis2_status_t (AXIS2_CALL *set_role)(axis2_soap_fault_t *fault,
                                               axis2_env_t **env,
-                                              axis2_soap_fault_role_t *role);
+                                              struct axis2_soap_fault_role *role);
                                               
-        axis2_soap_fault_role_t* (AXIS2_CALL *get_role)
+        struct axis2_soap_fault_role* (AXIS2_CALL *get_role)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env);
 
         axis2_status_t (AXIS2_CALL *set_detail)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env,
-                                              axis2_soap_fault_detail_t *detail);
+                                              struct axis2_soap_fault_detail *detail);
                                         
-        axis2_soap_fault_detail_t* (AXIS2_CALL *get_detail)
+        struct axis2_soap_fault_detail* (AXIS2_CALL *get_detail)
                                              (axis2_soap_fault_t *fault,
                                               axis2_env_t **env);  
                                               

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_code.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_code.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_code.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_code.h Sun Jan  1 21:43:53 2006
@@ -31,7 +31,10 @@
 #endif
 
     typedef struct axis2_soap_fault_code_ops axis2_soap_fault_code_ops_t;
-
+    typedef struct axis2_soap_fault_code axis2_soap_fault_code_t;
+    
+    struct axis2_soap_fault_value;
+    struct axis2_soap_fault_sub_code;
 /**
  * @defgroup axis2_soap_fault_code
  * @ingroup axis2_soap
@@ -58,18 +61,18 @@
         axis2_status_t (AXIS2_CALL *set_value)
                                     (axis2_soap_fault_code_t *fault_code,
                                      axis2_env_t **env,
-                                     axis2_soap_fault_value_t *fault_val);
+                                     struct axis2_soap_fault_value *fault_val);
 
         axis2_status_t (AXIS2_CALL *set_sub_code)
                                     (axis2_soap_fault_code_t *fault_code,
                                      axis2_env_t **env,
-                                     axis2_soap_fault_sub_code_t *fault_subcode);                                                                         
+                                     struct axis2_soap_fault_sub_code *fault_subcode);                                                                         
         
-        axis2_soap_fault_sub_code_t* (AXIS2_CALL *get_sub_code)                                         
+        struct axis2_soap_fault_sub_code* (AXIS2_CALL *get_sub_code)                                         
                                     (axis2_soap_fault_code_t *fault_code,
                                      axis2_env_t **env);
                                      
-        axis2_soap_fault_value_t* (AXIS2_CALL *get_value)                                         
+        struct axis2_soap_fault_value* (AXIS2_CALL *get_value)                                         
                                     (axis2_soap_fault_code_t *fault_code,
                                      axis2_env_t **env);
                                      

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_detail.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_detail.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_detail.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_detail.h Sun Jan  1 21:43:53 2006
@@ -31,8 +31,8 @@
 {
 #endif
 
-    typedef struct axis2_soap_fault_detail_ops 
-                        axis2_soap_fault_detail_ops_t;
+    typedef struct axis2_soap_fault_detail_ops axis2_soap_fault_detail_ops_t;
+    typedef struct axis2_soap_fault_detail axis2_soap_fault_detail_t;
 
 /**
  * @defgroup axis2_soap_fault_detail
@@ -77,11 +77,11 @@
                                  axis2_env_t **env);
         
         int (AXIS2_CALL *get_soap_version)
-                                (axis2_soap_fault_detail_t *fault_node,
+                                (axis2_soap_fault_detail_t *fault_detail,
                                  axis2_env_t **env);
                                  
         axis2_status_t (AXIS2_CALL *set_soap_version)
-                                (axis2_soap_fault_detail_t *fault_node,
+                                (axis2_soap_fault_detail_t *fault_detail,
                                  axis2_env_t **env,
                                  int soap_version);                                  
                                                                                                                 

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_node.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_node.h Sun Jan  1 21:43:53 2006
@@ -30,7 +30,7 @@
 #endif
 
     typedef struct axis2_soap_fault_node_ops axis2_soap_fault_node_ops_t;
-
+    typedef struct axis2_soap_fault_node axis2_soap_fault_node_t;
 /**
  * @defgroup axis2_soap_fault_node
  * @ingroup axis2_soap

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_reason.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_reason.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_reason.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_reason.h Sun Jan  1 21:43:53 2006
@@ -30,7 +30,8 @@
 #endif
 
 typedef struct axis2_soap_fault_reason_ops axis2_soap_fault_reason_ops_t;
-
+typedef struct axis2_soap_fault_reason axis2_soap_fault_reason_t;
+struct axis2_soap_fault_text;
 /**
  * @defgroup axis2_soap_fault_reason
  * @ingroup axis2_soap
@@ -58,9 +59,9 @@
         axis2_status_t (AXIS2_CALL *set_soap_text)
                                 (axis2_soap_fault_reason_t *fault_reason,
                                  axis2_env_t **env,
-                                 axis2_soap_fault_text_t *soap_text);
+                                 struct axis2_soap_fault_text *soap_text);
                                      
-        axis2_soap_fault_text_t* (AXIS2_CALL *get_soap_text)                                         
+        struct axis2_soap_fault_text* (AXIS2_CALL *get_soap_text)                                         
                                 (axis2_soap_fault_reason_t *fault_reason,
                                  axis2_env_t **env);
                                      
@@ -107,16 +108,7 @@
                             axis2_soap_fault_t *fault,
                             axis2_bool_t extact_ns_from_parent);
                             
-AXIS2_DECLARE(axis2_soap_fault_reason_t *)
-axis2_soap11_fault_reason_create_with_parent(axis2_env_t **env,
-                            axis2_soap_fault_t *fault);
-
-AXIS2_DECLARE(axis2_soap_fault_reason_t *)
-axis2_soap12_fault_reason_create_with_parent(axis2_env_t **env,
-                            axis2_soap_fault_t *fault);
-
 /******************** Macros **************************************************/
-    
     
 /** free soap_fault_reason */
 #define AXIS2_SOAP_FAULT_REASON_FREE(fault_reason , env) \

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_role.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_role.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_role.h Sun Jan  1 21:43:53 2006
@@ -31,7 +31,7 @@
 #endif
 
     typedef struct axis2_soap_fault_role_ops axis2_soap_fault_role_ops_t;
-
+    typedef struct axis2_soap_fault_role axis2_soap_fault_role_t;
 /**
  * @defgroup axis2_soap_fault_role
  * @ingroup axis2_soap

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_sub_code.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_sub_code.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_sub_code.h Sun Jan  1 21:43:53 2006
@@ -23,7 +23,7 @@
     * @brief axis2_soap_fault_sub_code struct
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault.h>
+#include <axis2_soap_fault_code.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -31,7 +31,8 @@
 #endif
 
     typedef struct axis2_soap_fault_sub_code_ops axis2_soap_fault_sub_code_ops_t;
-
+    typedef struct axis2_soap_fault_sub_code axis2_soap_fault_sub_code_t;
+    struct axis2_soap_fault_value;
 /**
  * @defgroup axis2_soap_fault_sub_code
  * @ingroup axis2_soap
@@ -59,7 +60,7 @@
         axis2_status_t (AXIS2_CALL *set_value)
                              (axis2_soap_fault_sub_code_t *fault_sub_code,
                               axis2_env_t **env,
-                              axis2_soap_fault_value_t *fault_sub_code_val);
+                              struct axis2_soap_fault_value *fault_sub_code_val);
 
         axis2_status_t (AXIS2_CALL *set_sub_code)
                              (axis2_soap_fault_sub_code_t *fault_sub_code,
@@ -70,7 +71,7 @@
                              (axis2_soap_fault_sub_code_t *fault_sub_code,
                               axis2_env_t **env);
                                      
-        axis2_soap_fault_value_t* (AXIS2_CALL *get_value)                                         
+        struct axis2_soap_fault_value* (AXIS2_CALL *get_value)                                         
                              (axis2_soap_fault_sub_code_t *fault_sub_code,
                               axis2_env_t **env);
                                      

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_text.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_text.h Sun Jan  1 21:43:53 2006
@@ -22,7 +22,7 @@
     * @brief axis2_soap_fault_text 
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault.h>
+#include <axis2_soap_fault_reason.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -30,7 +30,7 @@
 #endif
 
     typedef struct axis2_soap_fault_text_ops axis2_soap_fault_text_ops_t;
-
+    typedef struct axis2_soap_fault_text axis2_soap_fault_text_t;
 /**
  * @defgroup axis2_soap_fault_text
  * @ingroup axis2_soap

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault_value.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault_value.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault_value.h Sun Jan  1 21:43:53 2006
@@ -23,6 +23,7 @@
     */
 #include <axis2_env.h>
 #include <axis2_soap_fault.h>
+#include <axis2_soap_fault_sub_code.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -30,7 +31,7 @@
 #endif
 
 typedef struct axis2_soap_fault_value_ops axis2_soap_fault_value_ops_t;
-
+typedef struct axis2_soap_fault_value axis2_soap_fault_value_t;
 /**
  * @defgroup axis2_soap_fault_value
  * @ingroup axis2_soap_fault_

Modified: webservices/axis2/trunk/c/include/axis2_soap_header.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_header.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_header.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_header.h Sun Jan  1 21:43:53 2006
@@ -28,8 +28,7 @@
 #include <axis2_om_children_qname_iterator.h>
 #include <axis2_om_children_with_specific_attribute_iterator.h>
 #include <axis2_hash.h>
-#include <axis2_soap_header_block.h>
-
+#include <axis2_soap_envelope.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -38,8 +37,8 @@
     
 typedef struct axis2_soap_header  axis2_soap_header_t;
 typedef struct axis2_soap_header_ops    axis2_soap_header_ops_t;
-    
-struct axis2_soap_envelope;
+
+struct axis2_soap_header_block;    
 
     
 /**
@@ -73,7 +72,7 @@
         * @return the new <CODE>SOAPHeaderBlock</CODE> object that was inserted
         *         into this <CODE>SOAPHeader</CODE> object
         */
-        axis2_soap_header_block_t* (AXIS2_CALL *add_header_block)
+        struct axis2_soap_header_block* (AXIS2_CALL *add_header_block)
                                         (axis2_soap_header_t* header,
                                          axis2_env_t **env,
                                          axis2_char_t *localname,

Modified: webservices/axis2/trunk/c/include/axis2_soap_header_block.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_header_block.h?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_header_block.h Sun Jan  1 21:43:53 2006
@@ -26,6 +26,7 @@
 #include <axis2_om_node.h>
 #include <axis2_om_element.h>
 #include <axis2_array_list.h>
+#include <axis2_soap_header.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -34,7 +35,6 @@
 
     typedef struct axis2_soap_header_block axis2_soap_header_block_t;
     typedef struct axis2_soap_header_block_ops axis2_soap_header_block_ops_t;
-    struct axis2_soap_header;
     
 /**
  * @defgroup axis2_soap_header_block

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_body.c?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_body.c Sun Jan  1 21:43:53 2006
@@ -25,7 +25,7 @@
  {
     axis2_soap_body_t soap_body;
     
-    axis2_om_node_t *base;
+    axis2_om_node_t *om_ele_node;
     
     int soap_version;
     
@@ -44,54 +44,99 @@
 axis2_status_t AXIS2_CALL
 axis2_soap_body_free(axis2_soap_body_t *body,
                        axis2_env_t **env);
-axis2_bool_t AXIS2_CALL axis2_soap_body_get_has_fault(axis2_soap_body_t *body,
-    axis2_env_t **env);
-axis2_soap_fault_t* AXIS2_CALL axis2_soap_body_get_fault(axis2_soap_body_t *body,
-    axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_soap_body_add_fault(axis2_soap_body_t *body,
-    axis2_env_t **env,
-    axis2_soap_fault_t *soap_fault);
+                       
+axis2_bool_t AXIS2_CALL 
+axis2_soap_body_has_fault(axis2_soap_body_t *body,
+                              axis2_env_t **env);
+                              
+axis2_soap_fault_t* AXIS2_CALL 
+axis2_soap_body_get_fault(axis2_soap_body_t *body,
+                          axis2_env_t **env);
+                          
+axis2_status_t AXIS2_CALL 
+axis2_soap_body_add_fault(axis2_soap_body_t *body,
+                          axis2_env_t **env,
+                          axis2_soap_fault_t *soap_fault);
+                          
 axis2_om_node_t* AXIS2_CALL 
-axis2_soap_body_get_base(axis2_soap_body_t *body,
-                                axis2_env_t **env);
+axis2_soap_body_get_base_node(axis2_soap_body_t *body,
+                              axis2_env_t **env);
+                              
+axis2_status_t AXIS2_CALL
+axis2_soap_body_set_base_node(axis2_soap_body_t *body,
+                              axis2_env_t **env,
+                              axis2_om_node_t *om_node);                              
+                         
 int AXIS2_CALL 
 axis2_soap_body_get_soap_version(axis2_soap_body_t *body,
-                                   axis2_env_t **env);
+                                 axis2_env_t **env);
 axis2_status_t AXIS2_CALL 
 axis2_soap_body_set_soap_version(axis2_soap_body_t *body,
-                                   axis2_env_t **env,
-                                   int soap_version);
+                                 axis2_env_t **env,
+                                 int soap_version);
 
 /*************** function implementations *************************************/
-
 axis2_soap_body_t* AXIS2_CALL
-axis2_soap_body_create(axis2_env_t **env, struct axis2_soap_envelope *envelope, axis2_om_namespace_t *ns)
+axis2_soap_body_create(axis2_env_t **env)
 {
     axis2_soap_body_impl_t *body_impl = NULL;
-    axis2_om_element_t *ele = NULL;
-    axis2_om_node_t *parent = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     body_impl = (axis2_soap_body_impl_t*)AXIS2_MALLOC(
-                    (*env)->allocator,
-                    sizeof(axis2_soap_body_impl_t));
+                (*env)->allocator,
+                sizeof(axis2_soap_body_impl_t));
+                
     if(!body_impl)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     body_impl->soap_body.ops = NULL;
-    body_impl->base = NULL;
-    body_impl->soap_version = AXIS2_SOAP12;    
+    body_impl->om_ele_node = NULL;
+    body_impl->soap_version = AXIS2_SOAP_VERSION_NOT_SET;    
     body_impl->has_fault = AXIS2_FALSE;
-    body_impl->soap_fault = NULL;
+    body_impl->soap_fault = NULL; 
+
+    body_impl->soap_body.ops = (axis2_soap_body_ops_t*) AXIS2_MALLOC(
+                               (*env)->allocator, sizeof(axis2_soap_body_ops_t));
+
+    if(!(body_impl->soap_body.ops))
+    {
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_FREE((*env)->allocator, body_impl);
+        body_impl = NULL;
+        return NULL;
+    }
+
+    body_impl->soap_body.ops->free = axis2_soap_body_free;
+    body_impl->soap_body.ops->has_fault = axis2_soap_body_has_fault;
+    body_impl->soap_body.ops->get_fault = axis2_soap_body_get_fault;
+    body_impl->soap_body.ops->add_fault = axis2_soap_body_add_fault;
+    body_impl->soap_body.ops->get_base_node = axis2_soap_body_get_base_node;
+    body_impl->soap_body.ops->get_soap_version = axis2_soap_body_get_soap_version;
+    body_impl->soap_body.ops->set_soap_version = axis2_soap_body_set_soap_version;
+    
+    return &(body_impl->soap_body);
+return NULL;
+}
+
+
+
+axis2_soap_body_t* AXIS2_CALL
+axis2_soap_body_create_with_parent(axis2_env_t **env, axis2_soap_envelope_t *envelope, axis2_om_namespace_t *ns)
+{
+    axis2_soap_body_impl_t *body_impl = NULL;
+    axis2_om_element_t *ele = NULL;
+    axis2_om_node_t *parent = NULL;
+    
+    AXIS2_ENV_CHECK(env, NULL);
     
     /*get parent node from SOAP envelope */
     if (envelope)
     {
-        parent = AXIS2_SOAP_ENVELOPE_GET_BASE(envelope, env);
+        parent = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
     }
     
-    ele = axis2_om_element_create(env, parent, AXIS2_SOAP_BODY_LOCAL_NAME, ns, &(body_impl->base));
+    ele = axis2_om_element_create(env, parent, AXIS2_SOAP_BODY_LOCAL_NAME, ns, &(body_impl->om_ele_node));
     if (!ele)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -107,15 +152,7 @@
         return NULL;        
     }
     
-    body_impl->soap_body.ops->free = axis2_soap_body_free;
-    body_impl->soap_body.ops->get_has_fault = axis2_soap_body_get_has_fault;
-    body_impl->soap_body.ops->get_fault = axis2_soap_body_get_fault;
-    body_impl->soap_body.ops->add_fault = axis2_soap_body_add_fault;
-    body_impl->soap_body.ops->get_base = axis2_soap_body_get_base;
-    body_impl->soap_body.ops->get_soap_version = axis2_soap_body_get_soap_version;
-    body_impl->soap_body.ops->set_soap_version = axis2_soap_body_set_soap_version;
-    
-    return &(body_impl->soap_body);        
+    return &(body_impl->soap_body);           
 }
 
 axis2_status_t AXIS2_CALL
@@ -132,10 +169,10 @@
         body->ops = NULL;
     }
     
-    if(body_impl->base)
+    if(body_impl->om_ele_node)
     {
-        AXIS2_OM_NODE_FREE_TREE(body_impl->base, env);
-        body_impl->base = NULL;
+        AXIS2_OM_NODE_FREE_TREE(body_impl->om_ele_node, env);
+        body_impl->om_ele_node = NULL;
     }
     
     AXIS2_FREE((*env)->allocator, body_impl);
@@ -151,7 +188,7 @@
  *         this <code>SOAPBody</code> object; <code>false</code>
  *         otherwise
  */
-axis2_bool_t AXIS2_CALL axis2_soap_body_get_has_fault(axis2_soap_body_t *body,
+axis2_bool_t AXIS2_CALL axis2_soap_body_has_fault(axis2_soap_body_t *body,
     axis2_env_t **env) 
 {
     axis2_soap_body_impl_t *body_impl = NULL;
@@ -242,7 +279,7 @@
     if (soap_fault)
     {
         body_impl->soap_fault = soap_fault;
-        AXIS2_OM_NODE_ADD_CHILD(body_impl->base, env, AXIS2_SOAP_FAULT_GET_BASE_NODE(soap_fault, env));
+        AXIS2_OM_NODE_ADD_CHILD(body_impl->om_ele_node, env, AXIS2_SOAP_FAULT_GET_BASE_NODE(soap_fault, env));
         body_impl->has_fault = AXIS2_TRUE;
     }
     
@@ -250,12 +287,32 @@
 }
 
 axis2_om_node_t* AXIS2_CALL 
-axis2_soap_body_get_base(axis2_soap_body_t *body,
+axis2_soap_body_get_base_node(axis2_soap_body_t *body,
                                 axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
-    return AXIS2_INTF_TO_IMPL(body)->base;
+    AXIS2_FUNC_PARAM_CHECK(body, env, NULL);
+    return AXIS2_INTF_TO_IMPL(body)->om_ele_node;
 }
+
+axis2_status_t AXIS2_CALL
+axis2_soap_body_set_base_node(axis2_soap_body_t *body,
+                              axis2_env_t **env,
+                              axis2_om_node_t *node)
+{
+   axis2_soap_body_impl_t *body_impl = NULL;
+   AXIS2_FUNC_PARAM_CHECK( body_impl, env, AXIS2_FAILURE);
+   AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
+   body_impl = AXIS2_INTF_TO_IMPL(body);
+   
+   if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
+   {
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
+        return AXIS2_FAILURE;
+   }
+   body_impl->om_ele_node = node;
+   return AXIS2_SUCCESS;
+}                              
+                              
                                              
 int AXIS2_CALL 
 axis2_soap_body_get_soap_version(axis2_soap_body_t *body,

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=365296&r1=365295&r2=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Sun Jan  1 21:43:53 2006
@@ -17,6 +17,7 @@
  #include <axis2_soap_envelope.h>
  #include <axis2_soap_body.h>
  #include <axis2_soap_header.h>
+ #include <axis2_soap_header_block.h>
  #include <axis2_hash.h>
  #include <axis2_soap.h>
  
@@ -26,7 +27,7 @@
  {
     axis2_soap_envelope_t soap_envelope;
     
-    axis2_om_node_t *base;
+    axis2_om_node_t *om_ele_node;
     
     int soap_version;
     
@@ -42,24 +43,34 @@
  
  /****************** Function prototypes **************************************/
 
-axis2_soap_header_t* AXIS2_CALL axis2_soap_envelope_get_header(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env);
-axis2_soap_header_block_t* AXIS2_CALL axis2_soap_envelope_add_header(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env,
-    axis2_char_t *namespace_uri, 
-    axis2_char_t *name);
-axis2_soap_body_t* AXIS2_CALL axis2_soap_envelope_get_body(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_soap_envelope_serialize(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env,
-    axis2_om_output_t *om_output, 
-    axis2_bool_t cache);
+axis2_soap_header_t* AXIS2_CALL
+ axis2_soap_envelope_get_header(axis2_soap_envelope_t *envelope,
+                                axis2_env_t **env);
+                                
+                                
+axis2_soap_header_block_t* AXIS2_CALL 
+axis2_soap_envelope_add_header(axis2_soap_envelope_t *envelope,
+                                axis2_env_t **env,
+                                axis2_char_t *namespace_uri, 
+                                axis2_char_t *name);
+                                
+axis2_soap_body_t* AXIS2_CALL 
+axis2_soap_envelope_get_body(axis2_soap_envelope_t *envelope,
+                                axis2_env_t **env);
+                                
+                                
+axis2_status_t AXIS2_CALL 
+axis2_soap_envelope_serialize(axis2_soap_envelope_t *envelope,
+                                axis2_env_t **env,
+                                axis2_om_output_t *om_output, 
+                                axis2_bool_t cache);
+                                
 axis2_status_t AXIS2_CALL
 axis2_soap_envelope_free(axis2_soap_envelope_t *envelope,
-                       axis2_env_t **env);
+                            axis2_env_t **env);
 axis2_om_node_t* AXIS2_CALL 
-axis2_soap_envelope_get_base(axis2_soap_envelope_t *envelope,
-                                axis2_env_t **env);
+axis2_soap_envelope_get_base_node(axis2_soap_envelope_t *envelope,
+                             axis2_env_t **env);
 int AXIS2_CALL 
 axis2_soap_envelope_get_soap_version(axis2_soap_envelope_t *envelope,
                                    axis2_env_t **env);
@@ -67,12 +78,20 @@
 axis2_soap_envelope_set_soap_version(axis2_soap_envelope_t *envelope,
                                    axis2_env_t **env,
                                    int soap_version);
-axis2_status_t AXIS2_CALL axis2_soap_envelope_set_body(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env, axis2_soap_body_t *body);
-axis2_status_t AXIS2_CALL axis2_soap_envelope_set_header(axis2_soap_envelope_t *envelope,
-    axis2_env_t **env, axis2_soap_header_t *header);
-axis2_om_namespace_t* AXIS2_CALL axis2_soap_envelope_get_namespace(axis2_soap_envelope_t *envelope,
-            axis2_env_t **env);
+                                   
+axis2_status_t AXIS2_CALL 
+axis2_soap_envelope_set_body(axis2_soap_envelope_t *envelope,
+                             axis2_env_t **env, 
+                             axis2_soap_body_t *body);
+
+axis2_status_t AXIS2_CALL 
+axis2_soap_envelope_set_header(axis2_soap_envelope_t *envelope,
+                               axis2_env_t **env, 
+                               axis2_soap_header_t *header);
+                               
+axis2_om_namespace_t* AXIS2_CALL 
+axis2_soap_envelope_get_namespace(axis2_soap_envelope_t *envelope,
+                                  axis2_env_t **env);
 
                                    
 /*************** function implementations *************************************/
@@ -93,12 +112,12 @@
         return NULL;
     }
     envelope_impl->soap_envelope.ops = NULL;
-    envelope_impl->base = NULL;
+    envelope_impl->om_ele_node = NULL;
     envelope_impl->soap_version = AXIS2_SOAP12;    
     envelope_impl->header = NULL;
     envelope_impl->body = NULL;
     
-    ele = axis2_om_element_create(env, NULL, AXIS2_SOAP_ENVELOPE_LOCAL_NAME, ns, &(envelope_impl->base));
+    ele = axis2_om_element_create(env, NULL, AXIS2_SOAP_ENVELOPE_LOCAL_NAME, ns, &(envelope_impl->om_ele_node));
     if (!ele)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -119,7 +138,7 @@
     envelope_impl->soap_envelope.ops->get_body = axis2_soap_envelope_get_body;
     envelope_impl->soap_envelope.ops->serialize = axis2_soap_envelope_serialize;    
     envelope_impl->soap_envelope.ops->free = axis2_soap_envelope_free;
-    envelope_impl->soap_envelope.ops->get_base = axis2_soap_envelope_get_base;
+    envelope_impl->soap_envelope.ops->get_base_node = axis2_soap_envelope_get_base_node;
     envelope_impl->soap_envelope.ops->get_soap_version = axis2_soap_envelope_get_soap_version;
     envelope_impl->soap_envelope.ops->set_soap_version = axis2_soap_envelope_set_soap_version;
     envelope_impl->soap_envelope.ops->get_namespace = axis2_soap_envelope_get_namespace;
@@ -141,10 +160,10 @@
         envelope->ops = NULL;
     }
     
-    if(envelope_impl->base)
+    if(envelope_impl->om_ele_node)
     {
-        AXIS2_OM_NODE_FREE_TREE(envelope_impl->base, env);
-        envelope_impl->base = NULL;
+        AXIS2_OM_NODE_FREE_TREE(envelope_impl->om_ele_node, env);
+        envelope_impl->om_ele_node = NULL;
     }
     
     AXIS2_FREE((*env)->allocator, envelope_impl);
@@ -153,12 +172,31 @@
 }
     
 axis2_om_node_t* AXIS2_CALL 
-axis2_soap_envelope_get_base(axis2_soap_envelope_t *envelope,
+axis2_soap_envelope_get_base_node(axis2_soap_envelope_t *envelope,
                                 axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
-    return AXIS2_INTF_TO_IMPL(envelope)->base;
+    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    return AXIS2_INTF_TO_IMPL(envelope)->om_ele_node;
 }
+
+axis2_status_t AXIS2_CALL 
+axis2_soap_envelope_set_base_node(axis2_soap_envelope_t *envelope,
+                                  axis2_env_t **env,
+                                  axis2_om_node_t *node)
+{
+   axis2_soap_envelope_impl_t *envelope_impl = NULL;
+   AXIS2_FUNC_PARAM_CHECK( envelope_impl, env, AXIS2_FAILURE);
+   AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
+   envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
+   
+   if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
+   {
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
+        return AXIS2_FAILURE;
+   }
+   envelope_impl->om_ele_node = node;
+   return AXIS2_SUCCESS;
+}  
                                              
 int AXIS2_CALL 
 axis2_soap_envelope_get_soap_version(axis2_soap_envelope_t *envelope,
@@ -195,7 +233,7 @@
     axis2_env_t **env)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     /* TODO axis2_soap_header_t *header =
@@ -222,7 +260,7 @@
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
     axis2_om_namespace_t *ns = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     /* TODO : cache SOAP header and envelope instead of looking them up?*/
@@ -251,7 +289,7 @@
     axis2_env_t **env)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     /* TODO //check for the first element
@@ -294,7 +332,7 @@
                 OMConstants.DEFAULT_CHAR_SET_ENCODING : charSetEncoding,
                 xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion);
     }*/
-    return AXIS2_OM_NODE_SERIALIZE(envelope_impl->base, env, om_output);
+    return AXIS2_OM_NODE_SERIALIZE(envelope_impl->om_ele_node, env, om_output);
 }
 
 axis2_status_t AXIS2_CALL axis2_soap_envelope_set_body(axis2_soap_envelope_t *envelope,
@@ -340,12 +378,12 @@
     AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
-    if (envelope_impl->base)
+    if (envelope_impl->om_ele_node)
     {
         axis2_om_element_t *ele = NULL;
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(envelope_impl->base, env) == AXIS2_OM_ELEMENT)
+        if (AXIS2_OM_NODE_GET_NODE_TYPE(envelope_impl->om_ele_node, env) == AXIS2_OM_ELEMENT)
         {
-            ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(envelope_impl->base, env);
+            ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(envelope_impl->om_ele_node, env);
             if (ele)
             {
                 return AXIS2_OM_ELEMENT_GET_NAMESPACE(ele, env);

Copied: webservices/axis2/trunk/c/modules/xml/soap/soap_header.c (from r359986, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header.c)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_header.c?p2=webservices/axis2/trunk/c/modules/xml/soap/soap_header.c&p1=webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header.c&r1=359986&r2=365296&rev=365296&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/axis2_soap_header.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_header.c Sun Jan  1 21:43:53 2006
@@ -19,6 +19,7 @@
  #include <axis2_soap_header_block.h>
  #include <axis2_hash.h>
  #include <axis2_soap.h>
+ #include <stdio.h>
  
  /******************* impl struct *********************************************/
  
@@ -147,7 +148,7 @@
         return NULL;
     header_impl = AXIS2_INTF_TO_IMPL(header);        
         
-    parent_node = AXIS2_SOAP_ENVELOPE_GET_BASE(envelope, env);
+    parent_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(envelope, env);
     parent_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(parent_node, env);
     parent_ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(parent_ele, env);
     



Mime
View raw message