axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dushshan...@apache.org
Subject svn commit: r517584 - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ modules/core/deployment/ modules/core/transport/http/util/ rampart/src/secpolicy/builder/ rampart/test/c14n/ tools/codegen/...
Date Tue, 13 Mar 2007 08:15:59 GMT
Author: dushshantha
Date: Tue Mar 13 01:15:57 2007
New Revision: 517584

URL: http://svn.apache.org/viewvc?view=rev&rev=517584
Log:
Removed macros and corrected indentation. 

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h
    webservices/axis2/trunk/c/axiom/src/om/om_document.c
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/axiom/src/om/om_node.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
    webservices/axis2/trunk/c/axiom/src/util/om_util.c
    webservices/axis2/trunk/c/axiom/test/om/test_om.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
    webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
    webservices/axis2/trunk/c/rampart/test/c14n/test.c
    webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
    webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
    webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
    webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
    webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
    webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
    webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h Tue Mar 13 01:15:57 2007
@@ -18,11 +18,6 @@
 #ifndef AXIOM_STAX_BUILDER_H
 #define AXIOM_STAX_BUILDER_H
 
-/**
- * @file axiom_stax_builder.h
- * @brief om model stax builder
- */
-
 #include <axiom_node.h>
 #include <axiom_xml_reader.h>
 #include <axiom_document.h>
@@ -43,13 +38,13 @@
 
 
     /**
-      * creates an stax builder
+      * Creates an stax builder
       * @param environment Environment. MUST NOT be NULL, .
       * @return a pointer to the newly created builder struct. 
       */
     AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
     axiom_stax_builder_create(const axis2_env_t *env,
-            axiom_xml_reader_t *parser);
+        axiom_xml_reader_t *parser);
 
     /**
       * Builds the next node from stream. Moves pull parser forward and reacts 
@@ -57,11 +52,11 @@
       * @param environment Environment. MUST NOT be NULL.
       * @param builder pointer to stax builder struct to be used
       * @return a pointer to the next node, or NULL if there are no more nodes.
-      *           On erros sets the error and returns NULL.
+      *     On erros sets the error and returns NULL.
       */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     axiom_stax_builder_next(struct axiom_stax_builder *builder,
-            const axis2_env_t *env);
+        const axis2_env_t *env);
 
     /**
       * Discards the element that is being built currently.
@@ -72,62 +67,44 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_stax_builder_discard_current_element(struct axiom_stax_builder *builder,
             const axis2_env_t *env);
-    /**
+   
+   /**
      * Free op
      * @param builder pointer to builder struct
      * @param env environment, MUST NOT be NULL
      * @return status of the op AXIS2_SUCCESS on success,
-     *         AXIS2_FAILURE on error.
+     *     AXIS2_FAILURE on error.
      */
-
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axiom_stax_builder_free(struct axiom_stax_builder *builder,
-            const axis2_env_t *env);
+        const axis2_env_t *env);
 
-    /** get the document associated with the builder
+   /** Gets the document associated with the builder
      * @param builder axiom_stax_builder 
      * @param env environment 
      * @return pointer to document struct associated with builder
-     *         NULL if there is no document associated with the builder,
-     *         NULL if an error occured.
+     *     NULL if there is no document associated with the builder,
+     *     NULL if an error occured.
      */
-    AXIS2_EXTERN axiom_document_t* AXIS2_CALL
+    AXIS2_EXTERN axiom_document_t *AXIS2_CALL
     axiom_stax_builder_get_document(struct axiom_stax_builder *builder,
-            const axis2_env_t *env);
-    /**
+        const axis2_env_t *env);
+
+   /**
      * builder is finished building om structure
      */
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
     axiom_stax_builder_is_complete(struct axiom_stax_builder* builder,
-            const axis2_env_t *env);
-    /**
+        const axis2_env_t *env);
+
+   /**
      * moves the reader to next event and returns the token returned
-    * by the xml_reader , returns -1 on error 
+     * by the xml_reader , returns -1 on error 
      */
     AXIS2_EXTERN int AXIS2_CALL
     axiom_stax_builder_next_with_token(struct axiom_stax_builder *builder,
-            const axis2_env_t *env);
-
-    /** builds next node */
-#define AXIOM_STAX_BUILDER_NEXT(builder,env) \
-        axiom_stax_builder_next(builder, env)
-    /** discards current node */
-#define AXIOM_STAX_BUILDER_DISCARD_CURRENT_ELEMENT(builder,env) \
-        axiom_stax_builder_discard_current_element(builder, env)
-    /** free op of the builder */
-#define AXIOM_STAX_BUILDER_FREE(builder,env) \
-        axiom_stax_builder_free(builder,env)
-
-    /** get the document associated with the builder */
-#define AXIOM_STAX_BUILDER_GET_DOCUMENT(builder,env) \
-        axiom_stax_builder_get_document(builder,env)
-    /** builder is finished building */
-#define AXIOM_STAX_BUILDER_IS_COMPLETE(builder, env) \
-        axiom_stax_builder_is_complete(builder, env)
-    /** moves the builder to next event */
-#define AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(builder, env) \
-        axiom_stax_builder_next_with_token(builder, env)
+        const axis2_env_t *env);
 
     /** @} */
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Tue Mar 13 01:15:57 2007
@@ -96,7 +96,7 @@
 
     if (!(document->root_element))
     {
-        last_child = AXIOM_STAX_BUILDER_NEXT(document->builder, env);
+        last_child = axiom_stax_builder_next(document->builder, env);
         if (last_child)
         {
             document->last_child = last_child;
@@ -108,7 +108,7 @@
             (AXIOM_NODE_IS_COMPLETE(document->root_element, env) == AXIS2_TRUE))
         return NULL;            /* Nothing wrong but done with pulling */
 
-    last_child = AXIOM_STAX_BUILDER_NEXT(document->builder, env);
+    last_child = axiom_stax_builder_next(document->builder, env);
     if (last_child)
         document->last_child = last_child;
     return last_child;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Tue Mar 13 01:15:57 2007
@@ -1207,10 +1207,10 @@
     if (!builder)
         return AXIS2_FAILURE;
     while (!AXIOM_NODE_IS_COMPLETE(om_ele_node, env) &&
-            !AXIOM_STAX_BUILDER_IS_COMPLETE(builder, env))
+            !axiom_stax_builder_is_complete(builder, env))
     {
         void *value  = NULL;
-        value   = AXIOM_STAX_BUILDER_NEXT(builder, env);
+        value = axiom_stax_builder_next(builder, env);
         if (!value)
             return AXIS2_FAILURE;
     }

Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Tue Mar 13 01:15:57 2007
@@ -455,7 +455,7 @@
     while (!(om_node->first_child) && !(om_node->done)
             && om_node->builder)
     {
-        token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node->builder, env);
+        token = axiom_stax_builder_next_with_token(om_node->builder, env);
         if (token == -1)
             return NULL;
     }
