You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/12 13:55:43 UTC

svn commit: r413641 [2/9] - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/soap/ axiom/test/soap/ include/ modules/core/clientapi/ modules/core/clientapi/diclient/ modules/core/context/ modules/core/descrip...

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_role.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_role.h Mon Jun 12 04:55:38 2006
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_FAULT_ROLE_H
- #define AXIS2_SOAP_FAULT_ROLE_H
+ #ifndef AXIOM_SOAP_FAULT_ROLE_H
+ #define AXIOM_SOAP_FAULT_ROLE_H
  
  
    /**
-    * @file axis2_soap_fault_role.h
-    * @brief axis2_soap_fault_role 
+    * @file axiom_soap_fault_role.h
+    * @brief axiom_soap_fault_role 
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault.h>
+#include <axiom_soap_fault.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #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;
+    typedef struct axiom_soap_fault_role_ops axiom_soap_fault_role_ops_t;
+    typedef struct axiom_soap_fault_role axiom_soap_fault_role_t;
 /**
- * @defgroup axis2_soap_fault_role
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_fault_role
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_fault_role operations struct
- *   ops Encapsulator struct of axis2_soap_fault_role
+ *   ops Encapsulator struct of axiom_soap_fault_role
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_fault_role_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_fault_role_ops
     {
       /**
-        * Free an axis2_soap_fault_role
+        * Free an axiom_soap_fault_role
         * @param  fault_role pointer to soap_fault_role struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
@@ -53,20 +53,20 @@
         */
 
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_fault_role_t *fault_role,
+      free_fn)(axiom_soap_fault_role_t *fault_role,
                  const axis2_env_t *env);
 
         axis2_status_t (AXIS2_CALL *
-      set_role_value)(axis2_soap_fault_role_t *fault_role,
+      set_role_value)(axiom_soap_fault_role_t *fault_role,
                         const axis2_env_t *env,
                         axis2_char_t* uri);
                                      
         axis2_char_t* (AXIS2_CALL *
-      get_role_value)(axis2_soap_fault_role_t *fault_role,
+      get_role_value)(axiom_soap_fault_role_t *fault_role,
                         const axis2_env_t *env);
                                      
         axiom_node_t* (AXIS2_CALL *
-      get_base_node)(axis2_soap_fault_role_t *fault_role,
+      get_base_node)(axiom_soap_fault_role_t *fault_role,
                        const axis2_env_t *env);
                                                                                                                    
     };      
@@ -75,10 +75,10 @@
     * \brief soap_fault_role struct
     * represent a soap_fault_role
     */
-    struct axis2_soap_fault_role
+    struct axiom_soap_fault_role
     {
-        /** operation of axis2_soap_fault_role struct */
-        axis2_soap_fault_role_ops_t *ops;
+        /** operation of axiom_soap_fault_role struct */
+        axiom_soap_fault_role_ops_t *ops;
        
     };
 
@@ -87,24 +87,24 @@
     * @param env Environment. MUST NOT be NULL
     */
     
-AXIS2_EXTERN axis2_soap_fault_role_t * AXIS2_CALL
-axis2_soap_fault_role_create_with_parent(const axis2_env_t *env,
-                            axis2_soap_fault_t *fault);
+AXIS2_EXTERN axiom_soap_fault_role_t * AXIS2_CALL
+axiom_soap_fault_role_create_with_parent(const axis2_env_t *env,
+                            axiom_soap_fault_t *fault);
                             
 /******************** Macros **************************************************/
     
     
 /** free soap_fault_role */
-#define AXIS2_SOAP_FAULT_ROLE_FREE(fault_role , env) \
+#define AXIOM_SOAP_FAULT_ROLE_FREE(fault_role , env) \
         ((fault_role)->ops->free_fn(fault_role, env))
 
-#define AXIS2_SOAP_FAULT_ROLE_GET_VALUE(fault_role , env) \
+#define AXIOM_SOAP_FAULT_ROLE_GET_VALUE(fault_role , env) \
         ((fault_role)->ops->get_role_value(fault_role, env)) 
         
-#define AXIS2_SOAP_FAULT_ROLE_GET_BASE_NODE(fault_role, env) \
+#define AXIOM_SOAP_FAULT_ROLE_GET_BASE_NODE(fault_role, env) \
         ((fault_role)->ops->get_base_node(fault_role, env))         
 
-#define AXIS2_SOAP_FAULT_ROLE_SET_VALUE(fault_role , env, value) \
+#define AXIOM_SOAP_FAULT_ROLE_SET_VALUE(fault_role , env, value) \
         ((fault_role)->ops->set_role_value(fault_role, env, value))
 /** @} */
 
@@ -112,4 +112,4 @@
 }
 #endif
  
-#endif /* AXIS2_SOAP_FAULT_ROLE_H */
+#endif /* AXIOM_SOAP_FAULT_ROLE_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_sub_code.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_sub_code.h Mon Jun 12 04:55:38 2006
@@ -14,59 +14,59 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_FAULT_SUB_CODE_H
- #define AXIS2_SOAP_FAULT_SUB_CODE_H
+ #ifndef AXIOM_SOAP_FAULT_SUB_CODE_H
+ #define AXIOM_SOAP_FAULT_SUB_CODE_H
  
   
    /**
-    * @file axis2_soap_fault_sub_code.h
-    * @brief axis2_soap_fault_sub_code struct
+    * @file axiom_soap_fault_sub_code.h
+    * @brief axiom_soap_fault_sub_code struct
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault_code.h>
+#include <axiom_soap_fault_code.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #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;
-    struct axis2_soap_builder;
+    typedef struct axiom_soap_fault_sub_code_ops axiom_soap_fault_sub_code_ops_t;
+    typedef struct axiom_soap_fault_sub_code axiom_soap_fault_sub_code_t;
+    struct axiom_soap_fault_value;
+    struct axiom_soap_builder;
 /**
- * @defgroup axis2_soap_fault_sub_code
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_fault_sub_code
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_fault_sub_code operations struct
- *   ops Encapsulator struct of axis2_soap_fault_sub_code
+ *   ops Encapsulator struct of axiom_soap_fault_sub_code
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_fault_sub_code_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_fault_sub_code_ops
     {
       /**
-        * Free an axis2_soap_fault_sub_code
+        * Free an axiom_soap_fault_sub_code
         * @param  fault_sub_code pointer to soap_fault_sub_code struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
         *         else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_fault_sub_code_t *fault_sub_code,
+      free_fn)(axiom_soap_fault_sub_code_t *fault_sub_code,
                  const axis2_env_t *env);
                                      
-        axis2_soap_fault_sub_code_t* (AXIS2_CALL *
-      get_sub_code)(axis2_soap_fault_sub_code_t *fault_sub_code,
+        axiom_soap_fault_sub_code_t* (AXIS2_CALL *
+      get_sub_code)(axiom_soap_fault_sub_code_t *fault_sub_code,
                       const axis2_env_t *env);
                                      
-        struct axis2_soap_fault_value* (AXIS2_CALL *
-      get_value)(axis2_soap_fault_sub_code_t *fault_sub_code,
+        struct axiom_soap_fault_value* (AXIS2_CALL *
+      get_value)(axiom_soap_fault_sub_code_t *fault_sub_code,
                    const axis2_env_t *env);
                                      
         axiom_node_t* (AXIS2_CALL *
-      get_base_node) (axis2_soap_fault_sub_code_t *fault_sub_code,
+      get_base_node) (axiom_soap_fault_sub_code_t *fault_sub_code,
                         const axis2_env_t *env);
 
         };      
@@ -75,10 +75,10 @@
     * \brief soap_fault_sub_code struct
     * represent a soap_fault_sub_code
     */
-    struct axis2_soap_fault_sub_code
+    struct axiom_soap_fault_sub_code
     {
-        /** operation of axis2_soap_fault_sub_code struct */
-        axis2_soap_fault_sub_code_ops_t *ops;
+        /** operation of axiom_soap_fault_sub_code struct */
+        axiom_soap_fault_sub_code_ops_t *ops;
        
     };
 
@@ -86,29 +86,29 @@
     * creates a soap struct 
     * @param env Environment. MUST NOT be NULL
     */
-AXIS2_EXTERN axis2_soap_fault_sub_code_t * AXIS2_CALL
-axis2_soap_fault_sub_code_create_with_parent(const axis2_env_t *env,
-                            axis2_soap_fault_code_t *fault_code);
+AXIS2_EXTERN axiom_soap_fault_sub_code_t * AXIS2_CALL
+axiom_soap_fault_sub_code_create_with_parent(const axis2_env_t *env,
+                            axiom_soap_fault_code_t *fault_code);
                             
-AXIS2_EXTERN axis2_soap_fault_sub_code_t * AXIS2_CALL
-axis2_soap_fault_sub_code_create_with_parent_value(const axis2_env_t *env,
-                            axis2_soap_fault_code_t *fault_code,
+AXIS2_EXTERN axiom_soap_fault_sub_code_t * AXIS2_CALL
+axiom_soap_fault_sub_code_create_with_parent_value(const axis2_env_t *env,
+                            axiom_soap_fault_code_t *fault_code,
                             axis2_char_t *value);                            
 
 /******************** Macros **************************************************/
     
     
 /** free soap_fault_sub_code */
-#define AXIS2_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code , env) \
+#define AXIOM_SOAP_FAULT_SUB_CODE_FREE(fault_sub_code , env) \
         ((fault_sub_code)->ops->free_fn(fault_sub_code, env))
         
-#define AXIS2_SOAP_FAULT_SUB_CODE_GET_VALUE(fault_sub_code , env) \
+#define AXIOM_SOAP_FAULT_SUB_CODE_GET_VALUE(fault_sub_code , env) \
         ((fault_sub_code)->ops->get_value(fault_sub_code, env)) 
         
-#define AXIS2_SOAP_FAULT_SUB_CODE_GET_SUB_CODE(fault_sub_code , env) \
+#define AXIOM_SOAP_FAULT_SUB_CODE_GET_SUB_CODE(fault_sub_code , env) \
         ((fault_sub_code)->ops->get_sub_code(fault_sub_code, env))        
         
-#define AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env) \
+#define AXIOM_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env) \
         ((fault_sub_code)->ops->get_base_node(fault_sub_code, env))         
 
 /** @} */
@@ -117,4 +117,4 @@
 }
 #endif
 
