axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r518463 - 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/samples/omxmlsec/xmlenc/ rampart/samples/omxmlsec/xmlsig...
Date Thu, 15 Mar 2007 03:59:21 GMT
Author: pini
Date: Wed Mar 14 20:59:20 2007
New Revision: 518463

URL: http://svn.apache.org/viewvc?view=rev&rev=518463
Log:
Dropped macros

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_document.h
    webservices/axis2/trunk/c/axiom/src/om/om_document.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    webservices/axis2/trunk/c/axiom/src/soap/soap_message.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/samples/omxmlsec/xmlenc/enc.c
    webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.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/rampart/test/omxmlsec/test.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
    webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
    webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
    webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.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/woden_resolver.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_builder.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_document.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_document.h?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_document.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_document.h Wed Mar 14 20:59:20 2007
@@ -127,32 +127,6 @@
             const axis2_env_t *env,
             axiom_output_t *om_output);
 
-    /** frees given document */
-#define AXIOM_DOCUMENT_FREE(document,env) \
-        axiom_document_free(document,env)
-
-    /** builds next node of document */
-#define AXIOM_DOCUMENT_BUILD_NEXT(document,env) \
-        axiom_document_build_next(document,env)
-
-    /** gets the root eleemnt of given document */
-#define AXIOM_DOCUMENT_GET_ROOT_ELEMENT(document,env) \
-        axiom_document_get_root_element(document,env)
-    /** sets the root node */
-#define AXIOM_DOCUMENT_SET_ROOT_ELEMENT(document,env,om_node) \
-        axiom_document_set_root_element(document,env,om_node)
-
-    /** build till the root node is complete */
-#define AXIOM_DOCUMENT_BUILD_ALL(document,env) \
-        axiom_document_build_all(document,env)
-
-    /** returns the builder */
-#define AXIOM_DOCUMENT_GET_BUILDER(document, env) \
-        axiom_document_get_builder(document, env)
-
-    /** serialize opertation */
-#define AXIOM_DOCUMENT_SERIALIZE(document, env, om_output) \
-        axiom_document_serialize(document, env, om_output)
 
     /** @} */
 

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Wed Mar 14 20:59:20 2007
@@ -188,7 +188,7 @@
         do
         {
             axiom_node_t *ret_val = NULL;
-            ret_val = AXIOM_DOCUMENT_BUILD_NEXT(document, env);
+            ret_val = axiom_document_build_next(document, env);
             if (!ret_val)
             {
                 if (AXIOM_NODE_IS_COMPLETE(document->root_element, env)

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Wed Mar 14 20:59:20 2007
@@ -413,7 +413,7 @@
         if (om_builder->document)
         {
             axiom_node_set_document(element_node, env, om_builder->document);
-            AXIOM_DOCUMENT_SET_ROOT_ELEMENT(om_builder->document,
+            axiom_document_set_root_element(om_builder->document,
                 env, element_node);
         }
     }
@@ -539,7 +539,7 @@
         axiom_doctype_create(env, NULL, doc_value, &doctype_node);
         if (om_builder->document)
         {
-            AXIOM_DOCUMENT_SET_ROOT_ELEMENT(om_builder->document,
+            axiom_document_set_root_element(om_builder->document,
                 env, doctype_node);
         }
     }
@@ -756,7 +756,7 @@
 
     if (om_builder->document)
     {
-        AXIOM_DOCUMENT_FREE(om_builder->document, env);
+        axiom_document_free(om_builder->document, env);
         om_builder->document = NULL;
     }
     else

Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_message.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_message.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_message.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_message.c Wed Mar 14 20:59:20 2007
@@ -58,7 +58,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (soap_message->om_doc)
     {
-        AXIOM_DOCUMENT_FREE(soap_message->om_doc, env);
+        axiom_document_free(soap_message->om_doc, env);
         soap_message->om_doc = NULL;
     }
     if (soap_message->soap_envelope)
@@ -94,6 +94,6 @@
         axiom_output_t *om_output)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    return AXIOM_DOCUMENT_SERIALIZE(soap_message->om_doc, env, om_output);
+    return axiom_document_serialize(soap_message->om_doc, env, om_output);
 }
 

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Wed Mar 14 20:59:20 2007
@@ -1086,7 +1086,7 @@
     }
     if (doc)
     {
-        AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+        axiom_document_build_all(doc, 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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Wed Mar 14 20:59:20 2007
@@ -106,7 +106,7 @@
     if (!document)
         return -1;
 
-    node1 = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(document, environment);
+    node1 = axiom_document_get_root_element(document, environment);
     if (!node1)
     {
         printf(" root element null ");
@@ -135,7 +135,7 @@
     /** build the document continuously untill all the xml file is built in to a om model
*/
 
 
-    node2 = AXIOM_DOCUMENT_BUILD_NEXT(document , environment);
+    node2 = axiom_document_build_next(document , environment);
     do
     {
 
@@ -163,7 +163,7 @@
                 break;
         }
 
-        node2 = AXIOM_DOCUMENT_BUILD_NEXT(document , environment);
+        node2 = axiom_document_build_next(document , environment);
     }
     while (node2);
     printf("END: pull document\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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 14 20:59:20 2007
@@ -328,11 +328,11 @@
      * In description building we don't want defferred building. So build
      * the whole tree at once
      */
-    AXIOM_DOCUMENT_BUILD_ALL(document, env);
+    axiom_document_build_all(document, env);
     /**
         get root element , building starts hear 
      */
-    root = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(document, env);
+    root = axiom_document_get_root_element(document, env);
     return root;
 }
 

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=518463&r1=518462&r2=518463
==============================================================================
--- 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 Wed
Mar 14 20:59:20 2007
@@ -413,7 +413,7 @@
                     (env, AXIOM_SOAP11);
             def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
             om_doc = axiom_stax_builder_get_document(om_builder, env);
-            root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, 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);
         }