@@ -477,7 +477,7 @@
     while (!(om_node->first_child) && !(om_node->done)
             && om_node->builder)
     {
-        token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node->builder, env);
+        token = axiom_stax_builder_next_with_token(om_node->builder, env);
         if (token == -1)
             return NULL;
     }
@@ -520,7 +520,7 @@
     while (!(om_node->next_sibling) && om_node->parent &&
             om_node->builder && !(AXIOM_NODE_IS_COMPLETE(om_node->parent, env)))
     {
-        token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node->builder, env);
+        token = axiom_stax_builder_next_with_token(om_node->builder, env);
         if (token == -1)
             return NULL;
     }

Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Tue Mar 13 01:15:57 2007
@@ -49,16 +49,16 @@
     axis2_hash_t *declared_namespaces;
 };
 
-AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
+AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
 axiom_stax_builder_create(const axis2_env_t *env,
-        axiom_xml_reader_t *parser)
+    axiom_xml_reader_t *parser)
 {
     axiom_stax_builder_t *om_builder = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, parser, NULL);
 
-    om_builder = (axiom_stax_builder_t *)AXIS2_MALLOC(
-                env->allocator, sizeof(axiom_stax_builder_t));
+    om_builder = (axiom_stax_builder_t *)AXIS2_MALLOC(env->allocator,
+        sizeof(axiom_stax_builder_t));
 
     if (!om_builder)
     {
@@ -91,8 +91,8 @@
 
 axis2_status_t
 axiom_stax_builder_process_attributes(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env,
-        axiom_node_t *element_node)
+    const axis2_env_t *env,
+    axiom_node_t *element_node)
 {
     int i = 0;
     int attribute_count;
@@ -108,17 +108,18 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, element_node, AXIS2_FAILURE);
 
-    attribute_count = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT(
-                om_builder->parser, env);
+    attribute_count = AXIOM_XML_READER_GET_ATTRIBUTE_COUNT(om_builder->parser,
+        env);
     for (i = 1; i <= attribute_count ; i++)
     {
         axiom_element_t *temp_ele =  NULL;
 
-        uri =  AXIOM_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(
-                    om_builder->parser, env, i);
+        uri =
+            AXIOM_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(om_builder->parser,
+                env, i);
 
-        prefix = AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(
-                    om_builder->parser, env, i);
+        prefix = AXIOM_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(om_builder->parser,
+            env, i);
         if (uri)
         {
             if (axis2_strcmp(uri, "") != 0)
@@ -128,7 +129,7 @@
                 if (om_ele)
                 {
                     ns = AXIOM_ELEMENT_FIND_NAMESPACE(om_ele ,
-                            env , element_node, uri, prefix);
+                        env , element_node, uri, prefix);
 
                     /* newly added to handle "xml:*" attributes" (AXIS2_STRCMP(prefix, "xml") == 0) && */
                     if (!ns)
@@ -140,40 +141,49 @@
         }
 
         attr_name = AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
-                    om_builder->parser, env, i);
+            om_builder->parser, env, i);
 
         attr_value = AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(
-                    om_builder->parser, env, i);
+            om_builder->parser, env, i);
         if (attr_name)
         {
             attribute = axiom_attribute_create(env, attr_name, attr_value, ns);
             if (!attribute)
+            {
                 return AXIS2_FAILURE;
+            }
 
             temp_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(element_node, env);
             if (temp_ele)
             {
-                status = AXIOM_ELEMENT_ADD_ATTRIBUTE(temp_ele, env, attribute, element_node);
+                status = AXIOM_ELEMENT_ADD_ATTRIBUTE(temp_ele,
+                    env, attribute, element_node);
             }
         }
         if (uri)
+        {
             AXIOM_XML_READER_XML_FREE(om_builder->parser, env, uri);
+        }
         if (prefix)
+        {
             AXIOM_XML_READER_XML_FREE(om_builder->parser, env, prefix);
+        }
         if (attr_name)
+        {
             AXIOM_XML_READER_XML_FREE(om_builder->parser, env, attr_name);
+        }
         if (attr_value)
+        {
             AXIOM_XML_READER_XML_FREE(om_builder->parser, env, attr_value);
-
+        }
         ns = NULL;
     }
     return status;
 }
 