-#endif /* AXIS2_SOAP_FAULT_SUB_CODE_H */
+#endif /* AXIOM_SOAP_FAULT_SUB_CODE_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_text.h Mon Jun 12 04:55:38 2006
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_FAULT_TEXT_H
- #define AXIS2_SOAP_FAULT_TEXT_H
+ #ifndef AXIOM_SOAP_FAULT_TEXT_H
+ #define AXIOM_SOAP_FAULT_TEXT_H
  
    /**
-    * @file axis2_soap_fault_text.h
-    * @brief axis2_soap_fault_text 
+    * @file axiom_soap_fault_text.h
+    * @brief axiom_soap_fault_text 
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault_reason.h>
+#include <axiom_soap_fault_reason.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #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;
+    typedef struct axiom_soap_fault_text_ops axiom_soap_fault_text_ops_t;
+    typedef struct axiom_soap_fault_text axiom_soap_fault_text_t;
 /**
- * @defgroup axis2_soap_fault_text
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_fault_text
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_fault_text operations struct
- *   ops Encapsulator struct of axis2_soap_fault_text
+ *   ops Encapsulator struct of axiom_soap_fault_text
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_fault_text_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_fault_text_ops
     {
       /**
-        * Free an axis2_soap_fault_text
+        * Free an axiom_soap_fault_text
         * @param  fault_text pointer to soap_fault_text struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
@@ -52,30 +52,30 @@
         */
 
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_fault_text_t *fault_text,
+      free_fn)(axiom_soap_fault_text_t *fault_text,
                  const axis2_env_t *env);
 
         axis2_status_t (AXIS2_CALL *
-      set_lang)(axis2_soap_fault_text_t *fault_text,
+      set_lang)(axiom_soap_fault_text_t *fault_text,
                   const axis2_env_t *env,
                   const axis2_char_t* lang);
                                      
         axis2_char_t* (AXIS2_CALL *
-      get_lang)(axis2_soap_fault_text_t *fault_text,
+      get_lang)(axiom_soap_fault_text_t *fault_text,
                   const axis2_env_t *env);
     
         axiom_node_t* (AXIS2_CALL *
-      get_base_node)(axis2_soap_fault_text_t *fault_text,
+      get_base_node)(axiom_soap_fault_text_t *fault_text,
                        const axis2_env_t *env);
                        
         axis2_status_t (AXIS2_CALL *
-        set_text)(axis2_soap_fault_text_t *fault_text,
+        set_text)(axiom_soap_fault_text_t *fault_text,
                   const axis2_env_t *env,
                   axis2_char_t *value,
                   axis2_char_t *lang);
                   
         axis2_char_t * (AXIS2_CALL *
-        get_text)(axis2_soap_fault_text_t *fault_text,
+        get_text)(axiom_soap_fault_text_t *fault_text,
                   const axis2_env_t *env);
                                                             
     };      
@@ -84,10 +84,10 @@
     * \brief soap_fault_text struct
     * represent a soap_fault_text
     */
-    struct axis2_soap_fault_text
+    struct axiom_soap_fault_text
     {
-        /** operation of axis2_soap_fault_text struct */
-        axis2_soap_fault_text_ops_t *ops;
+        /** operation of axiom_soap_fault_text struct */
+        axiom_soap_fault_text_ops_t *ops;
        
     };
 
@@ -95,29 +95,29 @@
     * creates a soap struct 
     * @param env Environment. MUST NOT be NULL
     */
-AXIS2_EXTERN axis2_soap_fault_text_t * AXIS2_CALL
-axis2_soap_fault_text_create_with_parent(const axis2_env_t *env,
-                            axis2_soap_fault_reason_t *fault);
+AXIS2_EXTERN axiom_soap_fault_text_t * AXIS2_CALL
+axiom_soap_fault_text_create_with_parent(const axis2_env_t *env,
+                            axiom_soap_fault_reason_t *fault);
                             
 /******************** Macros **************************************************/
     
 /** free soap_fault_text */
-#define AXIS2_SOAP_FAULT_TEXT_FREE(fault_text , env) \
+#define AXIOM_SOAP_FAULT_TEXT_FREE(fault_text , env) \
         ((fault_text)->ops->free_fn(fault_text, env))
 
-#define AXIS2_SOAP_FAULT_TEXT_SET_LANG(fault_text , env, lang) \
+#define AXIOM_SOAP_FAULT_TEXT_SET_LANG(fault_text , env, lang) \
         ((fault_text)->ops->set_lang(fault_text, env, lang))
         
-#define AXIS2_SOAP_FAULT_TEXT_GET_LANG(fault_text , env) \
+#define AXIOM_SOAP_FAULT_TEXT_GET_LANG(fault_text , env) \
         ((fault_text)->ops->get_lang(fault_text, env)) 
         
-#define AXIS2_SOAP_FAULT_TEXT_GET_BASE_NODE(fault_text, env) \
+#define AXIOM_SOAP_FAULT_TEXT_GET_BASE_NODE(fault_text, env) \
         ((fault_text)->ops->get_base_node(fault_text, env))         
 
-#define AXIS2_SOAP_FAULT_TEXT_SET_TEXT(fault_text, env, value, lang) \
+#define AXIOM_SOAP_FAULT_TEXT_SET_TEXT(fault_text, env, value, lang) \
         ((fault_text)->ops->set_text(fault_text, env, value, lang))
 
-#define AXIS2_SOAP_FAULT_TEXT_GET_TEXT(fault_text, env) \
+#define AXIOM_SOAP_FAULT_TEXT_GET_TEXT(fault_text, env) \
         ((fault_text)->ops->get_text(fault_text, env))        
 /** @} */
 
@@ -125,4 +125,4 @@
 }
 #endif 
  
-#endif /* AXIS2_SOAP_FAULT_TEXT_H */
+#endif /* AXIOM_SOAP_FAULT_TEXT_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_fault_value.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_fault_value.h Mon Jun 12 04:55:38 2006
@@ -14,38 +14,38 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_FAULT_VALUE_H
- #define AXIS2_SOAP_FAULT_VALUE_H
+ #ifndef AXIOM_SOAP_FAULT_VALUE_H
+ #define AXIOM_SOAP_FAULT_VALUE_H
  
     /**
-    * @file axis2_soap_fault_value.h
-    * @brief axis2_soap_fault_value 
+    * @file axiom_soap_fault_value.h
+    * @brief axiom_soap_fault_value 
     */
 #include <axis2_env.h>
-#include <axis2_soap_fault.h>
-#include <axis2_soap_fault_sub_code.h>
+#include <axiom_soap_fault.h>
+#include <axiom_soap_fault_sub_code.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #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;
+typedef struct axiom_soap_fault_value_ops axiom_soap_fault_value_ops_t;
+typedef struct axiom_soap_fault_value axiom_soap_fault_value_t;
 /**
- * @defgroup axis2_soap_fault_value
- * @ingroup axis2_soap_fault_
+ * @defgroup axiom_soap_fault_value
+ * @ingroup axiom_soap_fault_
  * @{
  */
 
 /**
  *   \brief soap_fault_value operations struct
- *   ops Encapsulator struct of axis2_soap_fault_value
+ *   ops Encapsulator struct of axiom_soap_fault_value
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_fault_value_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_fault_value_ops
     {
       /**
-        * Free an axis2_soap_fault_value
+        * Free an axiom_soap_fault_value
         * @param  fault_value pointer to soap_fault_value struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
@@ -53,27 +53,27 @@
         */
 
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_fault_value_t *fault_value,
+      free_fn)(axiom_soap_fault_value_t *fault_value,
                  const axis2_env_t *env);
       
       /**
         * Get the text value of the env:Value element directly under env:Code element
-        * @param fault_value pointer to axis2_soap_fault_t
+        * @param fault_value pointer to axiom_soap_fault_t
         * @param env Environment. MUST NOT BE NULL
         * @return text value 
         */
       axis2_char_t* (AXIS2_CALL *
-      get_text)(axis2_soap_fault_value_t *fault_value,
+      get_text)(axiom_soap_fault_value_t *fault_value,
             const axis2_env_t *env);   
       
       /**
         * Set the text value of the env:Value element directly under env:Code element
-        * @param fault_value pointer to axis2_soap_fault_t
+        * @param fault_value pointer to axiom_soap_fault_t
         * @param env Environment. MUST NOT BE NULL
         * @param text value to be set
         */
         axiom_node_t* (AXIS2_CALL *
-      get_base_node)(axis2_soap_fault_value_t *fault_value,
+      get_base_node)(axiom_soap_fault_value_t *fault_value,
                        const axis2_env_t *env);
         /**
          * set the text value of soap_fault_value element 
@@ -83,7 +83,7 @@
          */
                                 
         axis2_status_t (AXIS2_CALL *
-      set_text)(axis2_soap_fault_value_t *fault_value,
+      set_text)(axiom_soap_fault_value_t *fault_value,
             const axis2_env_t *env, axis2_char_t *text);   
             
     };      
@@ -92,10 +92,10 @@
     * \brief soap_fault_value struct
     * represent a soap_fault_value
     */
-    struct axis2_soap_fault_value
+    struct axiom_soap_fault_value
     {
-        /** operation of axis2_soap_fault_value struct */
-        axis2_soap_fault_value_ops_t *ops;
+        /** operation of axiom_soap_fault_value struct */
+        axiom_soap_fault_value_ops_t *ops;
        
     };
 
@@ -103,13 +103,13 @@
     * creates a soap struct 
     * @param env Environment. MUST NOT be NULL
     */
-AXIS2_EXTERN axis2_soap_fault_value_t * AXIS2_CALL
-axis2_soap_fault_value_create_with_subcode(const axis2_env_t *env,
-                            axis2_soap_fault_sub_code_t *parent);
-
-AXIS2_EXTERN axis2_soap_fault_value_t * AXIS2_CALL
-axis2_soap_fault_value_create_with_code(const axis2_env_t *env,
-                            axis2_soap_fault_code_t *parent);  
+AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
+axiom_soap_fault_value_create_with_subcode(const axis2_env_t *env,
+                            axiom_soap_fault_sub_code_t *parent);
+
+AXIS2_EXTERN axiom_soap_fault_value_t * AXIS2_CALL
+axiom_soap_fault_value_create_with_code(const axis2_env_t *env,
+                            axiom_soap_fault_code_t *parent);  
 
 
                              
@@ -118,16 +118,16 @@
     
     
 /** free soap_fault_value */
-#define AXIS2_SOAP_FAULT_VALUE_FREE(fault_value , env) \
+#define AXIOM_SOAP_FAULT_VALUE_FREE(fault_value , env) \
         ((fault_value)->ops->free_fn(fault_value, env))
         
-#define AXIS2_SOAP_FAULT_VALUE_GET_BASE_NODE(fault_value, env) \
+#define AXIOM_SOAP_FAULT_VALUE_GET_BASE_NODE(fault_value, env) \
         ((fault_value)->ops->get_base_node(fault_value, env))         
 
-#define AXIS2_SOAP_FAULT_VALUE_GET_TEXT(fault_value, env) \
+#define AXIOM_SOAP_FAULT_VALUE_GET_TEXT(fault_value, env) \
       ((fault_value)->ops->get_text(fault_value, env))
       