@@ -1236,7 +1236,7 @@
                 (env, AXIOM_SOAP11);
         def_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
         om_doc = axiom_stax_builder_get_document(om_builder, env);
-        root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+        root_node = axiom_document_build_all(om_doc, env);
         AXIOM_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
 
         return soap_envelope;

Modified: webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlenc/enc.c Wed Mar 14 20:59:20 2007
@@ -49,9 +49,9 @@
     if (!builder) printf("\n builder is NULL");
     doc = axiom_document_create(env, NULL, builder);
     if (!doc) printf("\n doc is NULL");
-    tmpl = AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    tmpl = axiom_document_build_all(doc, env);
 
-    /*    tmpl = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);*/
+    /*    tmpl = axiom_document_get_root_element(doc, env);*/
     if (!tmpl) printf("\n tmpl is NULL");
     return tmpl;
 }

Modified: webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/omxmlsec/xmlsig/sign.c Wed Mar 14 20:59:20 2007
@@ -55,9 +55,9 @@
     if (!builder) printf("\n builder is NULL");
     doc = axiom_document_create(env, NULL, builder);
     if (!doc) printf("\n doc is NULL");
-    tmpl = AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    tmpl = axiom_document_build_all(doc, env);
 
-    /*    tmpl = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);*/
+    /*    tmpl = axiom_document_get_root_element(doc, env);*/
     if (!tmpl) printf("\n tmpl is NULL");
     return tmpl;
 }

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Wed Mar 14 20:59:20 2007
@@ -274,7 +274,7 @@
                 "axiom_document is NULL");
         return NULL;
     }