-
 axiom_node_t *
 axiom_stax_builder_create_om_text(axiom_stax_builder_t * om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axis2_char_t *temp_value = NULL;
     axiom_node_t *node = NULL;
@@ -183,22 +193,23 @@
     if (!om_builder->lastnode)
     {
         AXIS2_ERROR_SET(env->error,
-                AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL, AXIS2_FAILURE);
+            AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL, AXIS2_FAILURE);
         return NULL;
     }
     temp_value = AXIOM_XML_READER_GET_VALUE(om_builder->parser, env);
 
     if (!temp_value)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_VALUE_NULL, AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_VALUE_NULL,
+            AXIS2_FAILURE);
         return NULL;
     }
 
     if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
     {
         axiom_text_create(env,
-                AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
-                temp_value, &node);
+            AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+            temp_value, &node);
 
     }
     else
@@ -216,7 +227,7 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_discard_current_element(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *element = NULL;
     axiom_node_t *prev_node = NULL;
@@ -229,8 +240,7 @@
     if (AXIOM_NODE_IS_COMPLETE(element, env) || !(om_builder->cache))
     {
         AXIS2_ERROR_SET(env->error,
-                AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD, AXIS2_FAILURE);
-
+            AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
 
@@ -238,7 +248,7 @@
     do
     {
         while (AXIOM_XML_READER_NEXT(om_builder->parser, env)
-                != AXIOM_XML_READER_END_ELEMENT);
+            != AXIOM_XML_READER_END_ELEMENT);
     }
     while (!(AXIOM_NODE_IS_COMPLETE(element, env)));
 
@@ -264,14 +274,13 @@
 
 axis2_status_t
 axiom_stax_builder_process_namespaces(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env,
-        axiom_node_t *node,
-        int is_soap_element)
+    const axis2_env_t *env,
+    axiom_node_t *node,
+    int is_soap_element)
 {
     axis2_status_t status = AXIS2_SUCCESS;
     int namespace_count = 0;
     axiom_namespace_t *om_ns = NULL;
-    /*axiom_namespace_t *temp_ns = NULL;*/
     /* temp values */
     axis2_char_t *temp_prefix = NULL;
     axis2_char_t *temp_ns_prefix = NULL;
@@ -285,10 +294,10 @@
     for (i = 1; i <= namespace_count; i++)
     {
         temp_ns_prefix = AXIOM_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(
-                    om_builder->parser, env, i);
+            om_builder->parser, env, i);
 
         temp_ns_uri = AXIOM_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(
-                    om_builder->parser, env , i);
+            om_builder->parser, env , i);
 
         if (!temp_ns_prefix || AXIS2_STRCMP(temp_ns_prefix, "xmlns") == 0)
         {
@@ -299,12 +308,12 @@
 
             om_ns = axiom_namespace_create(env, temp_ns_uri, "");
             if (!om_ns || !om_ele)
+            {
                 return AXIS2_FAILURE;
+            }
 
             status = AXIOM_ELEMENT_DECLARE_NAMESPACE(om_ele, env, node, om_ns);
 
-            /*temp_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(om_ele, env, temp_ns_uri, NULL);*/
-            
             if (!status)
             {
                 AXIOM_NAMESPACE_FREE(om_ns, env);
@@ -319,17 +328,15 @@
 
             om_ns = axiom_namespace_create(env, temp_ns_uri, temp_ns_prefix);
             if (!om_ns || !om_ele)
+            {
                 return AXIS2_FAILURE;
+            }
 
-            /*status = AXIOM_ELEMENT_DECLARE_NAMESPACE(om_ele, env, node, om_ns);*/
-
-            status = axiom_element_declare_namespace_assume_param_ownership(om_ele, env, om_ns);
-            /*
-             temp_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(om_ele, 
-                             env, temp_ns_uri,temp_ns_prefix);
-            */
+            status = axiom_element_declare_namespace_assume_param_ownership(om_ele,
+                env, om_ns);
             prefix = AXIOM_NAMESPACE_GET_PREFIX(om_ns, env);
-            axis2_hash_set(om_builder->declared_namespaces, prefix, AXIS2_HASH_KEY_STRING, om_ns);
+            axis2_hash_set(om_builder->declared_namespaces,
+                prefix, AXIS2_HASH_KEY_STRING, om_ns);
         }
         AXIOM_XML_READER_XML_FREE(om_builder->parser, env, temp_ns_prefix);
         AXIOM_XML_READER_XML_FREE(om_builder->parser, env, temp_ns_uri);
@@ -343,36 +350,35 @@
     temp_prefix = AXIOM_XML_READER_GET_PREFIX(om_builder->parser, env);
     if (temp_prefix)
     {
-        /*om_ns = AXIOM_ELEMENT_FIND_NAMESPACE(
-                    (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env),
-                    env, node, NULL, temp_prefix);*/
-        om_ns = axis2_hash_get(om_builder->declared_namespaces, temp_prefix, AXIS2_HASH_KEY_STRING);
+        om_ns = axis2_hash_get(om_builder->declared_namespaces,
+            temp_prefix, AXIS2_HASH_KEY_STRING);
 
         if (om_ns)
         {
             axiom_element_t *om_ele = NULL;
             om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
-            /*if (om_ele)
-                AXIOM_ELEMENT_SET_NAMESPACE(om_ele, env, om_ns, node);*/
             if (om_ele)
+            {
                 axiom_element_set_namespace_assume_param_ownership(om_ele, env, om_ns);
+            }
         }
         else
         {
             AXIS2_ERROR_SET(env->error,
-                    AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE, AXIS2_FAILURE);
+                AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE, AXIS2_FAILURE);
             return AXIS2_FAILURE;
         }
     }
     if (temp_prefix)