-#define AXIS2_SOAP_FAULT_VALUE_SET_TEXT(fault_value, env, text) \
+#define AXIOM_SOAP_FAULT_VALUE_SET_TEXT(fault_value, env, text) \
         ((fault_value)->ops->set_text(fault_value, env, text))      
 /** @} */
 
@@ -135,4 +135,4 @@
 }
 #endif 
  
-#endif /* AXIS2_SOAP_FAULT_VALUE_H */
+#endif /* AXIOM_SOAP_FAULT_VALUE_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_header.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header.h Mon Jun 12 04:55:38 2006
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_HEADER_H
- #define AXIS2_SOAP_HEADER_H
+ #ifndef AXIOM_SOAP_HEADER_H
+ #define AXIOM_SOAP_HEADER_H
  
    /**
-    * @file axis2_soap_header.h
-    * @brief axis2_soap_header struct
+    * @file axiom_soap_header.h
+    * @brief axiom_soap_header struct
     */
 #include <axis2_env.h>
 #include <axiom_node.h>
@@ -28,53 +28,53 @@
 #include <axiom_children_qname_iterator.h>
 #include <axiom_children_with_specific_attribute_iterator.h>
 #include <axis2_hash.h>
-#include <axis2_soap_envelope.h>
+#include <axiom_soap_envelope.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
     
-typedef struct axis2_soap_header  axis2_soap_header_t;
-typedef struct axis2_soap_header_ops axis2_soap_header_ops_t;
+typedef struct axiom_soap_header  axiom_soap_header_t;
+typedef struct axiom_soap_header_ops axiom_soap_header_ops_t;
 
-struct axis2_soap_header_block;   
-struct axis2_soap_builder; 
+struct axiom_soap_header_block;   
+struct axiom_soap_builder; 
 
     
 /**
- * @defgroup axis2_soap_header
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_header
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_header operations struct
- *   ops Encapsulator struct of axis2_soap header
+ *   ops Encapsulator struct of axiom_soap header
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_header_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_header_ops
     {
       /**
-        * Free an axis2_soap_header
+        * Free an axiom_soap_header
         * @param  header pointer to soap_header struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
         *         else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_header_t *header,
+      free_fn)(axiom_soap_header_t *header,
                  const axis2_env_t *env);
                                              
        /**
-        * create a new axis2_soap_header_block_t struct initialized  with the
-        * specified name and adds it to passed axis2_soap_header_t struct.
+        * create a new axiom_soap_header_block_t struct initialized  with the
+        * specified name and adds it to passed axiom_soap_header_t struct.
         * @param env environment must not be null
         * @param localName
         * @param ns
-        * @return The newly created axis2_soap_header_block_t struct
+        * @return The newly created axiom_soap_header_block_t struct
         */
-        struct axis2_soap_header_block* (AXIS2_CALL *
-      add_header_block)(axis2_soap_header_t* header,
+        struct axiom_soap_header_block* (AXIS2_CALL *
+      add_header_block)(axiom_soap_header_t* header,
                       const axis2_env_t *env,
                     const axis2_char_t *localname,
                     axiom_namespace_t *ns); 
@@ -85,11 +85,11 @@
         * whom the message should be sent. An actor receives the message and then
         * sends it to the next actor. The default actor is the ultimate intended
         * recipient for the message, so if no actor attribute is set in a
-        * axis2_soap_header_t struct the message is sent to its ultimate
+        * axiom_soap_header_t struct the message is sent to its ultimate
         * destination.
         */
         axis2_hash_t* (AXIS2_CALL *
-      examine_header_blocks)(axis2_soap_header_t* header,
+      examine_header_blocks)(axiom_soap_header_t* header,
                                const axis2_env_t *env,
                                axis2_char_t* param_role);
        /**
@@ -102,7 +102,7 @@
         * The returned array_list must be freed by the user.
         */
         axis2_array_list_t* (AXIS2_CALL *
-      get_header_blocks_with_namespace_uri)(axis2_soap_header_t* header,
+      get_header_blocks_with_namespace_uri)(axiom_soap_header_t* header,
                                               const axis2_env_t *env,
                                               const axis2_char_t *ns_uri);
        /**
@@ -113,7 +113,7 @@
         * present
         */
         axiom_children_qname_iterator_t* (AXIS2_CALL *
-      examine_all_header_blocks)(axis2_soap_header_t* header,
+      examine_all_header_blocks)(axiom_soap_header_t* header,
                                    const axis2_env_t *env);
        /**
         * returns an iterator to iterate through all  header blocks om_nodes 
@@ -125,7 +125,7 @@
         * role attribute
         */
         axiom_children_with_specific_attribute_iterator_t *(AXIS2_CALL *
-      extract_header_blocks)(axis2_soap_header_t *header,
+      extract_header_blocks)(axiom_soap_header_t *header,
                                const axis2_env_t *env,
                                axis2_char_t *role);
                                          
@@ -136,16 +136,16 @@
         * @return axiom_node_t
         */
         axiom_node_t* (AXIS2_CALL *
-      get_base_node)(axis2_soap_header_t *header,
+      get_base_node)(axiom_soap_header_t *header,
                        const axis2_env_t *env);
         /**
          *  return the soap_version of this soap_header
          *  @param header soap_header
          *  @param env environment must not be null
-         *  @return AXIS2_SOAP11 or AXIS2_SOAP12
+         *  @return AXIOM_SOAP11 or AXIOM_SOAP12
          */
        int  (AXIS2_CALL *
-      get_soap_version) (axis2_soap_header_t *header,
+      get_soap_version) (axiom_soap_header_t *header,
                           const axis2_env_t *env);
         
          
@@ -153,7 +153,7 @@
        * @returns a hash table of all header_blocks in this header
       */
        axis2_hash_t* (AXIS2_CALL *
-      get_all_header_blocks)(axis2_soap_header_t *header,
+      get_all_header_blocks)(axiom_soap_header_t *header,
                                const axis2_env_t *env);                                                
                                          
     };
@@ -162,10 +162,10 @@
     * \brief soap_header struct
     * represent a soap_header
     */
-    struct axis2_soap_header
+    struct axiom_soap_header
     {
-        /** operation of axis2_soap_header struct */
-        axis2_soap_header_ops_t *ops;
+        /** operation of axiom_soap_header struct */
+        axiom_soap_header_ops_t *ops;
        
     };
 
@@ -176,43 +176,43 @@
 
 
     
-AXIS2_EXTERN axis2_soap_header_t * AXIS2_CALL
-axis2_soap_header_create_with_parent(const axis2_env_t *env,
-                                     struct axis2_soap_envelope *envelope);
+AXIS2_EXTERN axiom_soap_header_t * AXIS2_CALL
+axiom_soap_header_create_with_parent(const axis2_env_t *env,
+                                     struct axiom_soap_envelope *envelope);
                                      
 /******************** Macros **************************************************/
     
     
 /** free soap_header */
-#define AXIS2_SOAP_HEADER_FREE(header , env) \
+#define AXIOM_SOAP_HEADER_FREE(header , env) \
         ((header)->ops->free_fn(header, env))
 
-#define AXIS2_SOAP_HEADER_ADD_HEADER_BLOCK(header, env, localname, ns) \
+#define AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(header, env, localname, ns) \
         ((header)->ops->add_header_block(header, env, localname, ns))
         
-#define AXIS2_SOAP_HEADER_EXAMINE_HEADER_BLOCKS(header, env, param_role) \
+#define AXIOM_SOAP_HEADER_EXAMINE_HEADER_BLOCKS(header, env, param_role) \
         ((header)->ops->examine_header_blocks(header, env, param_role))
 
-#define AXIS2_SOAP_HEADER_EXAMINE_ALL_HEADER_BLOCKS(header, env) \
+#define AXIOM_SOAP_HEADER_EXAMINE_ALL_HEADER_BLOCKS(header, env) \
         ((header)->ops->examine_all_header_blocks(header, env))
         
-#define AXIS2_SOAP_HEADER_EXTRACT_HEADER_BLOCKS(header, env, role) \
+#define AXIOM_SOAP_HEADER_EXTRACT_HEADER_BLOCKS(header, env, role) \
         ((header)->ops->extract_header_blocks(header, env, role))                        
 
-#define AXIS2_SOAP_HEADER_GET_BASE_NODE(header, env) \
+#define AXIOM_SOAP_HEADER_GET_BASE_NODE(header, env) \
         ((header)->ops->get_base_node(header, env)) 
        
-#define AXIS2_SOAP_HEADER_GET_SOAP_VERSION(header, env) \
+#define AXIOM_SOAP_HEADER_GET_SOAP_VERSION(header, env) \
         ((header)->ops->get_soap_version(header, env))
 
-#define AXIS2_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(header, env, uri)\
+#define AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(header, env, uri)\
         ((header)->ops->get_header_blocks_with_namespace_uri(header, env, uri))
 
-#define AXIS2_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(header, env) \
+#define AXIOM_SOAP_HEADER_GET_ALL_HEADER_BLOCKS(header, env) \
         ((header)->ops->get_all_header_blocks(header, env))
 
 /** @} */
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_SOAP_HEADER_H */
+#endif /* AXIOM_SOAP_HEADER_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_header_block.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_header_block.h Mon Jun 12 04:55:38 2006
@@ -14,85 +14,85 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_HEADER_BLOCK_H
- #define AXIS2_SOAP_HEADER_BLOCK_H
+ #ifndef AXIOM_SOAP_HEADER_BLOCK_H
+ #define AXIOM_SOAP_HEADER_BLOCK_H
 
   
    /**
-    * @file axis2_soap_header_block.h
-    * @brief axis2_soap_header_block struct
+    * @file axiom_soap_header_block.h
+    * @brief axiom_soap_header_block struct
     */
 #include <axis2_env.h>
 #include <axiom_node.h>
 #include <axiom_element.h>
 #include <axis2_array_list.h>
