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 10:26:34 UTC

svn commit: r413606 [5/9] - in /webservices/axis2/trunk/c: include/ modules/core/addr/ modules/core/clientapi/ modules/core/clientapi/diclient/ modules/core/context/ modules/core/deployment/ modules/core/engine/ modules/core/receivers/ modules/core/tra...

Modified: webservices/axis2/trunk/c/samples/server/notify/notify.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify.c (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify.c Mon Jun 12 01:26:30 2006
@@ -17,9 +17,9 @@
 #include <stdio.h>
 
 void
-axis2_notify_notify (const axis2_env_t *env, axis2_om_node_t *node)
+axis2_notify_notify (const axis2_env_t *env, axiom_node_t *node)
 {
-    axis2_om_node_t *text_node = NULL;
+    axiom_node_t *text_node = NULL;
 
     if (!env || !env)
         return;
@@ -34,7 +34,7 @@
         return;
     }
 
-    text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
+    text_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
     if (!node) /* actual text to notify */
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -42,12 +42,12 @@
         return;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text , env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text , env))
         {
-            axis2_char_t *text_str = AXIS2_OM_TEXT_GET_VALUE(text, env);
+            axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
             printf("Notification received :  %s \n", text_str);
         }
     }

Modified: webservices/axis2/trunk/c/samples/server/notify/notify.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify.h (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify.h Mon Jun 12 01:26:30 2006
@@ -20,10 +20,10 @@
 #include <axis2_svc_skeleton.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_text.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
 
-void axis2_notify_notify(const axis2_env_t *env, axis2_om_node_t *node);
+void axis2_notify_notify(const axis2_env_t *env, axiom_node_t *node);
 
 #endif /* CALC_H*/

Modified: webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c Mon Jun 12 01:26:30 2006
@@ -28,10 +28,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL 
+axiom_node_t* AXIS2_CALL 
 notify_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx);
             
 
@@ -39,9 +39,9 @@
 notify_init(axis2_svc_skeleton_t *svc_skeleton,
           const axis2_env_t *env);
 
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 notify_on_fault(axis2_svc_skeleton_t *svc_skeli, 
-              const axis2_env_t *env, axis2_om_node_t *node);
+              const axis2_env_t *env, axiom_node_t *node);
 
 /*Create function */
 axis2_svc_skeleton_t *
@@ -83,10 +83,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 notify_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx)
 {
     /* Invoke the business logic.
@@ -100,19 +100,19 @@
 }
 
 /* On fault, handle the fault */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 notify_on_fault(axis2_svc_skeleton_t *svc_skeli, 
-              const axis2_env_t *env, axis2_om_node_t *node)
+              const axis2_env_t *env, axiom_node_t *node)
 {
    /* Here we are just setting a simple error message inside an element 
     * called 'EchoServiceError' 
     */
-    axis2_om_node_t *error_node = NULL;
-    axis2_om_node_t* text_node = NULL;
-    axis2_om_element_t *error_ele = NULL;
-    error_ele = axis2_om_element_create(env, node, "EchoServiceError", NULL, 
+    axiom_node_t *error_node = NULL;
+    axiom_node_t* text_node = NULL;
+    axiom_element_t *error_ele = NULL;
+    error_ele = axiom_element_create(env, node, "EchoServiceError", NULL, 
         &error_node);
-    AXIS2_OM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ", 
+    AXIOM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ", 
         text_node);
     return error_node;
 }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Mon Jun 12 01:26:30 2006
@@ -17,15 +17,15 @@
 #include <stdio.h>
 #include <axis2_svc_grp_ctx.h>
 
-axis2_om_node_t *
-axis2_add_add (const axis2_env_t *env, axis2_om_node_t *node, axis2_msg_ctx_t *msg_ctx)
+axiom_node_t *
+axis2_add_add (const axis2_env_t *env, axiom_node_t *node, axis2_msg_ctx_t *msg_ctx)
 {
-    axis2_om_node_t *param1_node = NULL;
-    axis2_om_node_t *param1_text_node = NULL;
+    axiom_node_t *param1_node = NULL;
+    axiom_node_t *param1_text_node = NULL;
     axis2_char_t *param1_str = NULL;
     long int param1 = 0;
-    axis2_om_node_t *param2_node = NULL;
-    axis2_om_node_t *param2_text_node = NULL;
+    axiom_node_t *param2_node = NULL;
+    axiom_node_t *param2_text_node = NULL;
     axis2_char_t *param2_str = NULL;
     long int param2 = 0;
 
@@ -36,7 +36,7 @@
         return NULL;
     }
 
-    param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
+    param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
     if (!param1_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -44,7 +44,7 @@
         return NULL;
     }
     
-    param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
+    param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
     if (!param1_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -52,12 +52,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param1_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param1_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -67,7 +67,7 @@
         return NULL;
     }
    
-    param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
+    param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
     if (!param2_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -75,7 +75,7 @@
         return NULL;
     }
     