+    {
         AXIOM_XML_READER_XML_FREE(om_builder->parser, env, temp_prefix);
-
+    }
     return status;
 }
 
 axiom_node_t *
 axiom_stax_builder_create_om_element(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *element_node = NULL;
     axiom_element_t *om_ele = NULL;
@@ -385,7 +391,8 @@
 
     if (!temp_localname)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL,
+            AXIS2_FAILURE);
         return NULL;
     }
 
@@ -395,7 +402,9 @@
     {
         om_ele = axiom_element_create(env , NULL, temp_localname, NULL, &element_node);
         if (!om_ele)
+        {
             return NULL;
+        }
 
         om_builder->root_node = element_node;
 
@@ -404,39 +413,49 @@
         if (om_builder->document)
         {
             axiom_node_set_document(element_node, env, om_builder->document);
-            AXIOM_DOCUMENT_SET_ROOT_ELEMENT(om_builder->document, env, element_node);
+            AXIOM_DOCUMENT_SET_ROOT_ELEMENT(om_builder->document,
+                env, element_node);
         }
     }
     else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
     {
         om_ele = axiom_element_create(env,
-                AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
-                temp_localname, NULL, &element_node);
+            AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+            temp_localname, NULL, &element_node);
         if (!om_ele)
+        {
             return NULL;
+        }
 
         if (element_node)
         {
-            axiom_node_set_next_sibling(om_builder->lastnode, env, element_node);
-            axiom_node_set_previous_sibling(element_node , env, om_builder->lastnode);
-            axiom_node_set_document(element_node, env, om_builder->document);
-            axiom_node_set_builder(element_node, env, om_builder);
+            axiom_node_set_next_sibling(om_builder->lastnode,
+                env, element_node);
+            axiom_node_set_previous_sibling(element_node,
+                env, om_builder->lastnode);
+            axiom_node_set_document(element_node,
+                env, om_builder->document);
+            axiom_node_set_builder(element_node,
+                env, om_builder);
         }
     }
     else
     {
         om_ele = axiom_element_create(env, om_builder->lastnode,
-                temp_localname, NULL, &element_node);
+            temp_localname, NULL, &element_node);
         if (element_node)
         {
-            axiom_node_set_first_child(om_builder->lastnode , env, element_node);
+            axiom_node_set_first_child(om_builder->lastnode,
+                env, element_node);
             axiom_node_set_parent(element_node , env, om_builder->lastnode);
             axiom_node_set_document(element_node, env, om_builder->document);
             axiom_node_set_builder(element_node, env, om_builder);
         }
     }
     if (temp_localname)
+    {
         AXIOM_XML_READER_XML_FREE(om_builder->parser , env, temp_localname);
+    }
 
     /** order of processing namespaces first is important */
     axiom_stax_builder_process_namespaces(om_builder, env, element_node, 0);
@@ -450,7 +469,7 @@
 
 axiom_node_t *
 axiom_stax_builder_create_om_comment(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *comment_node = NULL;
     axis2_char_t *comment_value = NULL;
@@ -459,7 +478,8 @@
     comment_value  = AXIOM_XML_READER_GET_VALUE(om_builder->parser, env);
     if (!comment_value)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL,
+            AXIS2_FAILURE);
         return NULL;
     }
 
@@ -472,39 +492,37 @@
     else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
     {
         axiom_comment_create(env,
-                AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
-                comment_value , &comment_node);
+            AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+            comment_value , &comment_node);
 
         axiom_node_set_next_sibling(om_builder->lastnode, env, comment_node);
-        axiom_node_set_previous_sibling(comment_node , env, om_builder->lastnode);
-		axiom_node_set_builder(comment_node, env, om_builder);
-		axiom_node_set_document(comment_node, env, om_builder->document);
+        axiom_node_set_previous_sibling(comment_node , env,
+            om_builder->lastnode);
+        axiom_node_set_builder(comment_node, env, om_builder);
+        axiom_node_set_document(comment_node, env, om_builder->document);
     }
     else
     {
         axiom_comment_create(env, om_builder->lastnode,
-                comment_value , &comment_node);
+            comment_value , &comment_node);
 
         axiom_node_set_first_child(om_builder->lastnode , env, comment_node);
         axiom_node_set_parent(comment_node , env, om_builder->lastnode);
-		axiom_node_set_builder(comment_node, env, om_builder);
-		axiom_node_set_document(comment_node, env, om_builder->document);
+        axiom_node_set_builder(comment_node, env, om_builder);
+        axiom_node_set_document(comment_node, env, om_builder->document);
     }
 
     om_builder->element_level++;
-
     AXIOM_XML_READER_XML_FREE(om_builder->parser , env, comment_value);
 
     om_builder->lastnode = comment_node;
 
     return comment_node;
-
 }
 
-
 axiom_node_t *
 axiom_stax_builder_create_om_doctype(axiom_stax_builder_t * om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *doctype_node = NULL;
     axis2_char_t *doc_value = NULL;
@@ -513,14 +531,16 @@
 
     doc_value = AXIOM_XML_READER_GET_DTD(om_builder->parser, env);
     if (!doc_value)
+    {
         return NULL;
+    }
     if (!(om_builder->lastnode))
     {
         axiom_doctype_create(env, NULL, doc_value, &doctype_node);
         if (om_builder->document)
         {
             AXIOM_DOCUMENT_SET_ROOT_ELEMENT(om_builder->document,
-                    env, doctype_node);
+                env, doctype_node);
         }
     }
     om_builder->lastnode = doctype_node;