-    node = AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    node = axiom_document_build_all(doc, env);
     if (!node)
     {
         oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Wed Mar 14 20:59:20 2007
@@ -52,7 +52,7 @@
         ((ctx)->ns_stack->def_ns)
 
 #define C14N_GET_ROOT_NODE_FROM_DOC_OR_NODE(doc, node, ctx) \
-    ((doc) ? AXIOM_DOCUMENT_GET_ROOT_ELEMENT((axiom_document_t *)(doc), \
+    ((doc) ? axiom_document_get_root_element((axiom_document_t *)(doc), \
         (ctx)->env) : c14n_get_root_node((node), (ctx))) 
 
 typedef enum {
@@ -580,7 +580,7 @@
     if (ctx && ctx->outstream)
     {
         root_node = C14N_GET_ROOT_NODE_FROM_DOC_OR_NODE(doc, node, ctx);
-        /*root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT((axiom_document_t *)doc,
+        /*root_node = axiom_document_get_root_element((axiom_document_t *)doc,
                 ctx->env); */
 
         /* shouldn't the called method's document be const?*/

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c Wed Mar 14 20:59:20
2007
@@ -37,7 +37,7 @@
         return NULL;
     }
 
-    root = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(document, env);
+    root = axiom_document_get_root_element(document, env);
     if(!root)
     {
         axiom_stax_builder_free(builder, env);

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/c14n/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/c14n/test.c Wed Mar 14 20:59:20 2007
@@ -83,7 +83,7 @@
     if (!om_builder) { p_fail(); return 1; }
 
     doc = axiom_stax_builder_get_document(om_builder, env);
-    AXIOM_DOCUMENT_BUILD_ALL (doc, env); 
+    axiom_document_build_all(doc, env); 
     if (!doc) { p_fail(); return 1; }
     axis2_char_t *txt = NULL;
     /*res = oxs_c14n_apply(env, doc, AXIS2_TRUE, &txt, AXIS2_FALSE, NULL);
@@ -93,7 +93,7 @@
     
     stream = axis2_stream_create_basic(env);
     
-    axiom_node_t *root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
+    axiom_node_t *root_node = axiom_document_get_root_element(doc, env);
     axiom_node_t *c14n_node = AXIOM_NODE_GET_FIRST_ELEMENT(root_node, env);
 
     if (argc>2 && !(argv[2][0]-'e'))

Modified: webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c Wed Mar 14 20:59:20 2007
@@ -55,9 +55,9 @@
     if (!builder) printf("\n builder is NULL");
     doc = axiom_document_create(env, NULL, builder);
     if (!doc) printf("\n doc is NULL");
-    tmpl = AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    tmpl = axiom_document_build_all(doc, env);
 
-    /*    tmpl = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);*/
+    /*    tmpl = axiom_document_get_root_element(doc, env);*/
     if (!tmpl) printf("\n tmpl is NULL");
     return tmpl;
 }

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c Wed Mar 14 20:59:20
2007
@@ -229,7 +229,7 @@
     }
     else
     {
-        AXIOM_DOCUMENT_FREE( om_doc, env);
+        axiom_document_free( om_doc, env);
         return AXIS2_FAILURE;
     }
     list = WODEN_TYPES_ELEMENT_GET_SCHEMAS( types_ele, env);
@@ -290,7 +290,7 @@
         }
     }
     WODEN_RESOLVER_FREE( resolver, env);
-    AXIOM_DOCUMENT_FREE( om_doc, env);
+    axiom_document_free( om_doc, env);
 
     return status;
 }
@@ -311,7 +311,7 @@
     }
     om_builder = axiom_stax_builder_create(env, reader);
     doc = axiom_document_create(env, NULL, om_builder);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    axiom_document_build_all(doc, env);
 
     return doc;
 }

Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c Wed Mar 14 20:59:20 2007
@@ -87,7 +87,7 @@
     }
     om_builder = axiom_stax_builder_create(env, reader);
     doc = axiom_document_create(env, NULL, om_builder);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    axiom_document_build_all(doc, env);
 
     collection = xml_schema_collection_create( env);
     current_schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT( collection, env, doc);

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Wed Mar 14 20:59:20 2007
@@ -184,12 +184,12 @@
 		return NULL;
     om_builder = axiom_stax_builder_create(env, xml_reader);
     om_doc = axiom_document_create(env, NULL, om_builder);
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     typemapper_impl-> qname2name = axis2_hash_make ( env);
     typemapper_impl-> qname2prefix = axis2_hash_make ( env);
     typemapper_impl-> primitive_map = axis2_hash_make ( env);
-    root = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env);
+    root = axiom_document_get_root_element(om_doc, env);
     root_ele = AXIOM_NODE_GET_DATA_ELEMENT(root, env);
     typemapper_impl-> mapper_name =
         AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(root_ele, env, "dbf");

Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c Wed Mar 14 20:59:20
2007
@@ -348,7 +348,7 @@
     }
     om_builder = axiom_stax_builder_create(env, reader);
     doc = axiom_document_create(env, NULL, om_builder);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+    axiom_document_build_all(doc, env);
 
     return doc;
 }

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Wed Mar 14 20:59:20 2007
@@ -176,7 +176,7 @@
             printf("Content is:\n");
         }
     }
-    om_builder = AXIOM_DOCUMENT_GET_BUILDER(om_doc, env);
+    om_builder = axiom_document_get_builder(om_doc, env);
     axiom_stax_builder_free(om_builder, env);
     WODEN_DESC_FREE(desc, env);
     axis2_env_free(env);