-#include <axis2_soap_header.h>
+#include <axiom_soap_header.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-    typedef struct axis2_soap_header_block axis2_soap_header_block_t;
-    typedef struct axis2_soap_header_block_ops axis2_soap_header_block_ops_t;
+    typedef struct axiom_soap_header_block axiom_soap_header_block_t;
+    typedef struct axiom_soap_header_block_ops axiom_soap_header_block_ops_t;
     
 /**
- * @defgroup axis2_soap_header_block
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_header_block
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_header_block operations struct
- *   ops Encapsulator struct of axis2_soap header_block
+ *   ops Encapsulator struct of axiom_soap header_block
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_header_block_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_header_block_ops
     {
       /**
-        * Free an axis2_soap_header_block
+        * Free an axiom_soap_header_block
         * @param  header_block pointer to soap_header_block struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
         *         else AXIS2_FAILURE
         */
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_header_block_t *header_block,
+      free_fn)(axiom_soap_header_block_t *header_block,
                  const axis2_env_t *env);
                                              
         axis2_status_t (AXIS2_CALL *
-      set_role)(axis2_soap_header_block_t *header_block,
+      set_role)(axiom_soap_header_block_t *header_block,
                   const axis2_env_t *env,
                   axis2_char_t *uri);  
         
         axis2_status_t (AXIS2_CALL *
-      set_must_understand_with_bool)(axis2_soap_header_block_t *header_block,
+      set_must_understand_with_bool)(axiom_soap_header_block_t *header_block,
                                       const axis2_env_t *env,
                                        axis2_bool_t *must_understand);
                              
         axis2_status_t (AXIS2_CALL *
-      set_must_understand_with_string)(axis2_soap_header_block_t *header_block,
+      set_must_understand_with_string)(axiom_soap_header_block_t *header_block,
                                        const axis2_env_t *env,
                                        axis2_char_t *must_understand);
                                              
         axis2_bool_t (AXIS2_CALL *
-      get_must_understand)(axis2_soap_header_block_t *header_block,
+      get_must_understand)(axiom_soap_header_block_t *header_block,
                              const axis2_env_t *env);
                              
                              
         axis2_bool_t (AXIS2_CALL *
-      is_processed)(axis2_soap_header_block_t *header_block,
+      is_processed)(axiom_soap_header_block_t *header_block,
                       const axis2_env_t *env);
                              
         axis2_status_t (AXIS2_CALL *
-      set_processed)(axis2_soap_header_block_t *header_block,
+      set_processed)(axiom_soap_header_block_t *header_block,
                        const axis2_env_t *env);
                   
         axis2_char_t* (AXIS2_CALL *
-      get_role)(axis2_soap_header_block_t *header_block,
+      get_role)(axiom_soap_header_block_t *header_block,
                   const axis2_env_t *env);
           
         axis2_status_t (AXIS2_CALL *
-      set_attribute)(axis2_soap_header_block_t *header_block,
+      set_attribute)(axiom_soap_header_block_t *header_block,
                        const axis2_env_t *env,
                        axis2_char_t *attr_name,
                        axis2_char_t *attr_value,
@@ -100,18 +100,18 @@
                   
                              
         axis2_char_t* (AXIS2_CALL *
-      get_attribute)(axis2_soap_header_block_t *header_block,
+      get_attribute)(axiom_soap_header_block_t *header_block,
                        const axis2_env_t *env,
                        axis2_char_t *attr_name,
                        axis2_char_t *soap_envelope_namespace_uri);                            
                                        
                                               
         axiom_node_t* (AXIS2_CALL *
-      get_base_node)(axis2_soap_header_block_t *header_block,
+      get_base_node)(axiom_soap_header_block_t *header_block,
                        const axis2_env_t *env);
         
         int (AXIS2_CALL *
-      get_soap_version)(axis2_soap_header_block_t *header_block,
+      get_soap_version)(axiom_soap_header_block_t *header_block,
                           const axis2_env_t *env);
 
     };
@@ -120,10 +120,10 @@
     * \brief soap_header_block struct
     * represent a soap_header_block
     */
-    struct axis2_soap_header_block
+    struct axiom_soap_header_block
     {
-        /** operation of axis2_soap_header_block struct */
-        axis2_soap_header_block_ops_t *ops;
+        /** operation of axiom_soap_header_block struct */
+        axiom_soap_header_block_ops_t *ops;
        
     };
 
@@ -134,52 +134,52 @@
 */
 
 
-AXIS2_EXTERN axis2_soap_header_block_t * AXIS2_CALL
-axis2_soap_header_block_create_with_parent(const axis2_env_t *env,
+AXIS2_EXTERN axiom_soap_header_block_t * AXIS2_CALL
+axiom_soap_header_block_create_with_parent(const axis2_env_t *env,
                                            const axis2_char_t *localname,
                                            axiom_namespace_t *ns,
-                                           struct axis2_soap_header *parent);
+                                           struct axiom_soap_header *parent);
                             
 /******************** Macros **************************************************/
     
 /** free soap_header_block */
-#define AXIS2_SOAP_HEADER_BLOCK_FREE(header_block , env) \
+#define AXIOM_SOAP_HEADER_BLOCK_FREE(header_block , env) \
         ((header_block)->ops->free_fn(header_block, env))
         
-#define AXIS2_SOAP_HEADER_BLOCK_GET_ROLE(header_block , env) \
+#define AXIOM_SOAP_HEADER_BLOCK_GET_ROLE(header_block , env) \
         ((header_block)->ops->get_role(header_block, env))
 
-#define AXIS2_SOAP_HEADER_BLOCK_IS_PROCESSED(header_block , env) \
+#define AXIOM_SOAP_HEADER_BLOCK_IS_PROCESSED(header_block , env) \
         ((header_block)->ops->is_processed(header_block, env))
 
-#define AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block , env) \
+#define AXIOM_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block , env) \
         ((header_block)->ops->set_processed(header_block, env))
         
-#define AXIS2_SOAP_HEADER_BLOCK_GET_MUST_UNDERSTAND(header_block, env) \
+#define AXIOM_SOAP_HEADER_BLOCK_GET_MUST_UNDERSTAND(header_block, env) \
         ((header_block)->ops->get_must_understand(header_block, env)) 
 
-#define AXIS2_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(header_block,\
+#define AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(header_block,\
              env, must_understand) \
         ((header_block)->ops->get_must_understand_with_bool(header_block, \
              env, must_understand)) 
              
-#define AXIS2_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_STRING(header_block,\
+#define AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_STRING(header_block,\
              env, must_understand) \
         ((header_block)->ops->get_must_understand_with_string(header_block, \
              env, must_understand))                    
 
-#define AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env) \
+#define AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env) \
         ((header_block)->ops->get_base_node(header_block, env))   
         
-#define AXIS2_SOAP_HEADER_BLOCK_GET_SOAP_VERSION(header_block, env) \
+#define AXIOM_SOAP_HEADER_BLOCK_GET_SOAP_VERSION(header_block, env) \
         ((header_block)->ops->get_soap_version(header_block, env))
         
-#define AXIS2_SOAP_HEADER_BLOCK_GET_ATTRIBUTE(header_block, env,\
+#define AXIOM_SOAP_HEADER_BLOCK_GET_ATTRIBUTE(header_block, env,\
             attr_name, soap_envelope_namespace_uri)  \
         ((header_block)->ops->get_attribute(header_block, env, \
             attr_name, soap_envelope_namespace_uri))
             
-#define AXIS2_SOAP_HEADER_BLOCK_SET_ATTRIBUTE(header_block, env,\
+#define AXIOM_SOAP_HEADER_BLOCK_SET_ATTRIBUTE(header_block, env,\
             attr_name, soap_envelope_namespace_uri)  \
         ((header_block)->ops->set_attribute(header_block, env, \
             attr_name, soap_envelope_namespace_uri))            
@@ -189,4 +189,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* AXIS2_SOAP_HEADER_BLOCK_H */
+#endif /* AXIOM_SOAP_HEADER_BLOCK_H */