@@ -528,24 +548,21 @@
     return doctype_node;
 }
 
-
 axiom_node_t *
 axiom_stax_builder_create_om_processing_instruction(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *pi_node = NULL;
     axis2_char_t *target = NULL;
     axis2_char_t *value  = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-
-
-
     target = AXIOM_XML_READER_GET_PI_TARGET(om_builder->parser, env);
     value  = AXIOM_XML_READER_GET_PI_DATA(om_builder->parser, env);
     if (!target)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL,
+            AXIS2_FAILURE);
         return NULL;
     }
     if (!(om_builder->lastnode))
@@ -556,11 +573,11 @@
         return NULL;
     }
     else if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env) ||
-            (AXIOM_NODE_GET_NODE_TYPE(om_builder->lastnode, env) == AXIOM_TEXT))
+        (AXIOM_NODE_GET_NODE_TYPE(om_builder->lastnode, env) == AXIOM_TEXT))
     {
         axiom_processing_instruction_create(env,
-                AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
-                target, value, &pi_node);
+            AXIOM_NODE_GET_PARENT(om_builder->lastnode, env),
+            target, value, &pi_node);
 
         axiom_node_set_next_sibling(om_builder->lastnode, env, pi_node);
         axiom_node_set_previous_sibling(pi_node , env, om_builder->lastnode);
@@ -568,7 +585,7 @@
     else
     {
         axiom_processing_instruction_create(env, om_builder->lastnode,
-                target, value, &pi_node);
+            target, value, &pi_node);
         axiom_node_set_first_child(om_builder->lastnode , env, pi_node);
         axiom_node_set_parent(pi_node , env, om_builder->lastnode);
     }
@@ -576,9 +593,13 @@
     om_builder->element_level++;
 
     if (target)
+    {
         AXIOM_XML_READER_XML_FREE(om_builder->parser , env, target);
+    }
     if (value)
+    {
         AXIOM_XML_READER_XML_FREE(om_builder->parser , env, value);
+    }
 
     om_builder->lastnode = pi_node;
     return pi_node;
@@ -586,12 +607,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_end_element(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     axiom_node_t *parent = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     om_builder->element_level--;
 
     if (om_builder->lastnode)
@@ -623,27 +642,30 @@
 
 AXIS2_EXTERN axiom_node_t * AXIS2_CALL
 axiom_stax_builder_next(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     int token = 0;
     axiom_node_t *node = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
     if (!om_builder->parser)
+    {
         return NULL;
+    }
     do
     {
         if (om_builder->done)
         {
             AXIS2_ERROR_SET(env->error,
-                    AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL, AXIS2_FAILURE);
+                AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL, AXIS2_FAILURE);
             return NULL;
         }
 
         token = AXIOM_XML_READER_NEXT(om_builder->parser, env);
-
         if (token == -1)
+        {
             return NULL;
+        }
 
         om_builder->current_event = token;
 
@@ -659,13 +681,12 @@
                 break;
 
             case AXIOM_XML_READER_START_ELEMENT:
-                node = axiom_stax_builder_create_om_element(
-                            om_builder, env);
+                node = axiom_stax_builder_create_om_element(om_builder, env);
                 break;
 
             case AXIOM_XML_READER_EMPTY_ELEMENT:
-                node = axiom_stax_builder_create_om_element(
-                            om_builder, env);
+                node = axiom_stax_builder_create_om_element(om_builder, env);
+                break;
 
             case AXIOM_XML_READER_END_ELEMENT:
                 axiom_stax_builder_end_element(om_builder, env);
@@ -686,24 +707,21 @@
             case AXIOM_XML_READER_COMMENT:
 
                 node = axiom_stax_builder_create_om_comment(om_builder, env);
-                axiom_stax_builder_end_element(om_builder, env);
-
+                    axiom_stax_builder_end_element(om_builder, env);
                 break;
 
             case AXIOM_XML_READER_PROCESSING_INSTRUCTION:
 
-                node = axiom_stax_builder_create_om_processing_instruction(
-                            om_builder , env);
+                node = 
+                    axiom_stax_builder_create_om_processing_instruction(om_builder,
+                        env);
                 axiom_stax_builder_end_element(om_builder, env);
-
                 break;
 
             case AXIOM_XML_READER_CDATA:
                 break;
 
             case AXIOM_XML_READER_DOCUMENT_TYPE:
-                /* node = axiom_stax_builder_create_om_doctype(om_builder, env);
-                */
                 break;
 
             default:
@@ -717,11 +735,13 @@
 
 AXIS2_EXTERN axis2_status_t
 AXIS2_CALL axiom_stax_builder_free(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (!om_builder)
+    {
         return AXIS2_FAILURE;
+    }
 
     if (om_builder->parser)
     {
@@ -734,7 +754,7 @@
         axis2_hash_free(om_builder->declared_namespaces, env);
         om_builder->declared_namespaces = NULL;
     }
-    
+
     if (om_builder->document)
     {
         AXIOM_DOCUMENT_FREE(om_builder->document, env);
@@ -752,12 +772,10 @@
     return AXIS2_SUCCESS;
 }
 
-
 AXIS2_EXTERN axiom_document_t* AXIS2_CALL
 axiom_stax_builder_get_document(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     return om_builder->document;
 }
 
@@ -767,40 +785,41 @@
 
 AXIS2_EXTERN int AXIS2_CALL
 axiom_stax_builder_get_current_event(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, -1);
     AXIS2_PARAM_CHECK(env->error, om_builder, AXIS2_FAILURE);
     return om_builder->current_event;
 }
+
 /**
  This is an internal function
 */
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 axiom_stax_builder_get_lastnode(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, om_builder, NULL);
     return om_builder->lastnode;
 }
+
 /**
 This is an internal function
 */
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 axiom_stax_builder_is_complete(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     return om_builder->done;
 }
+
 /**
 This is an internal function to be used by soap om_builder only
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_set_lastnode(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env,
-        axiom_node_t *om_node)
+    const axis2_env_t *env,
+    axiom_node_t *om_node)
 {
     AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, om_builder, AXIS2_FAILURE);
@@ -808,40 +827,42 @@
     om_builder->lastnode = om_node;
     return AXIS2_SUCCESS;
 }
+
 /**
 internal function for soap om_builder only
 */
 AXIS2_EXTERN int AXIS2_CALL
 axiom_stax_builder_get_element_level(axiom_stax_builder_t* om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
     AXIS2_PARAM_CHECK(env->error, om_builder, -1);
     return om_builder->element_level;
 }
+
 /**
 internal function for soap om_builder only
 */
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axiom_stax_builder_set_element_level(axiom_stax_builder_t* om_builder,
-        const axis2_env_t *env,
-        int element_level)
+    const axis2_env_t *env,
+    int element_level)
 {
     AXIS2_PARAM_CHECK(env->error, om_builder, AXIS2_FAILURE);
-
     om_builder->element_level = element_level;
     return AXIS2_SUCCESS;
 }
 
 int AXIS2_CALL
 axiom_stax_builder_next_with_token(axiom_stax_builder_t *om_builder,
-        const axis2_env_t *env)
+    const axis2_env_t *env)
 {
-
     int token = 0;
     void *val = NULL;
 
-    if (!om_builder) 
+    if (!om_builder)
+    {
         return -1;
+    }
 
     if (om_builder->done)
     {
@@ -849,7 +870,10 @@
         return -1;
     }
 
-    if (!om_builder->parser) return -1;
+    if (!om_builder->parser)
+    {
+        return -1;
+    }
 
     token = AXIOM_XML_READER_NEXT(om_builder->parser, env);
 
@@ -870,23 +894,24 @@
             break;
 
         case AXIOM_XML_READER_START_ELEMENT:
-            val = axiom_stax_builder_create_om_element(
-                        om_builder, env);
+            val = axiom_stax_builder_create_om_element(om_builder, env);
             if (!val)
+            {
                 return -1;
-
+            }
             break;
 
         case AXIOM_XML_READER_EMPTY_ELEMENT:
             val = axiom_stax_builder_create_om_element(
-                        om_builder, env);
+                om_builder, env);
             if (!val)