@@ -195,7 +195,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);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, 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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Wed Mar 14 20:59:20 2007
@@ -185,7 +185,7 @@
             printf("Content is:\n");
         }
     }
-    om_builder = AXIOM_DOCUMENT_GET_BUILDER(om_doc, env);
+    om_builder = axiom_document_get_builder(om_doc, env);
     axiom_stax_builder_free(om_builder, env);
     WODEN_WSDL10_DESC_FREE(desc, env);
     axis2_env_free(env);
@@ -204,7 +204,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);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, 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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Wed Mar 14 20:59:20 2007
@@ -4006,7 +4006,7 @@
         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_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
+        doc_el_node = axiom_document_get_root_element(doc, env);
         if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
         {
             /* Cannot contine without the referenced document */

Modified: webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_resolver.c Wed Mar 14 20:59:20 2007
@@ -185,7 +185,7 @@
 
     /* TODO add WSDL locator for resolving URIs */
     resolver_impl->om_doc = om_doc;
-    resolver_impl->root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env);
+    resolver_impl->root_node = axiom_document_get_root_element(om_doc, env);
     if (!resolver_impl->root_node)
         return NULL;
     return yomu(resolver, env, resolver_impl->root_node, doc_base_uri);

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=518463&r1=518462&r2=518463
==============================================================================
--- 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 Wed Mar 14 20:59:20
2007
@@ -3836,7 +3836,7 @@
         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_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
+        doc_el_node = axiom_document_get_root_element(doc, env);
         if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
         {
             /* Cannot contine without the referenced document */

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/samples/test_schema.c (original)
+++ webservices/axis2/trunk/c/xml_schema/samples/test_schema.c Wed Mar 14 20:59:20 2007
@@ -40,7 +40,7 @@
 
     om_doc = axiom_stax_builder_get_document(om_builder, env);
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
     schema_collection = xml_schema_collection_create(env);
 
     schema = XML_SCHEMA_COLLECTION_READ_DOCUMENT(

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Wed Mar 14 20:59:20 2007
@@ -425,7 +425,7 @@
 
     axis2_array_list_add(builder_impl->document_list, env, om_doc);
 
-    root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env);
+    root_node = axiom_document_get_root_element(om_doc, env);
 
     if (!root_node)
         return NULL;
@@ -4098,7 +4098,7 @@
 
     om_doc = axiom_document_create(env, NULL, om_builder);
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     return XML_SCHEMA_COLLECTION_READ_DOCUMENT_WITH_URI(
                 sch_builder_impl->collection , env, om_doc, base_uri);

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Wed Mar 14 20:59:20 2007
@@ -466,7 +466,7 @@
         axiom_stax_builder_free(om_builder, env);
         return NULL;
     }
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     sch_builder = xml_schema_builder_create(env, collection);
     if (!sch_builder)

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=518463&r1=518462&r2=518463
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Wed Mar 14 20:59:20 2007
@@ -108,7 +108,7 @@
         ele = NULL;
         sch_type = NULL;
     }
-    AXIOM_DOCUMENT_FREE(om_doc, env);
+    axiom_document_free(om_doc, env);
 }
 
 void test_any_attribute(CuTest *tc)
@@ -215,7 +215,7 @@
 
     om_doc = get_document_from_filename(env, filename);
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     CuAssertPtrNotNull(tc, om_doc);
 
@@ -249,7 +249,7 @@
 
     om_doc = get_document_from_filename(env, filename);
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     CuAssertPtrNotNull(tc, om_doc);
 
@@ -522,7 +522,7 @@
 
     om_doc = axiom_document_create(env, NULL, builder);
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     sch_collection = xml_schema_collection_create(env);
 
@@ -548,7 +548,7 @@
     om_doc = get_document_from_filename(env,
             "./../test-resources/SimpleContentRestriction.xsd");
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     sch_collection = xml_schema_collection_create(env);
 
@@ -597,7 +597,7 @@
     om_doc = get_document_from_filename(env,
             "./../test-resources/unqualifiedTypes.xsd");
 
-    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
+    axiom_document_build_all(om_doc, env);
 
     sch_collection = xml_schema_collection_create(env);
 
@@ -650,7 +650,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);
-    AXIOM_DOCUMENT_BUILD_ALL(doc, 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