axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r413606 [9/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...
Date Mon, 12 Jun 2006 08:26:34 GMT
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?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Mon Jun 12 01:26:30 2006
@@ -78,26 +78,26 @@
 axis2_xml_schema_collection_read_document(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_document_t* document);
+        axiom_document_t* document);
 
 axis2_xml_schema_t * AXIS2_CALL
 axis2_xml_schema_collection_read_element(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_node_t *node);
+        axiom_node_t *node);
 
 axis2_xml_schema_t* AXIS2_CALL
 axis2_xml_schema_collection_read_document_with_uri(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_document_t *document,
+        axiom_document_t *document,
         axis2_char_t *uri);
 
 axis2_xml_schema_t * AXIS2_CALL
 axis2_xml_schema_collection_read_element_with_uri(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_node_t *node,
+        axiom_node_t *node,
         axis2_char_t *uri);
 
 axis2_xml_schema_element_t * AXIS2_CALL
@@ -428,27 +428,27 @@
         axis2_xml_reader_t *reader)
 {
     axis2_xml_schema_builder_t *sch_builder = NULL;
-    axis2_om_document_t *om_doc = NULL;
-    axis2_om_stax_builder_t *om_builder = NULL;
+    axiom_document_t *om_doc = NULL;
+    axiom_stax_builder_t *om_builder = NULL;
     
     AXIS2_PARAM_CHECK(env->error, reader, NULL);
     
-    om_builder = axis2_om_stax_builder_create(env, reader);
+    om_builder = axiom_stax_builder_create(env, reader);
     if(!om_builder)
         return NULL;
         
-    om_doc = axis2_om_document_create(env, NULL, om_builder);
+    om_doc = axiom_document_create(env, NULL, om_builder);
     if(!om_doc)
     {
-        AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);
+        AXIOM_STAX_BUILDER_FREE(om_builder, env);
         return NULL;
     }    
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     sch_builder = axis2_xml_schema_builder_create(env, collection);
     if(!sch_builder)
     {
-        AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);
+        AXIOM_STAX_BUILDER_FREE(om_builder, env);
         return NULL;
     }
     
@@ -459,7 +459,7 @@
 axis2_xml_schema_collection_read_document(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_document_t* document)
+        axiom_document_t* document)
 {
     axis2_xml_schema_builder_t *sch_builder = NULL;
     AXIS2_PARAM_CHECK(env->error , document, NULL);
@@ -471,7 +471,7 @@
 axis2_xml_schema_collection_read_element(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_node_t *node)
+        axiom_node_t *node)
 {
     axis2_xml_schema_builder_t *sch_builder = NULL;
     
@@ -488,7 +488,7 @@
 axis2_xml_schema_collection_read_document_with_uri(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_document_t *document,
+        axiom_document_t *document,
         axis2_char_t *uri)
 {
     axis2_xml_schema_builder_t *sch_builder = NULL;
@@ -502,7 +502,7 @@
 axis2_xml_schema_collection_read_element_with_uri(
         axis2_xml_schema_collection_t* collection,
         const axis2_env_t *env,
-        axis2_om_node_t *node,
+        axiom_node_t *node,
         axis2_char_t *uri)
 {
     axis2_xml_schema_builder_t *sch_builder = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_documentation.c Mon Jun 12 01:26:30
2006
@@ -39,7 +39,7 @@
 
     axis2_char_t *source;
     
-    axis2_om_child_element_iterator_t *markup; 
+    axiom_child_element_iterator_t *markup; 
 };
 
 #define AXIS2_INTF_TO_IMPL(documentation) \
@@ -73,7 +73,7 @@
                                         const axis2_env_t *env,
                                         axis2_char_t *source);
 
-axis2_om_child_element_iterator_t *AXIS2_CALL
+axiom_child_element_iterator_t *AXIS2_CALL
 axis2_xml_schema_documentation_get_markup(void *documentation,
                                         const axis2_env_t *env);
 
@@ -81,7 +81,7 @@
 axis2_xml_schema_documentation_set_markup(
         void *documentation,
         const axis2_env_t *env,
-        axis2_om_child_element_iterator_t *markup);
+        axiom_child_element_iterator_t *markup);
         
 axis2_status_t AXIS2_CALL
 axis2_xml_schema_documentation_set_language(
@@ -344,7 +344,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_om_child_element_iterator_t *AXIS2_CALL
+axiom_child_element_iterator_t *AXIS2_CALL
 axis2_xml_schema_documentation_get_markup(void *documentation,
                                         const axis2_env_t *env)
 {
@@ -365,7 +365,7 @@
 axis2_status_t AXIS2_CALL
 axis2_xml_schema_documentation_set_markup(void *documentation,
                                         const axis2_env_t *env,
-                                        axis2_om_child_element_iterator_t *markup)
+                                        axiom_child_element_iterator_t *markup)
 {
     axis2_xml_schema_documentation_impl_t *documentation_impl = NULL;
     axis2_hash_t *ht_super = NULL;

Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c Mon Jun 12 01:26:30 2006
@@ -15,8 +15,8 @@
  */
 
 #include <xml_schema/axis2_xml_schema_facet.h>
-#include <axis2_om_element.h>
-#include <axis2_om_node.h>
+#include <axiom_element.h>
+#include <axiom_node.h>
 
 typedef struct axis2_xml_schema_facet_impl 
                 axis2_xml_schema_facet_impl_t;
@@ -290,9 +290,9 @@
 
 AXIS2_EXTERN axis2_xml_schema_facet_t* AXIS2_CALL
 axis2_xml_schema_facet_construct (const axis2_env_t *env,
-                                  axis2_om_node_t *node)
+                                  axiom_node_t *node)
 {
-    axis2_om_element_t *om_ele = NULL;
+    axiom_element_t *om_ele = NULL;
     axis2_char_t *localname = NULL;
     axis2_char_t *attr_value = NULL;
     axis2_bool_t is_fixed = AXIS2_FALSE;
@@ -302,11 +302,11 @@
     int facet_type;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, node, NULL);
-    if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
+    if(AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
         return NULL;
     
-    om_ele = AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
-    localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(om_ele, env);
+    om_ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
+    localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
 
     if(AXIS2_STRCMP(localname,"enumeration") == 0)
     {
@@ -359,12 +359,12 @@
     else 
         return NULL;
     
-    attr_value = AXIS2_OM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "fixed");
+    attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "fixed");
     if(NULL != attr_value && AXIS2_STRCMP(attr_value, "fixed") == 0)
         is_fixed = AXIS2_TRUE;
     
     attr_value = NULL;
-    attr_value = AXIS2_OM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "value");
+    attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "value");
     if(NULL != attr_value)
         value = attr_value;
     else

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?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Mon Jun 12 01:26:30 2006
@@ -16,13 +16,13 @@
 
 #include <CuTest.h>
 #include <stdio.h>