+            {
                 return -1;
+            }
         case AXIOM_XML_READER_END_ELEMENT:
             axiom_stax_builder_end_element(om_builder, env);
             break;
 
-
         case AXIOM_XML_READER_SPACE:
             /* Do nothing */
             break;
@@ -894,7 +919,9 @@
         case AXIOM_XML_READER_CHARACTER:
             val = axiom_stax_builder_create_om_text(om_builder, env);
             if (!val)
+            {
                 return -1;
+            }
             break;
 
         case AXIOM_XML_READER_ENTITY_REFERENCE:
@@ -903,15 +930,19 @@
         case AXIOM_XML_READER_COMMENT:
             val = axiom_stax_builder_create_om_comment(om_builder, env);
             if (!val)
+            {
                 return -1;
+            }
             axiom_stax_builder_end_element(om_builder, env);
             break;
 
         case AXIOM_XML_READER_PROCESSING_INSTRUCTION:
-            val = axiom_stax_builder_create_om_processing_instruction(
-                        om_builder , env);
+            val = axiom_stax_builder_create_om_processing_instruction(om_builder,
+                env);
             if (!val)
+            {
                 return -1;
+            }
             axiom_stax_builder_end_element(om_builder, env);
             break;
 

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Tue Mar 13 01:15:57 2007
@@ -303,7 +303,7 @@
 {
     int token = 0;
 
-    token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(builder_helper->om_builder, env);
+    token = axiom_stax_builder_next_with_token(builder_helper->om_builder, env);
 
     if (token == -1)
         return AXIS2_FAILURE;
@@ -317,7 +317,7 @@
             return AXIS2_FAILURE;
 
         }
-        token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(builder_helper->om_builder, env);
+        token = axiom_stax_builder_next_with_token(builder_helper->om_builder, env);
         if (token == -1)
             return AXIS2_FAILURE;
     }

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Tue Mar 13 01:15:57 2007
@@ -172,7 +172,7 @@
     
     if ( soap_builder->om_builder)
     {
-        AXIOM_STAX_BUILDER_FREE(soap_builder->om_builder, env);
+        axiom_stax_builder_free(soap_builder->om_builder, env);
         soap_builder->om_builder = NULL;
     }
     