-    param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
+    param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
     if (!param2_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -83,12 +83,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param2_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param2_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -103,10 +103,10 @@
         long int result = 0;
         axis2_char_t result_str[255];
 
-        axis2_om_element_t *ele1 = NULL;
-        axis2_om_node_t *node1 = NULL, *node2 = NULL;
-        axis2_om_namespace_t *ns1 = NULL;
-        axis2_om_text_t *text1 = NULL;
+        axiom_element_t *ele1 = NULL;
+        axiom_node_t *node1 = NULL, *node2 = NULL;
+        axiom_namespace_t *ns1 = NULL;
+        axiom_text_t *text1 = NULL;
 
         axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
         
@@ -117,11 +117,11 @@
 
         
 
-        ns1 = axis2_om_namespace_create (env,
+        ns1 = axiom_namespace_create (env,
                                    "http://axis2/test/namespace1",
                                    "ns1");
-        ele1 = axis2_om_element_create (env, NULL, "result", ns1, &node1);
-        text1 = axis2_om_text_create (env, node1, result_str, &node2);
+        ele1 = axiom_element_create (env, NULL, "result", ns1, &node1);
+        text1 = axiom_text_create (env, node1, result_str, &node2);
 
         /* Put the result into service group context */
         svc_grp_ctx = AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env);

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.h Mon Jun 12 01:26:30 2006
@@ -20,12 +20,12 @@
 #include <axis2_svc_skeleton.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_text.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
 
-axis2_om_node_t *axis2_add_add(const axis2_env_t *env, 
-    axis2_om_node_t *node, 
+axiom_node_t *axis2_add_add(const axis2_env_t *env, 
+    axiom_node_t *node, 
     axis2_msg_ctx_t *msg_ctx);
 
 #endif /* ADD_H*/

Modified: webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c Mon Jun 12 01:26:30 2006
@@ -25,10 +25,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL 
+axiom_node_t* AXIS2_CALL 
 add_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx);
 
 int AXIS2_CALL add_init(axis2_svc_skeleton_t *svc_skeleton,
@@ -88,10 +88,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 add_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx)
 {
     /* Depending on the function name invoke the
@@ -99,13 +99,13 @@
      */
     if (node)
     {
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
         {
-            axis2_om_element_t *element = NULL;
-            element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+            axiom_element_t *element = NULL;
+            element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
             if (element)
             {
-                axis2_char_t *op_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+                axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
                 if (op_name)
                 {
                     if ( AXIS2_STRCMP(op_name, "add") == 0 )

Modified: webservices/axis2/trunk/c/samples/server/sg_math/div.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div.c Mon Jun 12 01:26:30 2006
@@ -16,15 +16,15 @@
 #include "div.h"
 #include <stdio.h>
 
-axis2_om_node_t *
-axis2_div_div (const axis2_env_t *env, axis2_om_node_t *node)
+axiom_node_t *
+axis2_div_div (const axis2_env_t *env, axiom_node_t *node)
 {
-    axis2_om_node_t *param1_node = NULL;
-    axis2_om_node_t *param1_text_node = NULL;
+    axiom_node_t *param1_node = NULL;
+    axiom_node_t *param1_text_node = NULL;
     axis2_char_t *param1_str = NULL;
     long int param1 = 0;
-    axis2_om_node_t *param2_node = NULL;
-    axis2_om_node_t *param2_text_node = NULL;
+    axiom_node_t *param2_node = NULL;
+    axiom_node_t *param2_text_node = NULL;
     axis2_char_t *param2_str = NULL;
     long int param2 = 0;
 
@@ -35,7 +35,7 @@
         return NULL;
     }
 
-    param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
+    param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
     if (!param1_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -43,7 +43,7 @@
         return NULL;
     }
     
-    param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
+    param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
     if (!param1_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -51,12 +51,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param1_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param1_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -66,7 +66,7 @@
         return NULL;
     }
    
-    param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
+    param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
     if (!param2_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -74,7 +74,7 @@
         return NULL;
     }
     
-    param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
+    param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
     if (!param2_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -82,12 +82,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param2_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param2_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -102,10 +102,10 @@
         long int result = 0;
         axis2_char_t result_str[255];
 
-        axis2_om_element_t *ele1 = NULL;
-        axis2_om_node_t *node1 = NULL, *node2 = NULL;
-        axis2_om_namespace_t *ns1 = NULL;
-        axis2_om_text_t *text1 = NULL;
+        axiom_element_t *ele1 = NULL;
+        axiom_node_t *node1 = NULL, *node2 = NULL;
+        axiom_namespace_t *ns1 = NULL;
+        axiom_text_t *text1 = NULL;
         
         param1 = strtol(param1_str, NULL, 10);
         param2 = strtol(param2_str, NULL, 10);
@@ -116,11 +116,11 @@
 
         
 
-        ns1 = axis2_om_namespace_create (env,
+        ns1 = axiom_namespace_create (env,
                                    "http://axis2/test/namespace1",
                                    "ns1");
-        ele1 = axis2_om_element_create (env, NULL, "result", ns1, &node1);
-        text1 = axis2_om_text_create (env, node1, result_str, &node2);
+        ele1 = axiom_element_create (env, NULL, "result", ns1, &node1);
+        text1 = axiom_text_create (env, node1, result_str, &node2);
 
         return node1;
     }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/div.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div.h Mon Jun 12 01:26:30 2006
@@ -20,10 +20,10 @@
 #include <axis2_svc_skeleton.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_text.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
 
-axis2_om_node_t *axis2_div_div(const axis2_env_t *env, axis2_om_node_t *node);
+axiom_node_t *axis2_div_div(const axis2_env_t *env, axiom_node_t *node);
 
 #endif /* DIV_H*/

Modified: webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c Mon Jun 12 01:26:30 2006
@@ -25,10 +25,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL 
+axiom_node_t* AXIS2_CALL 
 div_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx);
 
 int AXIS2_CALL div_init(axis2_svc_skeleton_t *svc_skeleton,
@@ -88,10 +88,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 div_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx)
 {
     /* Depending on the function name invoke the
@@ -99,13 +99,13 @@
      */
     if (node)
     {
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
         {
-            axis2_om_element_t *element = NULL;
-            element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+            axiom_element_t *element = NULL;
+            element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
             if (element)
             {
-                axis2_char_t *op_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+                axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
                 if (op_name)
                 {
                     if ( AXIS2_STRCMP(op_name, "div") == 0 )

Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul.c Mon Jun 12 01:26:30 2006
@@ -16,15 +16,15 @@
 #include "mul.h"
 #include <stdio.h>
 
-axis2_om_node_t *
-axis2_mul_mul (const axis2_env_t *env, axis2_om_node_t *node)
+axiom_node_t *
+axis2_mul_mul (const axis2_env_t *env, axiom_node_t *node)
 {
-    axis2_om_node_t *param1_node = NULL;
-    axis2_om_node_t *param1_text_node = NULL;
+    axiom_node_t *param1_node = NULL;
+    axiom_node_t *param1_text_node = NULL;
     axis2_char_t *param1_str = NULL;
     long int param1 = 0;
-    axis2_om_node_t *param2_node = NULL;
-    axis2_om_node_t *param2_text_node = NULL;
+    axiom_node_t *param2_node = NULL;
+    axiom_node_t *param2_text_node = NULL;
     axis2_char_t *param2_str = NULL;
     long int param2 = 0;
 
@@ -35,7 +35,7 @@
         return NULL;
     }
 
-    param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
+    param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
     if (!param1_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -43,7 +43,7 @@
         return NULL;
     }
     
-    param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
+    param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
     if (!param1_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -51,12 +51,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param1_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param1_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -66,7 +66,7 @@
         return NULL;
     }
    
-    param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
+    param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
     if (!param2_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -74,7 +74,7 @@
         return NULL;
     }
     
-    param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
+    param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
     if (!param2_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -82,12 +82,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param2_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param2_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -102,10 +102,10 @@
         long int result = 0;
         axis2_char_t result_str[255];
 
-        axis2_om_element_t *ele1 = NULL;
-        axis2_om_node_t *node1 = NULL, *node2 = NULL;
-        axis2_om_namespace_t *ns1 = NULL;
-        axis2_om_text_t *text1 = NULL;
+        axiom_element_t *ele1 = NULL;
+        axiom_node_t *node1 = NULL, *node2 = NULL;
+        axiom_namespace_t *ns1 = NULL;
+        axiom_text_t *text1 = NULL;
         
         param1 = strtol(param1_str, NULL, 10);
         param2 = strtol(param2_str, NULL, 10);
@@ -114,11 +114,11 @@
 
         
 
-        ns1 = axis2_om_namespace_create (env,
+        ns1 = axiom_namespace_create (env,
                                    "http://axis2/test/namespace1",
                                    "ns1");
-        ele1 = axis2_om_element_create (env, NULL, "result", ns1, &node1);
-        text1 = axis2_om_text_create (env, node1, result_str, &node2);
+        ele1 = axiom_element_create (env, NULL, "result", ns1, &node1);
+        text1 = axiom_text_create (env, node1, result_str, &node2);
 
         return node1;
     }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul.h Mon Jun 12 01:26:30 2006
@@ -20,10 +20,10 @@
 #include <axis2_svc_skeleton.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_text.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
 
-axis2_om_node_t *axis2_mul_mul(const axis2_env_t *env, axis2_om_node_t *node);
+axiom_node_t *axis2_mul_mul(const axis2_env_t *env, axiom_node_t *node);
 
 #endif /* MUL_H*/

Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c Mon Jun 12 01:26:30 2006
@@ -25,10 +25,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL 
+axiom_node_t* AXIS2_CALL 
 mul_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx);
 
 int AXIS2_CALL mul_init(axis2_svc_skeleton_t *svc_skeleton,
@@ -88,10 +88,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 mul_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx)
 {
     /* Depending on the function name invoke the
@@ -99,13 +99,13 @@
      */
     if (node)
     {
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
         {
-            axis2_om_element_t *element = NULL;
-            element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+            axiom_element_t *element = NULL;
+            element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
             if (element)
             {
-                axis2_char_t *op_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+                axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
                 if (op_name)
                 {
                     if ( AXIS2_STRCMP(op_name, "mul") == 0 )

Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub.c Mon Jun 12 01:26:30 2006
@@ -16,15 +16,15 @@
 #include "sub.h"
 #include <stdio.h>
 
-axis2_om_node_t *
-axis2_sub_sub (const axis2_env_t *env, axis2_om_node_t *node)
+axiom_node_t *
+axis2_sub_sub (const axis2_env_t *env, axiom_node_t *node)
 {
-    axis2_om_node_t *param1_node = NULL;
-    axis2_om_node_t *param1_text_node = NULL;
+    axiom_node_t *param1_node = NULL;
+    axiom_node_t *param1_text_node = NULL;
     axis2_char_t *param1_str = NULL;
     long int param1 = 0;
-    axis2_om_node_t *param2_node = NULL;
-    axis2_om_node_t *param2_text_node = NULL;
+    axiom_node_t *param2_node = NULL;
+    axiom_node_t *param2_text_node = NULL;
     axis2_char_t *param2_str = NULL;
     long int param2 = 0;
 
@@ -35,7 +35,7 @@
         return NULL;
     }
 
-    param1_node = AXIS2_OM_NODE_GET_FIRST_CHILD(node, env);
+    param1_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
     if (!param1_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -43,7 +43,7 @@
         return NULL;
     }
     
-    param1_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param1_node, env);
+    param1_text_node = AXIOM_NODE_GET_FIRST_CHILD(param1_node, env);
     if (!param1_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -51,12 +51,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param1_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param1_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -66,7 +66,7 @@
         return NULL;
     }
    
-    param2_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(param1_node, env);
+    param2_node = AXIOM_NODE_GET_NEXT_SIBLING(param1_node, env);
     if (!param2_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -74,7 +74,7 @@
         return NULL;
     }
     
-    param2_text_node = AXIS2_OM_NODE_GET_FIRST_CHILD(param2_node, env);
+    param2_text_node = AXIOM_NODE_GET_FIRST_CHILD(param2_node, env);
     if (!param2_text_node)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST, AXIS2_FAILURE);
@@ -82,12 +82,12 @@
         return NULL;
     }
     
-    if (AXIS2_OM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIS2_OM_TEXT)
+    if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
     {
-        axis2_om_text_t *text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
-        if( text && AXIS2_OM_TEXT_GET_VALUE(text ,env))
+        axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
+        if( text && AXIOM_TEXT_GET_VALUE(text ,env))
         {
-            param2_str = AXIS2_OM_TEXT_GET_VALUE(text,env);
+            param2_str = AXIOM_TEXT_GET_VALUE(text,env);
         }
     }
     else
@@ -102,10 +102,10 @@
         long int result = 0;
         axis2_char_t result_str[255];
 
-        axis2_om_element_t *ele1 = NULL;
-        axis2_om_node_t *node1 = NULL, *node2 = NULL;
-        axis2_om_namespace_t *ns1 = NULL;
-        axis2_om_text_t *text1 = NULL;
+        axiom_element_t *ele1 = NULL;
+        axiom_node_t *node1 = NULL, *node2 = NULL;
+        axiom_namespace_t *ns1 = NULL;
+        axiom_text_t *text1 = NULL;
         
         param1 = strtol(param1_str, NULL, 10);
         param2 = strtol(param2_str, NULL, 10);
@@ -114,11 +114,11 @@
 
         
 
-        ns1 = axis2_om_namespace_create (env,
+        ns1 = axiom_namespace_create (env,
                                    "http://axis2/test/namespace1",
                                    "ns1");
-        ele1 = axis2_om_element_create (env, NULL, "result", ns1, &node1);
-        text1 = axis2_om_text_create (env, node1, result_str, &node2);
+        ele1 = axiom_element_create (env, NULL, "result", ns1, &node1);
+        text1 = axiom_text_create (env, node1, result_str, &node2);
 
         return node1;
     }

Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub.h (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub.h Mon Jun 12 01:26:30 2006
@@ -20,10 +20,10 @@
 #include <axis2_svc_skeleton.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom_text.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
 
-axis2_om_node_t *axis2_sub_sub(const axis2_env_t *env, axis2_om_node_t *node);
+axiom_node_t *axis2_sub_sub(const axis2_env_t *env, axiom_node_t *node);
 
 #endif /* SUB_H*/

Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c Mon Jun 12 01:26:30 2006
@@ -25,10 +25,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL 
+axiom_node_t* AXIS2_CALL 
 sub_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx);
 
 int AXIS2_CALL sub_init(axis2_svc_skeleton_t *svc_skeleton,
@@ -88,10 +88,10 @@
 /*
  * This method invokes the right service method 
  */
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
 sub_invoke(axis2_svc_skeleton_t *svc_skeleton,
             const axis2_env_t *env,
-            axis2_om_node_t *node,
+            axiom_node_t *node,
             axis2_msg_ctx_t *msg_ctx)
 {
     /* Depending on the function name invoke the
@@ -99,13 +99,13 @@
      */
     if (node)
     {
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
         {
-            axis2_om_element_t *element = NULL;
-            element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+            axiom_element_t *element = NULL;
+            element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
             if (element)
             {
-                axis2_char_t *op_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+                axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
                 if (op_name)
                 {
                     if ( AXIS2_STRCMP(op_name, "sub") == 0 )

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking.c Mon Jun 12 01:26:30 2006
@@ -27,8 +27,8 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *payload = NULL;
+    axiom_node_t *ret_node = NULL;
    
     /* Set up the environment */
     env = axis2_env_create_all("echo_blocking.log", AXIS2_LOG_LEVEL_TRACE);
@@ -85,7 +85,7 @@
     if(ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+        om_str = AXIOM_NODE_TO_STRING(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_addr.c Mon Jun 12 01:26:30 2006
@@ -27,8 +27,8 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *payload = NULL;
+    axiom_node_t *ret_node = NULL;
    
     /* Set up the environment */
     env = axis2_env_create_all("echo_blocking_addr.log", AXIS2_LOG_LEVEL_TRACE);
@@ -90,7 +90,7 @@
     if(ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+        om_str = AXIOM_NODE_TO_STRING(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Mon Jun 12 01:26:30 2006
@@ -28,8 +28,8 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *payload = NULL;
+    axiom_node_t *ret_node = NULL;
    
     /* Set up the environment */
     env = axis2_env_create_all("echo_blocking_dual.log", AXIS2_LOG_LEVEL_TRACE);
@@ -95,7 +95,7 @@
     if(ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+        om_str = AXIOM_NODE_TO_STRING(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_soap11.c Mon Jun 12 01:26:30 2006
@@ -27,8 +27,8 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *payload = NULL;
+    axiom_node_t *ret_node = NULL;
    
     /* Set up the environment */
     env = axis2_env_create_all("echo_blocking_soap11.log", AXIS2_LOG_LEVEL_TRACE);
@@ -86,7 +86,7 @@
     if(ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+        om_str = AXIOM_NODE_TO_STRING(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Mon Jun 12 01:26:30 2006
@@ -41,7 +41,7 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
+    axiom_node_t *payload = NULL;
     axis2_callback_t *callback = NULL;
     int count = 0;
    
@@ -144,7 +144,7 @@
      from the callback object and do whatever you want to do with it */
    
    axis2_soap_envelope_t *soap_envelope = NULL;
-   axis2_om_node_t *ret_node = NULL;
+   axiom_node_t *ret_node = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
    
    printf("inside on_complete_callback function\n");
@@ -174,7 +174,7 @@
         else
         {
             axis2_char_t *om_str = NULL;
-            om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+            om_str = AXIOM_NODE_TO_STRING(ret_node, env);
             if (om_str)
                 printf("\nReceived OM : %s\n", om_str);
             printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Mon Jun 12 01:26:30 2006
@@ -42,7 +42,7 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
+    axiom_node_t *payload = NULL;
     axis2_callback_t *callback = NULL;
     int count = 0;
    
@@ -154,7 +154,7 @@
      from the callback object and do whatever you want to do with it */
    
    axis2_soap_envelope_t *soap_envelope = NULL;
-   axis2_om_node_t *ret_node = NULL;
+   axiom_node_t *ret_node = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
    
    printf("inside on_complete_callback function\n");
@@ -184,7 +184,7 @@
         else
         {
             axis2_char_t *om_str = NULL;
-            om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+            om_str = AXIOM_NODE_TO_STRING(ret_node, env);
             if (om_str)
                 printf("\nReceived OM : %s\n", om_str);
             printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Mon Jun 12 01:26:30 2006
@@ -27,8 +27,8 @@
     axis2_options_t *options = NULL;
     const axis2_char_t *client_home = NULL;
     axis2_svc_client_t* svc_client = NULL;
-    axis2_om_node_t *payload = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *payload = NULL;
+    axiom_node_t *ret_node = NULL;
    
     /* Set up the environment */
     env = axis2_env_create_all("echo_rest.log", AXIS2_LOG_LEVEL_TRACE);
@@ -87,7 +87,7 @@
     if(ret_node)
     {
         axis2_char_t *om_str = NULL;
-        om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
+        om_str = AXIOM_NODE_TO_STRING(ret_node, env);
         if (om_str)
             printf("\nReceived OM : %s\n", om_str);
         printf("\necho client invoke SUCCESSFUL!\n");

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c Mon Jun 12 01:26:30 2006
@@ -17,22 +17,22 @@
 #include "echo_util.h"
 
 /* build SOAP request message content using OM */
-axis2_om_node_t *
+axiom_node_t *
 build_om_payload_for_echo_svc(const axis2_env_t *env)
 {
-    axis2_om_node_t *echo_om_node = NULL;
-    axis2_om_element_t* echo_om_ele = NULL;
-    axis2_om_node_t* text_om_node = NULL;
-    axis2_om_element_t * text_om_ele = NULL;
-    axis2_om_namespace_t *ns1 = NULL;
+    axiom_node_t *echo_om_node = NULL;
+    axiom_element_t* echo_om_ele = NULL;
+    axiom_node_t* text_om_node = NULL;
+    axiom_element_t * text_om_ele = NULL;
+    axiom_namespace_t *ns1 = NULL;
     axis2_char_t *om_str = NULL;
     
-    ns1 = axis2_om_namespace_create (env, "http://ws.apache.org/axis2/c/samples", "ns1");
-    echo_om_ele = axis2_om_element_create(env, NULL, "echoString", ns1, &echo_om_node);
-    text_om_ele = axis2_om_element_create(env, echo_om_node, "text", NULL, &text_om_node);
-    AXIS2_OM_ELEMENT_SET_TEXT(text_om_ele, env, "echo5", text_om_node);
+    ns1 = axiom_namespace_create (env, "http://ws.apache.org/axis2/c/samples", "ns1");
+    echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, &echo_om_node);
+    text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
+    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, "echo5", text_om_node);
     
-    om_str = AXIS2_OM_NODE_TO_STRING(echo_om_node, env);
+    om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
     if (om_str)
         printf("\nSending OM : %s\n", om_str);
 

Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h Mon Jun 12 01:26:30 2006
@@ -18,9 +18,9 @@
 #define AXIS2_UG_ECHO_UTIL_H
 
 #include <stdio.h>
-#include <axis2_om.h>
+#include <axiom.h>
 
-axis2_om_node_t *
+axiom_node_t *
 build_om_payload_for_echo_svc(const axis2_env_t *env);
 
 #endif

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c Mon Jun 12 01:26:30 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <axis2_om_stax_builder.h>
-#include <axis2_om_document.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
-#include <axis2_om_text.h>
+#include <axiom_stax_builder.h>
+#include <axiom_document.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
+#include <axiom_text.h>
 #include <axis2_stream.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
@@ -35,24 +35,24 @@
 #include <axis2_soap_fault.h>
 #include <axis2_soap_fault_code.h>
 #include <axis2_soap_fault_role.h>
-#include <axis2_om_node.h>
+#include <axiom_node.h>
 #include <axis2_msg_ctx.h>
 #include <axis2_call.h>
 #include <ctype.h>
 #include <string.h>
 
-axis2_om_node_t *build_soap_body_content (const axis2_env_t *env,
+axiom_node_t *build_soap_body_content (const axis2_env_t *env,
                                           axis2_char_t * echo_operation,
                                           axis2_char_t * echo_type,
                                           axis2_char_t * word_to_echo,
-                                          axis2_om_node_t * body_node);
+                                          axiom_node_t * body_node);
 
-void print_invalid_om (const axis2_env_t *env, axis2_om_node_t * ret_node);
+void print_invalid_om (const axis2_env_t *env, axiom_node_t * ret_node);
 
 int
 main (int argc, char **argv)
 {
-    axis2_om_node_t *node = NULL;
+    axiom_node_t *node = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     const axis2_env_t *env = NULL;
     axis2_error_t *error = NULL;
@@ -60,7 +60,7 @@
     axis2_allocator_t *allocator = NULL;
     axis2_char_t *address = NULL;
     axis2_char_t *client_home = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *ret_node = NULL;
     axis2_svc_t *svc = NULL;
     axis2_op_t *op = NULL;
     axis2_call_t *call = NULL;
@@ -71,8 +71,8 @@
     axis2_msg_ctx_t *response_ctx = NULL;
     axis2_soap_envelope_t *soap_envelope = NULL;
     axis2_soap_body_t *soap_body = NULL;
-    axis2_om_namespace_t *env_ns = NULL;
-    axis2_om_node_t *body_node = NULL;
+    axiom_namespace_t *env_ns = NULL;
+    axiom_node_t *body_node = NULL;
     axis2_char_t *echo_operation = NULL;
     axis2_char_t *word_to_echo = NULL;
     axis2_char_t *echo_type = NULL;
@@ -121,7 +121,7 @@
     mep_client = AXIS2_CALL_GET_BASE (call, env);
     /* prepare SOAP envelope */
     env_ns =
-        axis2_om_namespace_create (env,
+        axiom_namespace_create (env,
                                    AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
                                    "soap");
     soap_envelope = axis2_soap_envelope_create (env, env_ns);
@@ -187,20 +187,20 @@
     if (ret_node)
     {
         print_invalid_om (env, ret_node);
-        if (AXIS2_OM_NODE_GET_NODE_TYPE (ret_node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE (ret_node, env) == AXIOM_ELEMENT)
         {
             axis2_char_t *result = NULL;
-            axis2_om_element_t *result_ele = NULL;
-            axis2_om_node_t *ret_node1 = NULL;
+            axiom_element_t *result_ele = NULL;
+            axiom_node_t *ret_node1 = NULL;
             axis2_char_t echo_response_buff[32];
             
-            ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, env); /*Body */
+            ret_node1 = AXIOM_NODE_GET_FIRST_CHILD (ret_node, env); /*Body */
             if (!ret_node1)
             {
                 print_invalid_om (env, ret_node);
                 return AXIS2_FAILURE;
             }
-            ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node1, env); /*GetTypeResponse */
+            ret_node = AXIOM_NODE_GET_FIRST_CHILD (ret_node1, env); /*GetTypeResponse */
             if (!ret_node)
             {
                 print_invalid_om (env, ret_node1);
@@ -210,26 +210,26 @@
             
             sprintf (echo_response_buff, "echo%sResponse", echo_operation);
             result_ele =
-                (axis2_om_element_t *)
-                AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node, env);
+                (axiom_element_t *)
+                AXIOM_NODE_GET_DATA_ELEMENT (ret_node, env);
             if (AXIS2_STRCMP
-                (AXIS2_OM_ELEMENT_GET_LOCALNAME (result_ele, env),
+                (AXIOM_ELEMENT_GET_LOCALNAME (result_ele, env),
                  echo_response_buff) != 0)
             {
                 print_invalid_om (env, ret_node1);
                 return AXIS2_FAILURE;
             }
 
-            ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, env); /*return */
+            ret_node1 = AXIOM_NODE_GET_FIRST_CHILD (ret_node, env); /*return */
             if (!ret_node1)
             {
                 print_invalid_om (env, ret_node);
                 return AXIS2_FAILURE;
             }
             result_ele =
-                (axis2_om_element_t *)
-                AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node1, env);
-            result = AXIS2_OM_ELEMENT_GET_TEXT (result_ele, env, ret_node1);
+                (axiom_element_t *)
+                AXIOM_NODE_GET_DATA_ELEMENT (ret_node1, env);
+            result = AXIOM_ELEMENT_GET_TEXT (result_ele, env, ret_node1);
             if (!strcmp (word_to_echo, result))
             {
                 printf ("\nSUCCESS\n\n");
@@ -257,33 +257,33 @@
 
     /*if (node)
        {
-       AXIS2_OM_NODE_FREE_TREE(node, env);
+       AXIOM_NODE_FREE_TREE(node, env);
        } */
     return status;
 }
 
-axis2_om_node_t *
+axiom_node_t *
 build_soap_body_content (const axis2_env_t *env, axis2_char_t * echo_operation,
                          axis2_char_t * echo_type,
                          axis2_char_t * word_to_echo,
-                         axis2_om_node_t * body_node)
+                         axiom_node_t * body_node)
 {
-    axis2_om_node_t *envelope_node = NULL;
-    axis2_om_element_t *envelope_element = NULL;
-    axis2_om_element_t *body_om_ele = NULL;
-
-    axis2_om_node_t *echo_om_node = NULL;
-    axis2_om_element_t *echo_om_ele = NULL;
-    axis2_om_node_t *text_om_node = NULL;
-    axis2_om_element_t *text_om_ele = NULL;
-    axis2_om_namespace_t *ns0 = NULL, *ns1 = NULL, *ns2 = NULL, *ns3 = NULL,
+    axiom_node_t *envelope_node = NULL;
+    axiom_element_t *envelope_element = NULL;
+    axiom_element_t *body_om_ele = NULL;
+
+    axiom_node_t *echo_om_node = NULL;
+    axiom_element_t *echo_om_ele = NULL;
+    axiom_node_t *text_om_node = NULL;
+    axiom_element_t *text_om_ele = NULL;
+    axiom_namespace_t *ns0 = NULL, *ns1 = NULL, *ns2 = NULL, *ns3 = NULL,
         *ns4 = NULL, *ns5 = NULL, *ns6 = NULL;
 
-    axis2_om_attribute_t *attri1 = NULL;
+    axiom_attribute_t *attri1 = NULL;
 
     axis2_xml_writer_t *xml_writer = NULL;
     axis2_xml_writer_t *writer = NULL;
-    axis2_om_output_t *om_output = NULL;
+    axiom_output_t *om_output = NULL;
     axis2_char_t *buffer = NULL;
 
     axis2_char_t echo_operation_buff[32];
@@ -300,88 +300,88 @@
 
 
     ns1 =
-        axis2_om_namespace_create (env,
+        axiom_namespace_create (env,
                                    "http://www.w3.org/2001/XMLSchema-instance",
                                    "xsi");
     ns2 =
-        axis2_om_namespace_create (env, "http://www.w3.org/2001/XMLSchema",
+        axiom_namespace_create (env, "http://www.w3.org/2001/XMLSchema",
                                    "xsd");
     ns3 =
-        axis2_om_namespace_create (env,
+        axiom_namespace_create (env,
                                    "http://schemas.xmlsoap.org/soap/encoding/",
                                    "soapenc");
-    ns4 = axis2_om_namespace_create (env, "http://soapinterop.org/", "tns");
+    ns4 = axiom_namespace_create (env, "http://soapinterop.org/", "tns");
     ns5 =
-        axis2_om_namespace_create (env, "http://soapinterop.org/encodedTypes",
+        axiom_namespace_create (env, "http://soapinterop.org/encodedTypes",
                                    "types");
 
-    envelope_node = AXIS2_OM_NODE_GET_PARENT (body_node, env);
+    envelope_node = AXIOM_NODE_GET_PARENT (body_node, env);
     envelope_element =
-        (axis2_om_element_t *) AXIS2_OM_NODE_GET_DATA_ELEMENT (envelope_node,
+        (axiom_element_t *) AXIOM_NODE_GET_DATA_ELEMENT (envelope_node,
                                                                env);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns1);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns2);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns3);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns4);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns5);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
+    AXIOM_ELEMENT_DECLARE_NAMESPACE (envelope_element, env, envelope_node,
                                         ns6);
-    ns0 = AXIS2_OM_ELEMENT_GET_NAMESPACE (envelope_element, env, envelope_node);
+    ns0 = AXIOM_ELEMENT_GET_NAMESPACE (envelope_element, env, envelope_node);
     attri1 =
-        axis2_om_attribute_create (env, "encodingStyle",
+        axiom_attribute_create (env, "encodingStyle",
                                    "http://schemas.xmlsoap.org/soap/encoding/",
                                    ns0);
 
-    body_om_ele = AXIS2_OM_NODE_GET_DATA_ELEMENT (body_node, env);
-    AXIS2_OM_ELEMENT_ADD_ATTRIBUTE (body_om_ele, env, attri1, body_node);
+    body_om_ele = AXIOM_NODE_GET_DATA_ELEMENT (body_node, env);
+    AXIOM_ELEMENT_ADD_ATTRIBUTE (body_om_ele, env, attri1, body_node);
 
     echo_om_ele =
-        axis2_om_element_create (env, body_node, echo_operation_buff, ns4,
+        axiom_element_create (env, body_node, echo_operation_buff, ns4,
                                  &echo_om_node);
 
     text_om_ele =
-        axis2_om_element_create (env, echo_om_node, input_type_buff, NULL,
+        axiom_element_create (env, echo_om_node, input_type_buff, NULL,
                                  &text_om_node);
-    attri1 = axis2_om_attribute_create (env, "type", xsd_type_buff, ns1);
-    AXIS2_OM_ELEMENT_ADD_ATTRIBUTE (text_om_ele, env, attri1, text_om_node);
-    AXIS2_OM_ELEMENT_SET_TEXT (text_om_ele, env, word_to_echo, text_om_node);
+    attri1 = axiom_attribute_create (env, "type", xsd_type_buff, ns1);
+    AXIOM_ELEMENT_ADD_ATTRIBUTE (text_om_ele, env, attri1, text_om_node);
+    AXIOM_ELEMENT_SET_TEXT (text_om_ele, env, word_to_echo, text_om_node);
 
     xml_writer =
         axis2_xml_writer_create_for_memory (env, NULL, AXIS2_FALSE,
                                             AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
-    om_output = axis2_om_output_create (env, xml_writer);
+    om_output = axiom_output_create (env, xml_writer);
 
-    AXIS2_OM_NODE_SERIALIZE (echo_om_node, env, om_output);
+    AXIOM_NODE_SERIALIZE (echo_om_node, env, om_output);
     buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML (xml_writer, env);
     AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI,
                      "\nSending OM node in XML : %s \n", buffer);
 
     writer = axis2_xml_writer_create_for_memory (env, NULL, AXIS2_TRUE, 0, 
                                     AXIS2_XML_PARSER_TYPE_BUFFER);
-    om_output = axis2_om_output_create (env, writer);
-    AXIS2_OM_NODE_SERIALIZE (envelope_node, env, om_output);
+    om_output = axiom_output_create (env, writer);
+    AXIOM_NODE_SERIALIZE (envelope_node, env, om_output);
     buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML (writer, env);
     printf ("Sending :\n%s\n", buffer);
     return echo_om_node;
 }
 
 void
-print_invalid_om (const axis2_env_t *env, axis2_om_node_t * ret_node)
+print_invalid_om (const axis2_env_t *env, axiom_node_t * ret_node)
 {
 
     axis2_xml_writer_t *writer = NULL;
-    axis2_om_output_t *om_output = NULL;
+    axiom_output_t *om_output = NULL;
     axis2_char_t *buffer = NULL;
     writer = axis2_xml_writer_create_for_memory (env, NULL, AXIS2_TRUE, 0,
                                        AXIS2_XML_PARSER_TYPE_BUFFER);
-    om_output = axis2_om_output_create (env, writer);
+    om_output = axiom_output_create (env, writer);
 
-    AXIS2_OM_NODE_SERIALIZE (ret_node, env, om_output);
+    AXIOM_NODE_SERIALIZE (ret_node, env, om_output);
     buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML (writer, env);
     printf ("Received : \n%s\n", buffer);
 }

Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c Mon Jun 12 01:26:30 2006
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <axis2_om_stax_builder.h>
-#include <axis2_om_document.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
-#include <axis2_om_text.h>
+#include <axiom_stax_builder.h>
+#include <axiom_document.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
+#include <axiom_text.h>
 #include <axis2_stream.h>
 #include <axis2_log_default.h>
 #include <axis2_error_default.h>
@@ -36,20 +36,20 @@
 #include <axis2_soap_fault.h>
 #include <axis2_soap_fault_code.h>
 #include <axis2_soap_fault_role.h>
-#include <axis2_om_node.h>
+#include <axiom_node.h>
 #include <axis2_msg_ctx.h>
 #include <axis2_call.h>
 #include <ctype.h>
 
-axis2_om_node_t *
+axiom_node_t *
 build_soap_body_content(const axis2_env_t *env, axis2_char_t *echo_operation,
-                        axis2_char_t *word_to_echo, axis2_om_node_t *body_node);
+                        axis2_char_t *word_to_echo, axiom_node_t *body_node);
 
-void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node);
+void print_invalid_om(const axis2_env_t *env, axiom_node_t *ret_node);
 
 int main(int argc, char** argv)
 {
-    axis2_om_node_t *node = NULL;
+    axiom_node_t *node = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     const axis2_env_t *env = NULL;
     axis2_error_t *error = NULL;
@@ -57,7 +57,7 @@
     axis2_allocator_t *allocator = NULL;
     axis2_char_t *address = NULL;
     axis2_char_t *client_home = NULL;
-    axis2_om_node_t *ret_node = NULL;
+    axiom_node_t *ret_node = NULL;
     axis2_svc_t *svc = NULL;
     axis2_op_t *op = NULL;
     axis2_call_t *call = NULL;
@@ -68,8 +68,8 @@
     axis2_msg_ctx_t *response_ctx = NULL;
     axis2_soap_envelope_t *soap_envelope = NULL;
     axis2_soap_body_t *soap_body = NULL;
-    axis2_om_namespace_t *env_ns = NULL;
-    axis2_om_node_t *body_node = NULL;
+    axiom_namespace_t *env_ns = NULL;
+    axiom_node_t *body_node = NULL;
     axis2_char_t *echo_operation = NULL;
     axis2_char_t *word_to_echo = NULL;
     axis2_char_t operation[32] ;
@@ -112,7 +112,7 @@
     call = axis2_call_create(env, NULL, client_home);
     mep_client = AXIS2_CALL_GET_BASE(call, env);
     /* prepare SOAP envelope */
-    env_ns = axis2_om_namespace_create(env, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, "soap"); 
+    env_ns = axiom_namespace_create(env, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, "soap"); 
     soap_envelope = axis2_soap_envelope_create(env, env_ns);
     soap_body = axis2_soap_body_create_with_parent(env, soap_envelope);
     body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
@@ -171,20 +171,20 @@
 
     if(ret_node)
     {
-        if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, env) == AXIS2_OM_ELEMENT)
+        if (AXIOM_NODE_GET_NODE_TYPE(ret_node, env) == AXIOM_ELEMENT)
         {
             axis2_char_t *result = NULL;
-            axis2_om_element_t *result_ele = NULL;
-            axis2_om_node_t *ret_node1 = NULL;
+            axiom_element_t *result_ele = NULL;
+            axiom_node_t *ret_node1 = NULL;
             axis2_char_t echo_response_buff[32];
             
-            ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, env); /*Body*/
+            ret_node1 = AXIOM_NODE_GET_FIRST_CHILD(ret_node, env); /*Body*/
             if (!ret_node1)
             {
                 print_invalid_om(env, ret_node);
                 return AXIS2_FAILURE;
             }
-            ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node1, env); /*GetTypeResponse*/
+            ret_node = AXIOM_NODE_GET_FIRST_CHILD(ret_node1, env); /*GetTypeResponse*/
             if (!ret_node)
             {
                 print_invalid_om(env, ret_node1);
@@ -193,22 +193,22 @@
             /*see if we have got a fault*/
        
        sprintf (echo_response_buff, "echo%sResponse", echo_operation);
-            result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, env);
-            if (AXIS2_STRCMP(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, env), echo_response_buff) != 0 )
+            result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
+            if (AXIS2_STRCMP(AXIOM_ELEMENT_GET_LOCALNAME(result_ele, env), echo_response_buff) != 0 )
             {
                 print_invalid_om(env, ret_node1);
                 return AXIS2_FAILURE;
             }
             
-            ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, env); /*return*/
+            ret_node1 = AXIOM_NODE_GET_FIRST_CHILD(ret_node, env); /*return*/
             if (!ret_node1)
             {
                 print_invalid_om(env, ret_node);
                 return AXIS2_FAILURE;
             }
-            result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node1, env);
-            /*printf(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, env)); */
-            result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, env, ret_node1);
+            result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node1, env);
+            /*printf(AXIOM_ELEMENT_GET_LOCALNAME(result_ele, env)); */
+            result = AXIOM_ELEMENT_GET_TEXT(result_ele, env, ret_node1);
        if (!strcmp( word_to_echo, result ) )
        {
       printf("Success\n");
@@ -236,25 +236,25 @@
     return status;
 }
 
-axis2_om_node_t *
+axiom_node_t *
 build_soap_body_content(const axis2_env_t *env, axis2_char_t *echo_operation,
-                        axis2_char_t *word_to_echo, axis2_om_node_t *body_node)
+                        axis2_char_t *word_to_echo, axiom_node_t *body_node)
 {
-    axis2_om_node_t* envelope_node = NULL;
-    axis2_om_element_t* envelope_element = NULL;
-    axis2_om_element_t* body_om_ele = NULL;
-    
-    axis2_om_node_t *echo_om_node = NULL;
-    axis2_om_element_t* echo_om_ele = NULL;
-    axis2_om_node_t* text_om_node = NULL;
-    axis2_om_element_t * text_om_ele = NULL;
-    axis2_om_namespace_t *ns0 = NULL, *ns1 = NULL, *ns2 = NULL, *ns3 = NULL,
+    axiom_node_t* envelope_node = NULL;
+    axiom_element_t* envelope_element = NULL;
+    axiom_element_t* body_om_ele = NULL;
+    
+    axiom_node_t *echo_om_node = NULL;
+    axiom_element_t* echo_om_ele = NULL;
+    axiom_node_t* text_om_node = NULL;
+    axiom_element_t * text_om_ele = NULL;
+    axiom_namespace_t *ns0 = NULL, *ns1 = NULL, *ns2 = NULL, *ns3 = NULL,
           *ns4 = NULL, *ns5 = NULL, *ns6 = NULL;
     
-    axis2_om_attribute_t* attri1 = NULL;
+    axiom_attribute_t* attri1 = NULL;
 
     axis2_xml_writer_t *xml_writer = NULL;
-    axis2_om_output_t *om_output = NULL;
+    axiom_output_t *om_output = NULL;
     axis2_char_t *buffer = NULL;
 
     axis2_char_t echo_operation_buff[32];
@@ -267,54 +267,54 @@
     sprintf( echo_operation_buff,  "echo%s", echo_operation );
     sprintf( input_type_buff,  "input%s", echo_operation );
 
-    ns1 = axis2_om_namespace_create (env, "http://www.w3.org/2001/XMLSchema-instance", "xsi");
-    ns2 = axis2_om_namespace_create (env, "http://www.w3.org/2001/XMLSchema", "xsd");
-    ns3 = axis2_om_namespace_create (env, "http://schemas.xmlsoap.org/soap/encoding/","soapenc");
-    ns4 = axis2_om_namespace_create (env, "http://soapinterop.org/","tns");
-    ns5 = axis2_om_namespace_create (env, "http://soapinterop.org/encodedTypes","types");
-
-    envelope_node = AXIS2_OM_NODE_GET_PARENT(body_node, env);
-    envelope_element = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(envelope_node, env);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns1);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns2);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns3);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns4);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns5);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns6);
-    ns0 = AXIS2_OM_ELEMENT_GET_NAMESPACE(envelope_element, env, envelope_node);
-    attri1 = axis2_om_attribute_create (env, "encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", ns0);
+    ns1 = axiom_namespace_create (env, "http://www.w3.org/2001/XMLSchema-instance", "xsi");
+    ns2 = axiom_namespace_create (env, "http://www.w3.org/2001/XMLSchema", "xsd");
+    ns3 = axiom_namespace_create (env, "http://schemas.xmlsoap.org/soap/encoding/","soapenc");
+    ns4 = axiom_namespace_create (env, "http://soapinterop.org/","tns");
+    ns5 = axiom_namespace_create (env, "http://soapinterop.org/encodedTypes","types");
+
+    envelope_node = AXIOM_NODE_GET_PARENT(body_node, env);
+    envelope_element = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(envelope_node, env);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns1);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns2);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns3);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns4);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns5);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(envelope_element, env, envelope_node, ns6);
+    ns0 = AXIOM_ELEMENT_GET_NAMESPACE(envelope_element, env, envelope_node);
+    attri1 = axiom_attribute_create (env, "encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", ns0);
     
-    body_om_ele = AXIS2_OM_NODE_GET_DATA_ELEMENT( body_node, env );
-    AXIS2_OM_ELEMENT_ADD_ATTRIBUTE(body_om_ele, env, attri1, body_node);
+    body_om_ele = AXIOM_NODE_GET_DATA_ELEMENT( body_node, env );
+    AXIOM_ELEMENT_ADD_ATTRIBUTE(body_om_ele, env, attri1, body_node);
     
-    echo_om_ele = axis2_om_element_create(env, body_node, echo_operation_buff, ns4, &echo_om_node);
-    AXIS2_OM_ELEMENT_DECLARE_NAMESPACE(echo_om_ele, env, echo_om_node, ns4);
+    echo_om_ele = axiom_element_create(env, body_node, echo_operation_buff, ns4, &echo_om_node);
+    AXIOM_ELEMENT_DECLARE_NAMESPACE(echo_om_ele, env, echo_om_node, ns4);
     
-    text_om_ele = axis2_om_element_create(env, echo_om_node, input_type_buff, NULL, &text_om_node);
-    AXIS2_OM_ELEMENT_SET_TEXT(text_om_ele, env, word_to_echo, text_om_node);
+    text_om_ele = axiom_element_create(env, echo_om_node, input_type_buff, NULL, &text_om_node);
+    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, word_to_echo, text_om_node);
     
     xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, 
                                           AXIS2_XML_PARSER_TYPE_BUFFER);
-    om_output = axis2_om_output_create( env, xml_writer);
+    om_output = axiom_output_create( env, xml_writer);
     
-    AXIS2_OM_NODE_SERIALIZE(echo_om_node, env, om_output);
+    AXIOM_NODE_SERIALIZE(echo_om_node, env, om_output);
     buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);         
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n",  buffer); 
 
     return echo_om_node;
 }
 
-void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node)
+void print_invalid_om(const axis2_env_t *env, axiom_node_t *ret_node)
 {
 
     axis2_xml_writer_t *writer = NULL;
-    axis2_om_output_t *om_output = NULL;
+    axiom_output_t *om_output = NULL;
     axis2_char_t *buffer = NULL;
     writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, 
                                        AXIS2_XML_PARSER_TYPE_BUFFER);
-    om_output = axis2_om_output_create (env, writer);
+    om_output = axiom_output_create (env, writer);
 
-    AXIS2_OM_NODE_SERIALIZE (ret_node, env, om_output);
+    AXIOM_NODE_SERIALIZE (ret_node, env, om_output);
     buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(writer, env);
     printf ("\nReceived OM as result : %s\n", buffer);
 }

Modified: webservices/axis2/trunk/c/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_param_container.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_param_container.h Mon Jun 12 01:26:30 2006
@@ -31,7 +31,7 @@
 #include <axis2_array_list.h>
 #include <axis2_hash.h>
 
-/*#include <axis2_om_element.h>*/
+/*#include <axiom_element.h>*/
 #include <axis2_qname.h>
 #include <axis2_param.h>
 

Modified: webservices/axis2/trunk/c/woden/include/woden/util/axis2_qname_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/util/axis2_qname_util.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/util/axis2_qname_util.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/util/axis2_qname_util.h Mon Jun 12 01:26:30 2006
@@ -18,7 +18,7 @@
 #define AXIS2_QNAME_UTIL_H
 
 #include <axis2_qname.h>
-#include <axis2_om.h>
+#include <axiom.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -29,12 +29,12 @@
 axis2_qname_util_matches(
         const axis2_env_t *env,
         axis2_qname_t *qname,
-        axis2_om_node_t *node);
+        axiom_node_t *node);
         
 AXIS2_EXTERN axis2_qname_t * AXIS2_CALL
 axis2_qname_util_new_qname(
         const axis2_env_t *env,
-        axis2_om_node_t *node);
+        axiom_node_t *node);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_deserializer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_deserializer.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_deserializer.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/wsdl20/extensions/axis2_woden_ext_deserializer.h Mon Jun 12 01:26:30 2006
@@ -32,7 +32,7 @@
 #include <axis2_utils.h>
 #include <axis2_qname.h>
 #include <axis2_hash.h>
-#include <axis2_om_node.h>
+#include <axiom_node.h>
 #include <woden/axis2_woden.h>
 #include <woden/wsdl20/extensions/axis2_woden_ext_registry.h>
 
@@ -72,7 +72,7 @@
             axis2_char_t *parent_type,
             void *parent,
             axis2_qname_t *ext_type,
-            axis2_om_node_t *ext_el_node,
+            axiom_node_t *ext_el_node,
             void *desc,
             axis2_woden_ext_registry_t *ext_reg);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_bool_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_bool_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_bool_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_bool_attr.h Mon Jun 12 01:26:30 2006
@@ -36,8 +36,8 @@
 
 typedef struct axis2_woden_bool_attr axis2_woden_bool_attr_t;
 typedef struct axis2_woden_bool_attr_ops axis2_woden_bool_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -96,8 +96,8 @@
     convert) (
             void *bool_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
   
@@ -116,8 +116,8 @@
 AXIS2_EXTERN axis2_woden_bool_attr_t * AXIS2_CALL
 axis2_woden_bool_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_attr.h Mon Jun 12 01:26:30 2006
@@ -33,8 +33,8 @@
 
 typedef struct axis2_woden_qname_attr axis2_woden_qname_attr_t;
 typedef struct axis2_woden_qname_attr_ops axis2_woden_qname_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -92,8 +92,8 @@
     convert) (
             void *qname_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
   
@@ -112,8 +112,8 @@
 AXIS2_EXTERN axis2_woden_qname_attr_t * AXIS2_CALL
 axis2_woden_qname_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_attr.h Mon Jun 12 01:26:30 2006
@@ -35,8 +35,8 @@
 
 typedef struct axis2_woden_qname_list_attr axis2_woden_qname_list_attr_t;
 typedef struct axis2_woden_qname_list_attr_ops axis2_woden_qname_list_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -97,8 +97,8 @@
     convert) (
             void *qname_list_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
   
@@ -117,8 +117,8 @@
 AXIS2_EXTERN axis2_woden_qname_list_attr_t * AXIS2_CALL
 axis2_woden_qname_list_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_or_token_any_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_or_token_any_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_or_token_any_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_list_or_token_any_attr.h Mon Jun 12 01:26:30 2006
@@ -38,8 +38,8 @@
         axis2_woden_qname_list_or_token_any_attr_t;
 typedef struct axis2_woden_qname_list_or_token_any_attr_ops 
         axis2_woden_qname_list_or_token_any_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -114,8 +114,8 @@
     convert) (
             void *list_token_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
 };
@@ -133,8 +133,8 @@
 AXIS2_EXTERN axis2_woden_qname_list_or_token_any_attr_t * AXIS2_CALL
 axis2_woden_qname_list_or_token_any_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_qname_or_token_any_attr.h Mon Jun 12 01:26:30 2006
@@ -38,8 +38,8 @@
         axis2_woden_qname_or_token_any_attr_t;
 typedef struct axis2_woden_qname_or_token_any_attr_ops 
         axis2_woden_qname_or_token_any_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -114,8 +114,8 @@
     convert) (
             void *token_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
 };
@@ -133,8 +133,8 @@
 AXIS2_EXTERN axis2_woden_qname_or_token_any_attr_t * AXIS2_CALL
 axis2_woden_qname_or_token_any_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_string_attr.h Mon Jun 12 01:26:30 2006
@@ -33,8 +33,8 @@
 
 typedef struct axis2_woden_string_attr axis2_woden_string_attr_t;
 typedef struct axis2_woden_string_attr_ops axis2_woden_string_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -92,8 +92,8 @@
     convert) (
             void *string_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
   
@@ -112,8 +112,8 @@
 AXIS2_EXTERN axis2_woden_string_attr_t * AXIS2_CALL
 axis2_woden_string_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_uri_attr.h Mon Jun 12 01:26:30 2006
@@ -34,8 +34,8 @@
 
 typedef struct axis2_woden_uri_attr axis2_woden_uri_attr_t;
 typedef struct axis2_woden_uri_attr_ops axis2_woden_uri_attr_ops_t;
-struct axis2_om_element;
-struct axis2_om_node;
+struct axiom_element;
+struct axiom_node;
 
 #ifdef __cplusplus
 extern "C"
@@ -94,8 +94,8 @@
     convert) (
             void *uri_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_char_t *attr_value);
 
   
@@ -114,8 +114,8 @@
 AXIS2_EXTERN axis2_woden_uri_attr_t * AXIS2_CALL
 axis2_woden_uri_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type,
         axis2_char_t *attr_value);
 

Modified: webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden/xml/axis2_woden_xml_attr.h Mon Jun 12 01:26:30 2006
@@ -41,8 +41,8 @@
 
 typedef struct axis2_woden_xml_attr axis2_woden_xml_attr_t;
 typedef struct axis2_woden_xml_attr_ops axis2_woden_xml_attr_ops_t;
-struct axis2_om_node;
-struct axis2_om_element;
+struct axiom_node;
+struct axiom_element;
 
 /** @defgroup axis2_woden_xml_attr Xml Attribute
   * @ingroup axis2_wsdl
@@ -69,8 +69,8 @@
     init) (
             void *xml_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *owner_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *owner_node,
             axis2_qname_t *attr_type, 
             axis2_char_t *attr_value);
 
@@ -102,8 +102,8 @@
     convert) (
             void *xml_attr,
             const axis2_env_t *env,
-            struct axis2_om_element *owner_el,
-            struct axis2_om_node *ownder_node,
+            struct axiom_element *owner_el,
+            struct axiom_node *ownder_node,
             axis2_char_t *attr_value);
 
     /*
@@ -130,8 +130,8 @@
 AXIS2_EXTERN axis2_woden_xml_attr_t * AXIS2_CALL
 axis2_woden_xml_attr_create(
         const axis2_env_t *env,
-        struct axis2_om_element *owner_el,
-        struct axis2_om_node *owner_node,
+        struct axiom_element *owner_el,
+        struct axiom_node *owner_node,
         axis2_qname_t *attr_type, 
         axis2_char_t *attr_value);
 



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