Copied: webservices/axis2/trunk/c/axiom/include/axiom_soap_message.h (from r413637, webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_soap_message.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_soap_message.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_soap_message.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_soap_message.h Mon Jun 12 04:55:38 2006
@@ -14,41 +14,41 @@
  * limitations under the License.
  */
  
- #ifndef AXIS2_SOAP_MESSAGE_H
- #define AXIS2_SOAP_MESSAGE_H
+ #ifndef AXIOM_SOAP_MESSAGE_H
+ #define AXIOM_SOAP_MESSAGE_H
  
  /**
- * @file axis2_soap_message.h
- * @brief axis2_soap_message struct
+ * @file axiom_soap_message.h
+ * @brief axiom_soap_message struct
  *        corresponds to root element of soap message
  */
 #include <axis2_env.h>
-#include <axis2_soap_envelope.h>
-#include <axis2_soap_builder.h>
+#include <axiom_soap_envelope.h>
+#include <axiom_soap_builder.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-    typedef struct axis2_soap_message        axis2_soap_message_t;
-    typedef struct axis2_soap_message_ops    axis2_soap_message_ops_t;
+    typedef struct axiom_soap_message        axiom_soap_message_t;
+    typedef struct axiom_soap_message_ops    axiom_soap_message_ops_t;
     
     
 /**
- * @defgroup axis2_soap_message
- * @ingroup axis2_soap
+ * @defgroup axiom_soap_message
+ * @ingroup axiom_soap
  * @{
  */
 
 /**
  *   \brief soap_message operations struct
- *   ops Encapsulator struct of axis2_soap body
+ *   ops Encapsulator struct of axiom_soap body
  */
- AXIS2_DECLARE_DATA   struct axis2_soap_message_ops
+ AXIS2_DECLARE_DATA   struct axiom_soap_message_ops
     {
       /**
-        * Free an axis2_soap_message
+        * Free an axiom_soap_message
         * @param  body pointer to soap_message struct
         * @param  env Environment. MUST NOT be NULL
         * @return satus of the op. AXIS2_SUCCESS on success 
@@ -56,15 +56,15 @@
         */
 
         axis2_status_t (AXIS2_CALL *
-      free_fn)(axis2_soap_message_t *message,
+      free_fn)(axiom_soap_message_t *message,
                  const axis2_env_t *env);
                                              
-        axis2_soap_envelope_t* (AXIS2_CALL *
-      get_soap_envelope)(axis2_soap_message_t *message,
+        axiom_soap_envelope_t* (AXIS2_CALL *
+      get_soap_envelope)(axiom_soap_message_t *message,
                            const axis2_env_t *env);
                                              
         axis2_status_t (AXIS2_CALL *
-      serialize)(axis2_soap_message_t *message,
+      serialize)(axiom_soap_message_t *message,
                    const axis2_env_t *env,
                    axiom_output_t *om_output);
                                                        
@@ -75,10 +75,10 @@
     * \brief soap_message struct
     * represent a soap_message
     */
-    struct axis2_soap_message
+    struct axiom_soap_message
     {
-        /** operation of axis2_soap_message struct */
-        axis2_soap_message_ops_t *ops;
+        /** operation of axiom_soap_message struct */
+        axiom_soap_message_ops_t *ops;
        
     };
 
@@ -86,22 +86,22 @@
     * creates a soap message struct 
     * @param env Environment. MUST NOT be NULL
     */
-AXIS2_EXTERN axis2_soap_message_t * AXIS2_CALL
-axis2_soap_message_create(const axis2_env_t *env,
-                          axis2_soap_builder_t *soap_builder,
+AXIS2_EXTERN axiom_soap_message_t * AXIS2_CALL
+axiom_soap_message_create(const axis2_env_t *env,
+                          axiom_soap_builder_t *soap_builder,
                           axiom_document_t *om_doc);
 
 /******************** Macros **************************************************/
     
     
 /** free soap_message */
-#define AXIS2_SOAP_MESSAGE_FREE(message , env) \
+#define AXIOM_SOAP_MESSAGE_FREE(message , env) \
         ((message)->ops->free_fn(message, env))
         
-#define AXIS2_SOAP_MESSAGE_GET_SOAP_ENVELOPE(message, env) \
+#define AXIOM_SOAP_MESSAGE_GET_SOAP_ENVELOPE(message, env) \
         ((message)->ops->get_envelope(message, env))
         
-#define AXIS2_SOAP_MESSAGE_SERIALIZE(message, env, om_output) \
+#define AXIOM_SOAP_MESSAGE_SERIALIZE(message, env, om_output) \
         ((message)->ops->serialize(message, env, om_output))
 /** @} */
 
@@ -111,4 +111,4 @@
  
  
  
-#endif /* AXIS2_SOAP_MESSAGE_H */
+#endif /* AXIOM_SOAP_MESSAGE_H */

Copied: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h (from r413637, webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_body_part.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h?p2=webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h&p1=webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_body_part.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h Mon Jun 12 04:55:38 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_MIME_BODY_PART_H
-#define AXIS2_MIME_BODY_PART_H
+#ifndef AXIOM_MIME_BODY_PART_H
+#define AXIOM_MIME_BODY_PART_H
 
 /**
- * @file axis2_mime_body_part.h
+ * @file axiom_mime_body_part.h
  * @brief axis2 mime_body_part interface
  */
 
@@ -37,33 +37,33 @@
 #endif
 
    
-typedef struct axis2_mime_body_part_ops axis2_mime_body_part_ops_t;
-typedef struct axis2_mime_body_part axis2_mime_body_part_t;   
+typedef struct axiom_mime_body_part_ops axiom_mime_body_part_ops_t;
+typedef struct axiom_mime_body_part axiom_mime_body_part_t;   
 
-/** @defgroup axis2_mime_body_part
-  * @ingroup axis2_mime_body_part
+/** @defgroup axiom_mime_body_part
+  * @ingroup axiom_mime_body_part
   * @{
   */
 
 /** 
  * @brief ops struct
- * Encapsulator struct for ops of axis2_mime_body_part
+ * Encapsulator struct for ops of axiom_mime_body_part
  */
-struct axis2_mime_body_part_ops
+struct axiom_mime_body_part_ops
 {
    axis2_status_t (AXIS2_CALL *
-    add_header)(axis2_mime_body_part_t *mime_body_part, 
+    add_header)(axiom_mime_body_part_t *mime_body_part, 
             const axis2_env_t *env, 
             const axis2_char_t *name, 
             const axis2_char_t *value); 
    
     axis2_status_t (AXIS2_CALL *
-    set_data_handler)(axis2_mime_body_part_t *mime_body_part, 
+    set_data_handler)(axiom_mime_body_part_t *mime_body_part, 
             const axis2_env_t *env, 
             axis2_data_handler_t *data_handler); 
 
     axis2_status_t (AXIS2_CALL *
-    write_to)(axis2_mime_body_part_t *mime_body_part, 
+    write_to)(axiom_mime_body_part_t *mime_body_part, 
             const axis2_env_t *env,
             axis2_byte_t **output_stream, 
             int *output_stream_size); 
@@ -72,13 +72,13 @@
      * @return status code
      */
     axis2_status_t (AXIS2_CALL *
-    free) (axis2_mime_body_part_t *mime_body_part, 
+    free) (axiom_mime_body_part_t *mime_body_part, 
             const axis2_env_t *env);
 };
 
-struct axis2_mime_body_part
+struct axiom_mime_body_part
 {
-   axis2_mime_body_part_ops_t *ops;
+   axiom_mime_body_part_ops_t *ops;
    
 };
 
@@ -86,21 +86,21 @@
  * Creates mime_body_part struct
  * @return pointer to newly created mime_body_part
  */
-AXIS2_EXTERN axis2_mime_body_part_t * AXIS2_CALL 
-axis2_mime_body_part_create (const axis2_env_t *env);
+AXIS2_EXTERN axiom_mime_body_part_t * AXIS2_CALL 
+axiom_mime_body_part_create (const axis2_env_t *env);
 
 /*************************** Function macros **********************************/
 
-#define AXIS2_MIME_BODY_PART_FREE(mime_body_part, env) \
+#define AXIOM_MIME_BODY_PART_FREE(mime_body_part, env) \
     ((mime_body_part)->ops->free (mime_body_part, env))
 
-#define AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, name, value) \
+#define AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, name, value) \
     ((mime_body_part)->ops->add_header (mime_body_part, env, name, value))
 
-#define AXIS2_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env, data_handler) \
+#define AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env, data_handler) \
     ((mime_body_part)->ops->set_data_handler (mime_body_part, env, data_handler))
 
-#define AXIS2_MIME_BODY_PART_WRITE_TO(mime_body_part, env, output_stream, output_stream_size) \
+#define AXIOM_MIME_BODY_PART_WRITE_TO(mime_body_part, env, output_stream, output_stream_size) \
     ((mime_body_part)->ops->write_to (mime_body_part, env, output_stream, output_stream_size))
 
 /*************************** End of function macros ***************************/
@@ -110,4 +110,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif  /* AXIS2_MIME_BODY_PART_H */
+#endif  /* AXIOM_MIME_BODY_PART_H */

Copied: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h (from r413637, webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_output.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h?p2=webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h&p1=webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_output.h&r1=413637&r2=413641&rev=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axis2_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h Mon Jun 12 04:55:38 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AXIS2_MIME_OUTPUT_H
-#define AXIS2_MIME_OUTPUT_H
+#ifndef AXIOM_MIME_OUTPUT_H
+#define AXIOM_MIME_OUTPUT_H
 
 /**
- * @file axis2_mime_output.h
+ * @file axiom_mime_output.h
  * @brief axis2 mime_output interface
  */
 
@@ -39,23 +39,23 @@
 /* This should be moved to header file later axis2_utils_defines.h*/    
 #define axis2_byte_t char
    
-typedef struct axis2_mime_output_ops axis2_mime_output_ops_t;
-typedef struct axis2_mime_output axis2_mime_output_t;   
+typedef struct axiom_mime_output_ops axiom_mime_output_ops_t;
+typedef struct axiom_mime_output axiom_mime_output_t;   
    
 
-/** @defgroup axis2_mime_output Flow
-  * @ingroup axis2_mime_output
+/** @defgroup axiom_mime_output Flow
+  * @ingroup axiom_mime_output
   * @{
   */
 
 /** 
  * @brief Flow ops struct
- * Encapsulator struct for ops of axis2_mime_output
+ * Encapsulator struct for ops of axiom_mime_output
  */
-struct axis2_mime_output_ops
+struct axiom_mime_output_ops
 {
 
-    axis2_byte_t* (AXIS2_CALL *complete)(axis2_mime_output_t *mime_output,
+    axis2_byte_t* (AXIS2_CALL *complete)(axiom_mime_output_t *mime_output,
                             const axis2_env_t *env, 
                             axis2_byte_t **output_stream,
                      int *output_stream_size,
@@ -68,7 +68,7 @@
 
     const axis2_char_t *(AXIS2_CALL *
     get_content_type_for_mime)(
-        axis2_mime_output_t *mime_output, 
+        axiom_mime_output_t *mime_output, 
         const axis2_env_t *env, 
         axis2_char_t *boundary, 
         axis2_char_t *content_id, 
@@ -78,7 +78,7 @@
    /** Deallocate memory
      * @return status code
      */
-    axis2_status_t (AXIS2_CALL *free) (axis2_mime_output_t *mime_output,
+    axis2_status_t (AXIS2_CALL *free) (axiom_mime_output_t *mime_output,
                             const axis2_env_t *env);
 
 };
@@ -87,26 +87,26 @@
  * @brief Flow struct
  *   Flow  
  */ 
-struct axis2_mime_output
+struct axiom_mime_output
 {
-   axis2_mime_output_ops_t *ops;
+   axiom_mime_output_ops_t *ops;
 };
 
 /**
  * Creates mime_output struct
  * @return pointer to newly created mime_output
  */
-AXIS2_EXTERN axis2_mime_output_t * AXIS2_CALL 
-axis2_mime_output_create (const axis2_env_t *env);
+AXIS2_EXTERN axiom_mime_output_t * AXIS2_CALL 
+axiom_mime_output_create (const axis2_env_t *env);
 
 /*************************** Function macros **********************************/
 
-#define AXIS2_MIME_OUTPUT_FREE(mime_output, env) ((mime_output)->ops->free (mime_output, env))
+#define AXIOM_MIME_OUTPUT_FREE(mime_output, env) ((mime_output)->ops->free (mime_output, env))
 
-#define AXIS2_MIME_OUTPUT_COMPLETE(mime_output, env, output_stream, output_stream_size, soap_body_buffer, binary_node_list, boundary, content_id, char_set_encoding, soap_content_type) \
+#define AXIOM_MIME_OUTPUT_COMPLETE(mime_output, env, output_stream, output_stream_size, soap_body_buffer, binary_node_list, boundary, content_id, char_set_encoding, soap_content_type) \
 ((mime_output)->ops->complete(mime_output, env, output_stream, output_stream_size, soap_body_buffer, binary_node_list, boundary, content_id, char_set_encoding, soap_content_type))
 
-#define AXIS2_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(mime_output, env, boundary, content_id, char_set_encoding, soap_content_type) \
+#define AXIOM_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(mime_output, env, boundary, content_id, char_set_encoding, soap_content_type) \
 ((mime_output)->ops->get_content_type_for_mime(mime_output, env, boundary, content_id, char_set_encoding, soap_content_type))
 
 /*************************** End of function macros ***************************/
@@ -116,4 +116,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif  /* AXIS2_MIME_OUTPUT_H */
+#endif  /* AXIOM_MIME_OUTPUT_H */

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c Mon Jun 12 04:55:38 2006
@@ -14,50 +14,50 @@
  * limitations under the License.
  */
  
-#include <axis2_mime_body_part.h>
+#include <axiom_mime_body_part.h>
 #include <axis2_data_handler.h>
 #include <axis2_hash.h>
 
-typedef struct axis2_mime_body_part_impl
+typedef struct axiom_mime_body_part_impl
 {
-   axis2_mime_body_part_t mime_body_part;
+   axiom_mime_body_part_t mime_body_part;
    /** hash map to hold header name, value pairs */
    axis2_hash_t *header_map;
     axis2_data_handler_t *data_handler;
-} axis2_mime_body_part_impl_t;
+} axiom_mime_body_part_impl_t;
 
 extern axis2_char_t AXIS2_CRLF[];
 
 
-#define AXIS2_INTF_TO_IMPL(mime_body_part) ((axis2_mime_body_part_impl_t *)(mime_body_part))
+#define AXIS2_INTF_TO_IMPL(mime_body_part) ((axiom_mime_body_part_impl_t *)(mime_body_part))
 
 /***************************** Function headers *******************************/
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_free (axis2_mime_body_part_t *mime_body_part, const axis2_env_t *env);
+axiom_mime_body_part_free (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_add_header (axis2_mime_body_part_t *mime_body_part, 
+axiom_mime_body_part_add_header (axiom_mime_body_part_t *mime_body_part, 
     const axis2_env_t *env,
     const axis2_char_t *name, 
     const axis2_char_t *value);
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_set_data_handler (axis2_mime_body_part_t *mime_body_part, const axis2_env_t *env, axis2_data_handler_t *data_handler); 
+axiom_mime_body_part_set_data_handler (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, axis2_data_handler_t *data_handler); 
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_write_to (axis2_mime_body_part_t *mime_body_part, const axis2_env_t *env, 
+axiom_mime_body_part_write_to (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, 
                                 axis2_byte_t **output_stream, int *output_stream_size);
 /************************** End of Function headers ************************/
 
-AXIS2_EXTERN axis2_mime_body_part_t * AXIS2_CALL
-axis2_mime_body_part_create (const axis2_env_t *env)
+AXIS2_EXTERN axiom_mime_body_part_t * AXIS2_CALL
+axiom_mime_body_part_create (const axis2_env_t *env)
 {
-    axis2_mime_body_part_impl_t *mime_body_part_impl = NULL;
+    axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
     
    AXIS2_ENV_CHECK(env, NULL);
-   mime_body_part_impl = (axis2_mime_body_part_impl_t *) AXIS2_MALLOC(env->allocator, 
-        sizeof(axis2_mime_body_part_impl_t));
+   mime_body_part_impl = (axiom_mime_body_part_impl_t *) AXIS2_MALLOC(env->allocator, 
+        sizeof(axiom_mime_body_part_impl_t));
       
    if(NULL == mime_body_part_impl)
     {
@@ -72,24 +72,24 @@
     mime_body_part_impl->header_map = axis2_hash_make(env);
     if (!(mime_body_part_impl->header_map))
     {
-        axis2_mime_body_part_free(&(mime_body_part_impl->mime_body_part), env);
+        axiom_mime_body_part_free(&(mime_body_part_impl->mime_body_part), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
    mime_body_part_impl->mime_body_part.ops = AXIS2_MALLOC (env->allocator, 
-        sizeof(axis2_mime_body_part_ops_t));
+        sizeof(axiom_mime_body_part_ops_t));
    if(NULL == mime_body_part_impl->mime_body_part.ops)
     {
-        axis2_mime_body_part_free(&(mime_body_part_impl->mime_body_part), env);
+        axiom_mime_body_part_free(&(mime_body_part_impl->mime_body_part), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
-   mime_body_part_impl->mime_body_part.ops->free =  axis2_mime_body_part_free;
-    mime_body_part_impl->mime_body_part.ops->add_header = axis2_mime_body_part_add_header;
-    mime_body_part_impl->mime_body_part.ops->set_data_handler = axis2_mime_body_part_set_data_handler; 
-    mime_body_part_impl->mime_body_part.ops->write_to = axis2_mime_body_part_write_to;
+   mime_body_part_impl->mime_body_part.ops->free =  axiom_mime_body_part_free;
+    mime_body_part_impl->mime_body_part.ops->add_header = axiom_mime_body_part_add_header;
+    mime_body_part_impl->mime_body_part.ops->set_data_handler = axiom_mime_body_part_set_data_handler; 
+    mime_body_part_impl->mime_body_part.ops->write_to = axiom_mime_body_part_write_to;
     
     return &(mime_body_part_impl->mime_body_part);
 }
@@ -97,9 +97,9 @@
 /*************************** Start of op impls *************************/
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_free (axis2_mime_body_part_t *mime_body_part, const axis2_env_t *env)
+axiom_mime_body_part_free (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env)
 {
-    axis2_mime_body_part_impl_t *mime_body_part_impl = NULL;
+    axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     mime_body_part_impl = AXIS2_INTF_TO_IMPL(mime_body_part);
@@ -127,12 +127,12 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_add_header (axis2_mime_body_part_t *mime_body_part, 
+axiom_mime_body_part_add_header (axiom_mime_body_part_t *mime_body_part, 
     const axis2_env_t *env,
     const axis2_char_t *name, 
     const axis2_char_t *value) 
 {
-    axis2_mime_body_part_impl_t *mime_body_part_impl = NULL;
+    axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
        
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
@@ -145,7 +145,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_set_data_handler (axis2_mime_body_part_t *mime_body_part, 
+axiom_mime_body_part_set_data_handler (axiom_mime_body_part_t *mime_body_part, 
     const axis2_env_t *env, axis2_data_handler_t *data_handler) 
 {
    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -154,10 +154,10 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_mime_body_part_write_to (axis2_mime_body_part_t *mime_body_part, const axis2_env_t *env, 
+axiom_mime_body_part_write_to (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, 
                                 axis2_byte_t **output_stream, int *output_stream_size) 
 {
-   axis2_mime_body_part_impl_t *mime_body_part_impl = NULL;
+   axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
     axis2_hash_index_t *hash_index = NULL;
     const void *key = NULL;
     void *value = NULL;

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Mon Jun 12 04:55:38 2006
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
  
-#include "axis2_mime_output.h"
+#include "axiom_mime_output.h"
 #include "axis2_data_handler.h"
-#include "axis2_mime_body_part.h"
+#include "axiom_mime_body_part.h"
 #include <axis2_string.h>
 #include <axiom_text.h>
-#include <axis2_mime_const.h>
+#include <axiom_mime_const.h>
 
 axis2_char_t AXIS2_CRLF[] =  { 13, 10 };
 
-typedef struct axis2_mime_output_impl
+typedef struct axiom_mime_output_impl
 {
-   axis2_mime_output_t mime_output;
-} axis2_mime_output_impl_t;
+   axiom_mime_output_t mime_output;
+} axiom_mime_output_impl_t;
 
-#define AXIS2_INTF_TO_IMPL(mime_output) ((axis2_mime_output_impl_t *)(mime_output))
+#define AXIS2_INTF_TO_IMPL(mime_output) ((axiom_mime_output_impl_t *)(mime_output))
 
 
 axis2_status_t axis2_char_2_byte(const axis2_env_t *env, axis2_char_t *char_buffer, axis2_byte_t **byte_buffer, int *byte_buffer_size);
@@ -56,10 +56,10 @@
 /***************************** Function headers *******************************/
 
 axis2_status_t AXIS2_CALL
-axis2_mime_output_free (axis2_mime_output_t *mime_output, const axis2_env_t *env);
+axiom_mime_output_free (axiom_mime_output_t *mime_output, const axis2_env_t *env);
 
 axis2_byte_t * AXIS2_CALL
-axis2_mime_output_complete(axis2_mime_output_t *mime_output,
+axiom_mime_output_complete(axiom_mime_output_t *mime_output,
                             const axis2_env_t *env, 
                             axis2_byte_t **output_stream, 
                             int *output_stream_size, 
@@ -70,29 +70,29 @@
                             axis2_char_t *char_set_encoding,
                             const axis2_char_t *soap_content_type);
 axis2_status_t AXIS2_CALL
-axis2_start_writing_mime (axis2_mime_output_t *mime_output, 
+axis2_start_writing_mime (axiom_mime_output_t *mime_output, 
                             const axis2_env_t *env, axis2_byte_t **output_stream, 
                             int *output_stream_size, axis2_char_t *boundary);
 
-axis2_mime_body_part_t * AXIS2_CALL
+axiom_mime_body_part_t * AXIS2_CALL
 axis2_create_mime_body_part (axiom_text_t *text, const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL
-axis2_write_body_part (axis2_mime_output_t *mime_output, const axis2_env_t *env, 
+axis2_write_body_part (axiom_mime_output_t *mime_output, const axis2_env_t *env, 
                         axis2_byte_t **output_stream, int *output_stream_size, 
-                        axis2_mime_body_part_t *part, axis2_char_t *boundary);
+                        axiom_mime_body_part_t *part, axis2_char_t *boundary);
 
 axis2_status_t AXIS2_CALL
-axis2_write_mime_boundary (axis2_mime_output_t *mime_output, const axis2_env_t *env, 
+axis2_write_mime_boundary (axiom_mime_output_t *mime_output, const axis2_env_t *env, 
                             axis2_byte_t **output_stream, int *output_stream_size, 
                             axis2_char_t *boundary);
 
 axis2_status_t AXIS2_CALL
-axis2_write_finish_writing_mime (axis2_mime_output_t *mime_output, const axis2_env_t *env, 
+axis2_write_finish_writing_mime (axiom_mime_output_t *mime_output, const axis2_env_t *env, 
                         axis2_byte_t **output_stream, int *output_stream_size, axis2_char_t *boundary);
 
 const axis2_char_t * AXIS2_CALL
-axis2_mime_output_get_content_type_for_mime (axis2_mime_output_t *mime_output, 
+axiom_mime_output_get_content_type_for_mime (axiom_mime_output_t *mime_output, 
         const axis2_env_t *env, 
         axis2_char_t *boundary, 
         axis2_char_t *content_id, 
@@ -101,14 +101,14 @@
 
 /************************** End of Function headers ************************/
 
-AXIS2_EXTERN axis2_mime_output_t * AXIS2_CALL
-axis2_mime_output_create (const axis2_env_t *env)
+AXIS2_EXTERN axiom_mime_output_t * AXIS2_CALL
+axiom_mime_output_create (const axis2_env_t *env)
 {
-    axis2_mime_output_impl_t *mime_output_impl = NULL;
+    axiom_mime_output_impl_t *mime_output_impl = NULL;
     
    AXIS2_ENV_CHECK(env, NULL);
-   mime_output_impl = (axis2_mime_output_impl_t *) AXIS2_MALLOC(env->allocator, 
-        sizeof(axis2_mime_output_impl_t));
+   mime_output_impl = (axiom_mime_output_impl_t *) AXIS2_MALLOC(env->allocator, 
+        sizeof(axiom_mime_output_impl_t));
       
    if(NULL == mime_output_impl)
     {
@@ -119,17 +119,17 @@
     mime_output_impl->mime_output.ops = NULL;
     
    mime_output_impl->mime_output.ops = AXIS2_MALLOC (env->allocator, 
-        sizeof(axis2_mime_output_ops_t));
+        sizeof(axiom_mime_output_ops_t));
    if(NULL == mime_output_impl->mime_output.ops)
     {
-        axis2_mime_output_free(&(mime_output_impl->mime_output), env);
+        axiom_mime_output_free(&(mime_output_impl->mime_output), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-   mime_output_impl->mime_output.ops->free =  axis2_mime_output_free;
-    mime_output_impl->mime_output.ops->complete = axis2_mime_output_complete;
-    mime_output_impl->mime_output.ops->get_content_type_for_mime = axis2_mime_output_get_content_type_for_mime; 
+   mime_output_impl->mime_output.ops->free =  axiom_mime_output_free;
+    mime_output_impl->mime_output.ops->complete = axiom_mime_output_complete;
+    mime_output_impl->mime_output.ops->get_content_type_for_mime = axiom_mime_output_get_content_type_for_mime; 
    return &(mime_output_impl->mime_output);
 }
 
@@ -137,9 +137,9 @@
 
 axis2_status_t AXIS2_CALL    
 
-axis2_mime_output_free (axis2_mime_output_t *mime_output, const axis2_env_t *env)
+axiom_mime_output_free (axiom_mime_output_t *mime_output, const axis2_env_t *env)
 {
-    axis2_mime_output_impl_t *mime_output_impl = NULL;
+    axiom_mime_output_impl_t *mime_output_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     mime_output_impl = AXIS2_INTF_TO_IMPL(mime_output);
@@ -161,7 +161,7 @@
 
 
 axis2_byte_t * AXIS2_CALL
-axis2_mime_output_complete(axis2_mime_output_t *mime_output,
+axiom_mime_output_complete(axiom_mime_output_t *mime_output,
                             const axis2_env_t *env, 
                             axis2_byte_t **output_stream, 
                             int *output_stream_size, 
@@ -175,7 +175,7 @@
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *header_value = NULL;
     axis2_char_t *content_id_string = NULL;
-   axis2_mime_body_part_t *root_mime_body_part = NULL;
+   axiom_mime_body_part_t *root_mime_body_part = NULL;
     axis2_byte_t *output_stream_start = NULL;
     int output_stream_start_size = 0;
     axis2_byte_t *output_stream_body = NULL;
@@ -195,7 +195,7 @@
         return NULL;
     
 
-    root_mime_body_part = axis2_mime_body_part_create(env);
+    root_mime_body_part = axiom_mime_body_part_create(env);
 
     /* content-type */
     header_value = AXIS2_STRDUP("application/xop+xml; charset=", env);
@@ -203,16 +203,16 @@
     header_value = AXIS2_STRACAT(header_value, "; type=\"", env);
     header_value = AXIS2_STRACAT(header_value, soap_content_type, env);
     header_value = AXIS2_STRACAT(header_value, "\";", env);
-    AXIS2_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-type", header_value);
+    AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-type", header_value);
     
     /* content-transfer-encoding */
-    AXIS2_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-transfer-encoding", "binary");
+    AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-transfer-encoding", "binary");
 
     /* content-id */
     content_id_string = (axis2_char_t *)"<";
     content_id_string = AXIS2_STRACAT(content_id_string, content_id, env);
     content_id_string = AXIS2_STRACAT(content_id_string, ">", env);
-    AXIS2_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-id", content_id_string);
+    AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-id", content_id_string);
     
     axis2_write_body_part (mime_output, env, &output_stream_body, &output_stream_body_size, root_mime_body_part, boundary);
             
@@ -228,7 +228,7 @@
             axiom_text_t *text = (axiom_text_t *)AXIS2_ARRAY_LIST_GET(binary_node_list, env, j);
             if (text)
             {
-                axis2_mime_body_part_t *mime_body_part = NULL;
+                axiom_mime_body_part_t *mime_body_part = NULL;
                 mime_body_part = axis2_create_mime_body_part(text, env);
                 axis2_write_body_part(mime_output, env, &temp_stream, 
                     &temp_stream_size, mime_body_part, boundary);
@@ -332,7 +332,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_start_writing_mime (axis2_mime_output_t *mime_output,
+axis2_start_writing_mime (axiom_mime_output_t *mime_output,
                             const axis2_env_t *env, axis2_byte_t **output_stream,
                             int *output_stream_size, axis2_char_t *boundary)
 {
@@ -341,7 +341,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_write_mime_boundary (axis2_mime_output_t *mime_output, const axis2_env_t *env,
+axis2_write_mime_boundary (axiom_mime_output_t *mime_output, const axis2_env_t *env,
                             axis2_byte_t **output_stream, int *output_stream_size, 
                             axis2_char_t *boundary)
 {
@@ -361,8 +361,8 @@
         return AXIS2_FAILURE;
     }
 
-    byte_stream[0] = AXIS2_MIME_BOUNDARY_BYTE;
-    byte_stream[1] = AXIS2_MIME_BOUNDARY_BYTE;
+    byte_stream[0] = AXIOM_MIME_BOUNDARY_BYTE;
+    byte_stream[1] = AXIOM_MIME_BOUNDARY_BYTE;
     if (byte_buffer)
     {
         memcpy (byte_stream + 2, byte_buffer, size);
@@ -378,12 +378,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_mime_body_part_t * AXIS2_CALL
+axiom_mime_body_part_t * AXIS2_CALL
 axis2_create_mime_body_part (axiom_text_t *text, const axis2_env_t *env)
 {
     axis2_data_handler_t *data_handler = NULL;
     const axis2_char_t *content_type = "application/octet-stream";
-    axis2_mime_body_part_t * mime_body_part = axis2_mime_body_part_create(env);
+    axiom_mime_body_part_t * mime_body_part = axiom_mime_body_part_create(env);
     axis2_char_t *content_id = (axis2_char_t *)"<";
     if (!mime_body_part)
         return NULL;
@@ -394,22 +394,22 @@
         content_type = AXIS2_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env);
     }
     
-    AXIS2_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env, 
+    AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env, 
             data_handler);
     content_id = AXIS2_STRACAT(content_id, 
         AXIOM_TEXT_SET_GET_CONTENT_ID(text, env), env);
     content_id = AXIS2_STRACAT(content_id, ">", env); 
-    AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-id", content_id);
-    AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-type", content_type);
-    AXIS2_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-transfer-encoding", "binary");
+    AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-id", content_id);
+    AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-type", content_type);
+    AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, "content-transfer-encoding", "binary");
 
    return mime_body_part;
 }
 
 axis2_status_t AXIS2_CALL
-axis2_write_body_part (axis2_mime_output_t *mime_output, const axis2_env_t *env, 
+axis2_write_body_part (axiom_mime_output_t *mime_output, const axis2_env_t *env, 
                         axis2_byte_t **output_stream, int *output_stream_size, 
-                        axis2_mime_body_part_t *part, axis2_char_t *boundary)
+                        axiom_mime_body_part_t *part, axis2_char_t *boundary)
 {
     axis2_byte_t *byte_buffer = NULL;
     axis2_byte_t *byte_stream = NULL;
@@ -420,7 +420,7 @@
         
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    AXIS2_MIME_BODY_PART_WRITE_TO(part, env, &body_stream, &body_stream_size);
+    AXIOM_MIME_BODY_PART_WRITE_TO(part, env, &body_stream, &body_stream_size);
     
     size = byte_buffer_size + body_stream_size + 4;
         
@@ -459,7 +459,7 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_write_finish_writing_mime (axis2_mime_output_t *mime_output, const axis2_env_t *env, 
+axis2_write_finish_writing_mime (axiom_mime_output_t *mime_output, const axis2_env_t *env, 
                         axis2_byte_t **output_stream, int *output_stream_size, axis2_char_t *boundary)
 {
     axis2_byte_t *byte_buffer;
@@ -471,8 +471,8 @@
     axis2_char_2_byte(env, boundary, &byte_buffer, &size);
     byte_stream = AXIS2_MALLOC(env->allocator, (size + 4) * sizeof(axis2_byte_t));
     
-    byte_stream[0] = AXIS2_MIME_BOUNDARY_BYTE;
-    byte_stream[1] = AXIS2_MIME_BOUNDARY_BYTE;
+    byte_stream[0] = AXIOM_MIME_BOUNDARY_BYTE;
+    byte_stream[1] = AXIOM_MIME_BOUNDARY_BYTE;
     if (byte_buffer)
     {
         memcpy (byte_stream + 2, byte_buffer, size);
@@ -480,8 +480,8 @@
         byte_buffer = NULL;
     }
     
-    byte_stream[size + 2] = AXIS2_MIME_BOUNDARY_BYTE;
-    byte_stream[size + 3] = AXIS2_MIME_BOUNDARY_BYTE;
+    byte_stream[size + 2] = AXIOM_MIME_BOUNDARY_BYTE;
+    byte_stream[size + 3] = AXIOM_MIME_BOUNDARY_BYTE;
     
     AXIS2_FREE(env->allocator, byte_buffer);
     
@@ -493,7 +493,7 @@
 }
 
 const axis2_char_t * AXIS2_CALL
-axis2_mime_output_get_content_type_for_mime (axis2_mime_output_t *mime_output, 
+axiom_mime_output_get_content_type_for_mime (axiom_mime_output_t *mime_output, 
         const axis2_env_t *env, 
         axis2_char_t *boundary, 
         axis2_char_t *content_id, 

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Mon Jun 12 04:55:38 2006
@@ -14,57 +14,57 @@
  * limitations under the License.
  */
  
-#include <axis2_mime_parser.h>
+#include <axiom_mime_parser.h>
 #include <axis2_string.h>
 #include <axis2_data_handler.h>
 
-typedef struct axis2_mime_parser_impl
+typedef struct axiom_mime_parser_impl
 {
-   axis2_mime_parser_t mime_parser;
+   axiom_mime_parser_t mime_parser;
     axis2_hash_t *mime_parts_map;
     int soap_body_len;
     axis2_char_t* soap_body_str;
-} axis2_mime_parser_impl_t;
+} axiom_mime_parser_impl_t;
 
-#define AXIS2_INTF_TO_IMPL(mime_parser) ((axis2_mime_parser_impl_t *)(mime_parser))
+#define AXIS2_INTF_TO_IMPL(mime_parser) ((axiom_mime_parser_impl_t *)(mime_parser))
 
-#define AXIS2_MIME_PARSER_BUFFER_SIZE (1024 * 1024)
+#define AXIOM_MIME_PARSER_BUFFER_SIZE (1024 * 1024)
 
 /***************************** Function headers *******************************/
 
 axis2_status_t AXIS2_CALL
-axis2_mime_parser_free (axis2_mime_parser_t *mime_parser, const axis2_env_t *env);
+axiom_mime_parser_free (axiom_mime_parser_t *mime_parser, const axis2_env_t *env);
 
 axis2_hash_t* AXIS2_CALL
-axis2_mime_parser_parse(axis2_mime_parser_t *mime_parser,
+axiom_mime_parser_parse(axiom_mime_parser_t *mime_parser,
     const axis2_env_t *env, 
     AXIS2_READ_INPUT_CALLBACK,
     void *callback_ctx,
     axis2_char_t *mime_boundary);
 
 axis2_hash_t* AXIS2_CALL
-axis2_mime_parser_get_mime_parts_map(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_mime_parts_map(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env);
 
 int AXIS2_CALL
-axis2_mime_parser_get_soap_body_len(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_soap_body_len(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env);
 
 axis2_char_t* AXIS2_CALL
-axis2_mime_parser_get_soap_body_str(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_soap_body_str(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env);
 
 
 /************************** End of Function headers ************************/
 
-AXIS2_EXTERN axis2_mime_parser_t * AXIS2_CALL
-axis2_mime_parser_create (const axis2_env_t *env)
+AXIS2_EXTERN axiom_mime_parser_t * AXIS2_CALL
+axiom_mime_parser_create (const axis2_env_t *env)
 {
-    axis2_mime_parser_impl_t *mime_parser_impl = NULL;
+    axiom_mime_parser_impl_t *mime_parser_impl = NULL;
     
    AXIS2_ENV_CHECK(env, NULL);
-   mime_parser_impl = (axis2_mime_parser_impl_t *) AXIS2_MALLOC(env->allocator, 
-        sizeof(axis2_mime_parser_impl_t));
+   mime_parser_impl = (axiom_mime_parser_impl_t *) AXIS2_MALLOC(env->allocator, 
+        sizeof(axiom_mime_parser_impl_t));
       
    if(NULL == mime_parser_impl)
     {
@@ -80,24 +80,24 @@
     mime_parser_impl->mime_parts_map = axis2_hash_make(env);
     if (!(mime_parser_impl->mime_parts_map))
     {
-        axis2_mime_parser_free(&(mime_parser_impl->mime_parser), env);
+        axiom_mime_parser_free(&(mime_parser_impl->mime_parser), env);
         return NULL;
     }
     
    mime_parser_impl->mime_parser.ops = AXIS2_MALLOC (env->allocator, 
-        sizeof(axis2_mime_parser_ops_t));
+        sizeof(axiom_mime_parser_ops_t));
    if(NULL == mime_parser_impl->mime_parser.ops)
     {
-        axis2_mime_parser_free(&(mime_parser_impl->mime_parser), env);
+        axiom_mime_parser_free(&(mime_parser_impl->mime_parser), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
-   mime_parser_impl->mime_parser.ops->free =  axis2_mime_parser_free;
-    mime_parser_impl->mime_parser.ops->parse = axis2_mime_parser_parse;
-    mime_parser_impl->mime_parser.ops->get_mime_parts_map = axis2_mime_parser_get_mime_parts_map;
-   mime_parser_impl->mime_parser.ops->get_soap_body_len = axis2_mime_parser_get_soap_body_len;
-   mime_parser_impl->mime_parser.ops->get_soap_body_str = axis2_mime_parser_get_soap_body_str;
+   mime_parser_impl->mime_parser.ops->free =  axiom_mime_parser_free;
+    mime_parser_impl->mime_parser.ops->parse = axiom_mime_parser_parse;
+    mime_parser_impl->mime_parser.ops->get_mime_parts_map = axiom_mime_parser_get_mime_parts_map;
+   mime_parser_impl->mime_parser.ops->get_soap_body_len = axiom_mime_parser_get_soap_body_len;
+   mime_parser_impl->mime_parser.ops->get_soap_body_str = axiom_mime_parser_get_soap_body_str;
     
    return &(mime_parser_impl->mime_parser);
 }
@@ -106,9 +106,9 @@
 
 axis2_status_t AXIS2_CALL    
 
-axis2_mime_parser_free (axis2_mime_parser_t *mime_parser, const axis2_env_t *env)
+axiom_mime_parser_free (axiom_mime_parser_t *mime_parser, const axis2_env_t *env)
 {
-    axis2_mime_parser_impl_t *mime_parser_impl = NULL;
+    axiom_mime_parser_impl_t *mime_parser_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     mime_parser_impl = AXIS2_INTF_TO_IMPL(mime_parser);
@@ -136,15 +136,15 @@
 
 
 axis2_hash_t* AXIS2_CALL
-axis2_mime_parser_parse(axis2_mime_parser_t *mime_parser,
+axiom_mime_parser_parse(axiom_mime_parser_t *mime_parser,
     const axis2_env_t *env, 
     AXIS2_READ_INPUT_CALLBACK callback, 
     void *callback_ctx,
     axis2_char_t *mime_boundary)
 {
-    axis2_mime_parser_impl_t *mime_parser_impl = NULL;
+    axiom_mime_parser_impl_t *mime_parser_impl = NULL;
     axis2_char_t *buffer = NULL;
-    int size = AXIS2_MIME_PARSER_BUFFER_SIZE;
+    int size = AXIOM_MIME_PARSER_BUFFER_SIZE;
     int len = 0;
     axis2_char_t *root_mime = NULL;
     int root_mime_len = 0;
@@ -318,7 +318,7 @@
                 
                 do
                 {
-                    pos = memchr(old_pos, AXIS2_MIME_BOUNDARY_BYTE, 
+                    pos = memchr(old_pos, AXIOM_MIME_BOUNDARY_BYTE, 
                         (mime_binary_len - (old_pos - mime_binary)));
                     if (!pos)
                         break;
@@ -332,9 +332,9 @@
                         }
                         temp_pos = AXIS2_STRSTR(pos + 1, mime_boundary);
                     }
-                } while ( *(pos + 1) != AXIS2_MIME_BOUNDARY_BYTE || temp_pos != pos + 2);
+                } while ( *(pos + 1) != AXIOM_MIME_BOUNDARY_BYTE || temp_pos != pos + 2);
     
-                if ( pos && *(pos + 1) == AXIS2_MIME_BOUNDARY_BYTE && temp_pos == pos + 2)
+                if ( pos && *(pos + 1) == AXIOM_MIME_BOUNDARY_BYTE && temp_pos == pos + 2)
                 {
                     old_mime_binary_len = mime_binary_len;
                     mime_binary_len = pos - mime_binary;
@@ -371,8 +371,8 @@
                 axis2_char_t *temp_pos = NULL;
                 temp_pos = pos + 2 + AXIS2_STRLEN(mime_boundary);
 
-                end_of_mime = (AXIS2_MIME_BOUNDARY_BYTE == *(temp_pos)) &&
-                    (AXIS2_MIME_BOUNDARY_BYTE == *(temp_pos + 1));
+                end_of_mime = (AXIOM_MIME_BOUNDARY_BYTE == *(temp_pos)) &&
+                    (AXIOM_MIME_BOUNDARY_BYTE == *(temp_pos + 1));
                 
                 /* capture the next mime part */
                 temp_body_mime = AXIS2_MALLOC(env->allocator, 
@@ -443,7 +443,7 @@
 }
 
 axis2_hash_t* AXIS2_CALL
-axis2_mime_parser_get_mime_parts_map(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_mime_parts_map(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
@@ -451,7 +451,7 @@
 }
 
 int AXIS2_CALL
-axis2_mime_parser_get_soap_body_len(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_soap_body_len(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -459,7 +459,7 @@
 }
 
 axis2_char_t* AXIS2_CALL
-axis2_mime_parser_get_soap_body_str(axis2_mime_parser_t *mime_parser, 
+axiom_mime_parser_get_soap_body_str(axiom_mime_parser_t *mime_parser, 
     const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);

Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?rev=413641&r1=413640&r2=413641&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Mon Jun 12 04:55:38 2006
@@ -19,13 +19,13 @@
 #include <axis2_string.h>
 #include <axis2_xml_writer.h>
 #include <axiom_text.h>
-#include <axis2_soap_const.h>
+#include <axiom_soap_const.h>
 #include <axis2_array_list.h>
 #include <axis2_uuid_gen.h>
-#include <axis2_mime_output.h>
+#include <axiom_mime_output.h>
 
 #define AXIS2_DEFAULT_CHAR_SET_ENCODING  "UTF-8"
-/** also defined in axis2_soap.h */
+/** also defined in axiom_soap.h */
 
 /** max args for om_output_write function */
 #define MAX_ARGS  4
@@ -60,7 +60,7 @@
   
     axis2_array_list_t *binary_node_list;    
 
-    axis2_mime_output_t *mime_output;
+    axiom_mime_output_t *mime_output;
     
     axis2_char_t *mime_boundry;
 
@@ -467,14 +467,14 @@
     {
         if(AXIS2_TRUE == output_impl->is_soap11)
         {
-            soap_content_type = AXIS2_SOAP11_CONTENT_TYPE;
+            soap_content_type = AXIOM_SOAP11_CONTENT_TYPE;
         }
         else
         {
-            soap_content_type = AXIS2_SOAP12_CONTENT_TYPE;
+            soap_content_type = AXIOM_SOAP12_CONTENT_TYPE;
         }    
 
-        return AXIS2_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(
+        return AXIOM_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(
             output_impl->mime_output, 
             env, output_impl->mime_boundry,
             output_impl->root_content_id, output_impl->char_set_encoding, 
@@ -484,11 +484,11 @@
     {
         if(AXIS2_TRUE == output_impl->is_soap11)
         {
-            return AXIS2_SOAP11_CONTENT_TYPE;
+            return AXIOM_SOAP11_CONTENT_TYPE;
         }
         else
         {
-            return AXIS2_SOAP12_CONTENT_TYPE;
+            return AXIOM_SOAP12_CONTENT_TYPE;
         }
     }
     return NULL;
@@ -807,16 +807,16 @@
         int stream_size = 0;
         if (output_impl->is_soap11)
         {
-            soap_content_type = AXIS2_SOAP11_CONTENT_TYPE;
+            soap_content_type = AXIOM_SOAP11_CONTENT_TYPE;
         }
         else
         {
-            soap_content_type = AXIS2_SOAP12_CONTENT_TYPE;
+            soap_content_type = AXIOM_SOAP12_CONTENT_TYPE;
         }
-        output_impl->mime_output = axis2_mime_output_create(env);
+        output_impl->mime_output = axiom_mime_output_create(env);
         output_impl->mime_boundry = axiom_output_get_mime_boundry(om_output, env);
         root_content_id = axiom_output_get_root_content_id(om_output, env);
-        AXIS2_MIME_OUTPUT_COMPLETE(output_impl->mime_output, env, &byte_stream, &stream_size,
+        AXIOM_MIME_OUTPUT_COMPLETE(output_impl->mime_output, env, &byte_stream, &stream_size,
             buffer, output_impl->binary_node_list, output_impl->mime_boundry, 
             output_impl->root_content_id, output_impl->char_set_encoding,
             soap_content_type); 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org