@@ -224,7 +224,7 @@
         return NULL;
 
     while (!(soap_builder->soap_envelope) &&
-            !AXIOM_STAX_BUILDER_IS_COMPLETE(soap_builder->om_builder, env))
+            !axiom_stax_builder_is_complete(soap_builder->om_builder, env))
     {
         status = axiom_soap_builder_next(soap_builder, env);
         if (status == AXIS2_FAILURE)
@@ -244,7 +244,7 @@
         return NULL;
     if (soap_builder->om_builder)
     {
-        return AXIOM_STAX_BUILDER_GET_DOCUMENT(soap_builder->om_builder, env);
+        return axiom_stax_builder_get_document(soap_builder->om_builder, env);
     }
     else
         return NULL;
@@ -278,7 +278,7 @@
     {
         soap_builder->last_node_status = AXIS2_BUILDER_LAST_NODE_NOT_NULL;
     }
-    current_event = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(soap_builder->om_builder, env);
+    current_event = axiom_stax_builder_next_with_token(soap_builder->om_builder, env);
     if (current_event == -1)
     {
         soap_builder->done = AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Tue Mar 13 01:15:57 2007
@@ -1078,7 +1078,7 @@
     }
     if (om_builder)
     {
-        doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+        doc = axiom_stax_builder_get_document(om_builder, env);
     }
     else
     {

Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Tue Mar 13 01:15:57 2007
@@ -99,7 +99,7 @@
         document is the container of om model created using builder 
     */
 
-    document = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, environment);
+    document = axiom_stax_builder_get_document(builder, environment);
     /**
         get root element , building starts hear 
      */
@@ -110,7 +110,7 @@
     if (!node1)
     {
         printf(" root element null ");
-        AXIOM_STAX_BUILDER_FREE(builder, environment);
+        axiom_stax_builder_free(builder, environment);
         return -1;
     }
     if (node1)
@@ -183,7 +183,7 @@
 
     AXIOM_OUTPUT_FREE(om_output, environment);
 
-    AXIOM_STAX_BUILDER_FREE(builder, environment);
+    axiom_stax_builder_free(builder, environment);
 /*     if (buffer) */
 /*         AXIS2_FREE(environment->allocator, buffer); */
     printf("\nend test_om_build\n");

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Tue Mar 13 01:15:57 2007
@@ -262,7 +262,7 @@
 
     if (desc_builder_impl->builder)
     {
-        AXIOM_STAX_BUILDER_FREE(desc_builder_impl->builder, env);
+        axiom_stax_builder_free(desc_builder_impl->builder, env);
         desc_builder_impl->builder = NULL;
     }
 
@@ -323,7 +323,7 @@
         get the om document form builder 
         document is the container of om model created using builder
     */
-    document = AXIOM_STAX_BUILDER_GET_DOCUMENT(desc_builder_impl->builder, env);
+    document = axiom_stax_builder_get_document(desc_builder_impl->builder, env);
     /**
      * In description building we don't want defferred building. So build
      * the whole tree at once

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Tue Mar 13 01:15:57 2007
@@ -340,7 +340,7 @@
         {
             /* We should not be freeing om_builder here as it is done by
                axiom_soap_builder_create in case of error - Samisa*/
-            /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
+            /*axiom_stax_builder_free(om_builder, env);*/
             om_builder = NULL;
             xml_reader = NULL;
             return AXIS2_FAILURE;
@@ -350,7 +350,7 @@
                 env);
         if (NULL == soap_envelope)
         {
-            AXIOM_STAX_BUILDER_FREE(om_builder, env);
+            axiom_stax_builder_free(om_builder, env);
             om_builder = NULL;
             xml_reader = NULL;
             AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
@@ -369,7 +369,7 @@
             {
                 /* We should not be freeing om_builder here as it is done by
                    axiom_soap_builder_create in case of error - Samisa*/
-                /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
+                /*axiom_stax_builder_free(om_builder, env);*/
                 om_builder = NULL;
                 xml_reader = NULL;
                 return AXIS2_FAILURE;
@@ -412,7 +412,7 @@
             soap_envelope = axiom_soap_envelope_create_default_soap_envelope
                     (env, AXIOM_SOAP11);
             def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-            om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+            om_doc = axiom_stax_builder_get_document(om_builder, env);
             root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
             AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
              axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
@@ -427,7 +427,7 @@
     }
 
     /* xml_char_set = AXIOM_DOCUMENT_GET_CHARSET_ENC(
-     *               AXIOM_STAX_BUILDER_GET_DOCUMENT(env om_builder),
+     *               axiom_stax_builder_get_document(env om_builder),
      *               env);
      *
      *if(0 != AXIS2_STRCMP(char_set, xml_char_set))
@@ -438,7 +438,7 @@
      *   envelope = NULL;
      *   AXIOM_XML_READER_FREE(xml_reader, env);
      *   xml_reader = NULL;
-     *   AXIOM_STAX_BUILDER_FREE(om_builder, env);
+     *   axiom_stax_builder_free(om_builder, env);
      *   om_builder = NULL;
      *   if( soap_builder)
      *   {
@@ -1181,7 +1181,7 @@
         {
             /* We should not be freeing om_builder here as it is done by
                axiom_soap_builder_create in case of error - Samisa*/
-            /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
+            /*axiom_stax_builder_free(om_builder, env);*/
             om_builder = NULL;
             xml_reader = NULL;
             return NULL;
@@ -1235,7 +1235,7 @@
         soap_envelope = axiom_soap_envelope_create_default_soap_envelope
                 (env, AXIOM_SOAP11);
         def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-        om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+        om_doc = axiom_stax_builder_get_document(om_builder, env);
         root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
         AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
 

Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c Tue Mar 13 01:15:57 2007
@@ -30,17 +30,17 @@
         AXIOM_XML_READER_FREE(reader, env);
         return NULL;
     }
-    document = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
+    document = axiom_stax_builder_get_document(builder, env);
     if(!document)
     {
-        AXIOM_STAX_BUILDER_FREE(builder, env);
+        axiom_stax_builder_free(builder, env);
         return NULL;
     }
 
     root = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(document, env);
     if(!root)
     {
-        AXIOM_STAX_BUILDER_FREE(builder, env);
+        axiom_stax_builder_free(builder, env);
         AXIS2_LOG_INFO(env->log,"[rp][policy_creator] Root element is NULL");
         return NULL;
     }