-#include <axis2_om.h>
+#include <axiom.h>
 #include <xml_schema/axis2_xml_schema_includes.h>
 #include <axis2_env.h>
 #include "xml_schema_test.h"
 
 
-static axis2_om_document_t* 
+static axiom_document_t* 
 get_document_from_filename(const axis2_env_t *env, 
                                axis2_char_t *filename);
 
@@ -67,7 +67,7 @@
 void test_simple_type_schema_generation(CuTest *tc)
 {
     const axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_xml_schema_obj_table_t *obj_table = NULL;
@@ -107,13 +107,13 @@
         ele = NULL;
         sch_type = NULL;
     }
-    AXIS2_OM_DOCUMENT_FREE(om_doc, env);
+    AXIOM_DOCUMENT_FREE(om_doc, env);
 }    
 
 void test_any_attribute(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -161,7 +161,7 @@
 void test_block_content(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -200,7 +200,7 @@
 void test_circular_schema(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_char_t *filename = NULL;
@@ -214,7 +214,7 @@
     
     om_doc = get_document_from_filename(env, filename);
     
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     CuAssertPtrNotNull(tc, om_doc);
     
@@ -235,7 +235,7 @@
 void test_schema_import1(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_char_t *filename = NULL;
@@ -248,7 +248,7 @@
    
     om_doc = get_document_from_filename(env, filename);
     
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     CuAssertPtrNotNull(tc, om_doc);
     
@@ -268,7 +268,7 @@
 void test_mixed_content(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -299,7 +299,7 @@
 void test_local_elements(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -376,7 +376,7 @@
 void test_element_refs(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -436,7 +436,7 @@
 void test_forward_refs(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *qn = NULL;
@@ -483,12 +483,12 @@
 void test_local_unnamed_simple_type(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_char_t *xml = NULL;
     axis2_xml_reader_t *reader = NULL;
-    axis2_om_stax_builder_t *builder = NULL;
+    axiom_stax_builder_t *builder = NULL;
     
     xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" 
              "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\"\n" 
@@ -516,11 +516,11 @@
     reader = axis2_xml_reader_create_for_memory(env, xml, AXIS2_STRLEN(xml), NULL,
         AXIS2_XML_PARSER_TYPE_BUFFER);
 
-    builder = axis2_om_stax_builder_create(env, reader);
+    builder = axiom_stax_builder_create(env, reader);
     
-    om_doc = axis2_om_document_create(env, NULL, builder);
+    om_doc = axiom_document_create(env, NULL, builder);
     
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     sch_collection = axis2_xml_schema_collection_create(env);
     
@@ -532,7 +532,7 @@
 void test_simple_restriction(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *type_qname = NULL;
@@ -546,7 +546,7 @@
     om_doc = get_document_from_filename(env, 
         "./../test-resources/SimpleContentRestriction.xsd");
     
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     sch_collection = axis2_xml_schema_collection_create(env);
     
@@ -572,7 +572,7 @@
 void test_unqualified_schemas(CuTest *tc)
 {
     axis2_env_t *env = NULL;
-    axis2_om_document_t *om_doc = NULL;
+    axiom_document_t *om_doc = NULL;
     axis2_xml_schema_collection_t *sch_collection = NULL;
     axis2_xml_schema_t *schema = NULL;
     axis2_qname_t *element_qname = NULL;
@@ -595,7 +595,7 @@
     om_doc = get_document_from_filename(env, 
         "./../test-resources/unqualifiedTypes.xsd");
     
-    AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+    AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
     
     sch_collection = axis2_xml_schema_collection_create(env);
     
@@ -639,17 +639,17 @@
 {
 }
 
-static axis2_om_document_t* 
+static axiom_document_t* 
 get_document_from_filename(const axis2_env_t *env, 
                                axis2_char_t *filename)
 {
     axis2_xml_reader_t *reader = NULL;
-    axis2_om_stax_builder_t *om_builder = NULL;
-    axis2_om_document_t *doc   = NULL;
+    axiom_stax_builder_t *om_builder = NULL;
+    axiom_document_t *doc   = NULL;
     reader = axis2_xml_reader_create_for_file(env, filename, NULL);
-    om_builder = axis2_om_stax_builder_create(env, reader);
-    doc = axis2_om_document_create(env, NULL, om_builder); 
-    AXIS2_OM_DOCUMENT_BUILD_ALL(doc, env);
+    om_builder = axiom_stax_builder_create(env, reader);
+    doc = axiom_document_create(env, NULL, om_builder); 
+    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