Modified: webservices/axis2/trunk/c/rampart/test/c14n/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/c14n/test.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/c14n/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/c14n/test.c Tue Mar 13 01:15:57 2007
@@ -82,7 +82,7 @@
     om_builder = axiom_stax_builder_create(env, xml_reader);
     if (!om_builder) { p_fail(); return 1; }
 
-    doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+    doc = axiom_stax_builder_get_document(om_builder, env);
     AXIOM_DOCUMENT_BUILD_ALL (doc, env); 
     if (!doc) { p_fail(); return 1; }
     axis2_char_t *txt = NULL;
@@ -129,7 +129,7 @@
 
     if (om_builder)
     {
-        AXIOM_STAX_BUILDER_FREE(om_builder, env);
+        axiom_stax_builder_free(om_builder, env);
         om_builder = NULL;
     }
 

Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Tue Mar 13 01:15:57 2007
@@ -263,7 +263,7 @@
                         AXIS2_HASH_KEY_STRING, (void*)1);
     }
 
-    AXIOM_STAX_BUILDER_FREE(om_builder, env);
+    axiom_stax_builder_free(om_builder, env);
     axiom_xml_reader_cleanup();
 
    return &(typemapper_impl->typemapper);

Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Tue Mar 13 01:15:57 2007
@@ -177,7 +177,7 @@
         }
     }
     om_builder = AXIOM_DOCUMENT_GET_BUILDER(om_doc, env);
-    AXIOM_STAX_BUILDER_FREE(om_builder, env);
+    axiom_stax_builder_free(om_builder, env);
     WODEN_DESC_FREE(desc, env);
     axis2_env_free(env);
     return 0;
@@ -194,7 +194,7 @@
 
     reader = axiom_xml_reader_create_for_file(env, filename, NULL);
     om_builder = axiom_stax_builder_create(env, reader);
-    doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+    doc = axiom_stax_builder_get_document(om_builder, env);
     AXIOM_DOCUMENT_BUILD_ALL(doc, env);
 
     return doc;

Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Tue Mar 13 01:15:57 2007
@@ -186,7 +186,7 @@
         }
     }
     om_builder = AXIOM_DOCUMENT_GET_BUILDER(om_doc, env);
-    AXIOM_STAX_BUILDER_FREE(om_builder, env);
+    axiom_stax_builder_free(om_builder, env);
     WODEN_WSDL10_DESC_FREE(desc, env);
     axis2_env_free(env);
     return 0;
@@ -203,7 +203,7 @@
 
     reader = axiom_xml_reader_create_for_file(env, filename, NULL);
     om_builder = axiom_stax_builder_create(env, reader);
-    doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+    doc = axiom_stax_builder_get_document(om_builder, env);
     AXIOM_DOCUMENT_BUILD_ALL(doc, env);
 
     return doc;

Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Tue Mar 13 01:15:57 2007
@@ -4005,7 +4005,7 @@
         schema_col = xml_schema_collection_create(env);
         xml_reader = axiom_xml_reader_create_for_file(env, location_str, NULL);
         builder = axiom_stax_builder_create(env, xml_reader);
-        doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
+        doc = axiom_stax_builder_get_document(builder, env);
         doc_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
         if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
         {

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Tue Mar 13 01:15:57 2007
@@ -3835,7 +3835,7 @@
         schema_col = xml_schema_collection_create(env);
         xml_reader = axiom_xml_reader_create_for_file(env, location_str, NULL);
         builder = axiom_stax_builder_create(env, xml_reader);
-        doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
+        doc = axiom_stax_builder_get_document(builder, env);
         doc_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
         if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
         {

Modified: webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/samples/test_schema.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Tue Mar 13 01:15:57 2007
@@ -38,7 +38,7 @@
 
     om_builder = axiom_stax_builder_create(env, xml_reader);
 
-    om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+    om_doc = axiom_stax_builder_get_document(om_builder, env);
 
     AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     schema_collection = xml_schema_collection_create(env);
@@ -59,7 +59,7 @@
     {
         XML_SCHEMA_COLLECTION_FREE(schema_collection, env);
     }
-    AXIOM_STAX_BUILDER_FREE(om_builder, env);
+    axiom_stax_builder_free(om_builder, env);
     axiom_xml_reader_cleanup();
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Tue Mar 13 01:15:57 2007
@@ -463,7 +463,7 @@
     om_doc = axiom_document_create(env, NULL, om_builder);
     if (!om_doc)
     {
-        AXIOM_STAX_BUILDER_FREE(om_builder, env);
+        axiom_stax_builder_free(om_builder, env);
         return NULL;
     }
     AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
@@ -471,7 +471,7 @@
     sch_builder = xml_schema_builder_create(env, collection);
     if (!sch_builder)
     {
-        AXIOM_STAX_BUILDER_FREE(om_builder, env);
+        axiom_stax_builder_free(om_builder, env);
         return NULL;
     }
 

Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?view=diff&rev=517584&r1=517583&r2=517584
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Tue Mar 13 01:15:57 2007
@@ -649,7 +649,7 @@
     axiom_document_t *doc   = NULL;
     reader = axiom_xml_reader_create_for_file(env, filename, NULL);
     om_builder = axiom_stax_builder_create(env, reader);
-    doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+    doc = axiom_stax_builder_get_document(om_builder, env);
     AXIOM_DOCUMENT_BUILD_ALL(doc, env);
     return doc;
 }



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


Mime
View raw message