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 [3/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/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Jun 12 01:26:30 2006
@@ -46,18 +46,18 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_populate_svc(axis2_svc_builder_t *svc_builder,
                                 const axis2_env_t *env,
-                                axis2_om_node_t *svc_node);
+                                axiom_node_t *svc_node);
 
 static axis2_array_list_t *
 axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
                     const axis2_env_t *env,
-                    axis2_om_children_qname_iterator_t *op_itr);
+                    axiom_children_qname_iterator_t *op_itr);
 
 
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
                                 const axis2_env_t *env,
-                                axis2_om_children_qname_iterator_t *module_confs,
+                                axiom_children_qname_iterator_t *module_confs,
                                 axis2_param_container_t *parent, 
                                 axis2_svc_t *svc);
 
@@ -68,7 +68,7 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
                                     const axis2_env_t *env,
-                                    axis2_om_children_qname_iterator_t *module_refs);
+                                    axiom_children_qname_iterator_t *module_refs);
 
 /************************** End of function prototypes ************************/
 
@@ -204,13 +204,13 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_populate_svc(axis2_svc_builder_t *svc_builder,
                                 const axis2_env_t *env,
-                                axis2_om_node_t *svc_node)
+                                axiom_node_t *svc_node)
 {
     axis2_svc_builder_impl_t *builder_impl = NULL;
-    axis2_om_element_t *svc_element = NULL;
-    axis2_om_children_qname_iterator_t *itr = NULL;
-    axis2_om_children_qname_iterator_t *operation_itr = NULL;
-    /*axis2_om_children_qname_iterator_t *module_configs_itr = NULL; */
+    axiom_element_t *svc_element = NULL;
+    axiom_children_qname_iterator_t *itr = NULL;
+    axiom_children_qname_iterator_t *operation_itr = NULL;
+    /*axiom_children_qname_iterator_t *module_configs_itr = NULL; */
     axis2_qname_t *qparamst = NULL;
     /*axis2_qname_t *qdesc = NULL;*/
     axis2_qname_t *qmodulest = NULL;
@@ -223,19 +223,19 @@
     /*axis2_qname_t *qmodule_config = NULL; */
     axis2_status_t status = AXIS2_FAILURE;
     axis2_svc_grp_t *parent = NULL;
-    /*axis2_om_element_t *desc_element = NULL;
-    axis2_om_node_t *desc_node = NULL;
+    /*axiom_element_t *desc_element = NULL;
+    axiom_node_t *desc_node = NULL;
     */
-    axis2_om_children_qname_iterator_t *module_refs = NULL;
-    axis2_om_node_t *in_flow_node = NULL;
-    axis2_om_element_t *in_flow_element = NULL;
-    axis2_om_node_t *out_flow_node = NULL;
-    axis2_om_element_t *out_flow_element = NULL;
-    axis2_om_node_t *in_faultflow_node = NULL;
-    axis2_om_element_t *in_faultflow_element = NULL;
-    axis2_om_node_t *out_faultflow_node = NULL;
-    axis2_om_element_t *out_faultflow_element = NULL;
-    axis2_om_attribute_t *name_attr = NULL;
+    axiom_children_qname_iterator_t *module_refs = NULL;
+    axiom_node_t *in_flow_node = NULL;
+    axiom_element_t *in_flow_element = NULL;
+    axiom_node_t *out_flow_node = NULL;
+    axiom_element_t *out_flow_element = NULL;
+    axiom_node_t *in_faultflow_node = NULL;
+    axiom_element_t *in_faultflow_element = NULL;
+    axiom_node_t *out_faultflow_node = NULL;
+    axiom_element_t *out_faultflow_element = NULL;
+    axiom_attribute_t *name_attr = NULL;
     axis2_array_list_t *ops = NULL;
     axis2_char_t *svc_name = NULL;
     axis2_char_t *class_name = NULL;
@@ -257,7 +257,7 @@
     AXIS2_PARAM_CHECK(env->error, svc_node, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
 
-    svc_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(svc_node, env);
+    svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
     /* Processing service level paramters */
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
     if(!qparamst)
@@ -265,7 +265,7 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env, qparamst,
+    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env, qparamst,
         svc_node);
     AXIS2_QNAME_FREE(qparamst, env);
     qparamst = NULL;
@@ -288,18 +288,18 @@
      * name
      */
     /*qdesc = axis2_qname_create(env, AXIS2_DESCRIPTION, NULL, NULL);
-    desc_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, env,
+    desc_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, env,
         qdesc, svc_node, &desc_node);
     AXIS2_QNAME_FREE(qdesc, env) ;
     qdesc = NULL;
     if(NULL != desc_element)
     {
-        axis2_om_element_t *desc_value_element = NULL;
-        axis2_om_node_t *desc_value_node = NULL;
+        axiom_element_t *desc_value_element = NULL;
+        axiom_node_t *desc_value_node = NULL;
         axis2_xml_writer_t *xml_writer = NULL;
-        axis2_om_output_t *om_output = NULL;
+        axiom_output_t *om_output = NULL;
         
-        desc_value_element = AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT(desc_element, 
+        desc_value_element = AXIOM_ELEMENT_GET_FIRST_ELEMENT(desc_element, 
             env, desc_node, &desc_value_node);
         if(NULL != desc_value_element && NULL != desc_value_node)
         {
@@ -307,8 +307,8 @@
             
             xml_writer = axis2_xml_writer_create_for_memory(env, NULL, 
                 AXIS2_TRUE, 0, AXIS2_XML_PARSERT_TYPE_BUFFER);
-            om_output = axis2_om_output_create(env, xml_writer);
-            status = AXIS2_OM_NODE_SERIALIZE(desc_value_node, env, om_output);
+            om_output = axiom_output_create(env, xml_writer);
+            status = AXIOM_NODE_SERIALIZE(desc_value_node, env, om_output);
             if(status != AXIS2_SUCCESS)
             {
                 return AXIS2_FAILURE;
@@ -316,13 +316,13 @@
             svc_name = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
             AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env, 
                 svc_name);
-            AXIS2_OM_OUTPUT_FREE(om_output, env);
+            AXIOM_OUTPUT_FREE(om_output, env);
         }
         else
         {
             axis2_char_t *svc_name = NULL;
             
-            svc_name = AXIS2_OM_ELEMENT_GET_TEXT(desc_element, env, desc_node);
+            svc_name = AXIOM_ELEMENT_GET_TEXT(desc_element, env, desc_node);
             AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env, 
                 svc_name);
         }
@@ -330,8 +330,8 @@
     */
     /* my logic to get set service name */
     qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-    name_attr = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
-    svc_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(name_attr, env);
+    name_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
+    svc_name = AXIOM_ATTRIBUTE_GET_VALUE(name_attr, env);
     AXIS2_SVC_SET_AXIS2_SVC_NAME(builder_impl->svc, env, svc_name);
     AXIS2_QNAME_FREE(qattname, env);
     
@@ -382,7 +382,7 @@
     /* end of my logic */
     /* processing service wide modules which required to engage globally */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-    module_refs = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
+    module_refs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
         qmodulest, svc_node);
     AXIS2_QNAME_FREE(qmodulest, env) ;
     qmodulest = NULL;
@@ -394,7 +394,7 @@
 
     /* process INFLOW */
     qinflowst = axis2_qname_create(env, AXIS2_INFLOWST, NULL, NULL);
-    in_flow_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, 
+    in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, 
         env, qinflowst, svc_node, &in_flow_node);
     AXIS2_QNAME_FREE(qinflowst, env) ;
     qinflowst = NULL; 
@@ -413,7 +413,7 @@
     }
 
     qoutflowst = axis2_qname_create(env, AXIS2_OUTFLOWST, NULL, NULL);
-    out_flow_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
         env, qoutflowst, svc_node, &out_flow_node);
     AXIS2_QNAME_FREE(qoutflowst, env) ;
     qoutflowst = NULL;
@@ -432,7 +432,7 @@
     }
 
     qin_faultflowst = axis2_qname_create(env, AXIS2_IN_FAILTFLOW, NULL, NULL);
-    in_faultflow_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, 
+    in_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element, 
         env, qin_faultflowst, svc_node, &in_faultflow_node);
     AXIS2_QNAME_FREE(qin_faultflowst, env) ;
     qin_faultflowst = NULL;
@@ -453,7 +453,7 @@
     }
 
     qout_faultflowst = axis2_qname_create(env, AXIS2_OUT_FAILTFLOW, NULL, NULL);
-    out_faultflow_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
+    out_faultflow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(svc_element,
         env, qoutflowst, svc_node, &out_faultflow_node);
     AXIS2_QNAME_FREE(qout_faultflowst, env) ;
     qout_faultflowst = NULL;
@@ -475,7 +475,7 @@
 
     /* processing operations */
     qopst = axis2_qname_create(env, AXIS2_OPERATIONST, NULL, NULL);
-    operation_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
+    operation_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element, env,
         qopst, svc_node);
     AXIS2_QNAME_FREE(qopst, env) ;
     qopst = NULL; 
@@ -515,7 +515,7 @@
     AXIS2_ARRAY_LIST_FREE(ops, env);
     /*
     qmodule_config = axis2_qname_create(env, AXIS2_MODULECONFIG, NULL, NULL);
-    module_configs_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element,
+    module_configs_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element,
         env, qmodule_config, svc_node);
     AXIS2_QNAME_FREE(qmodule_config, env) ;
     status = axis2_svc_builder_process_svc_module_conf(svc_builder, env, 
@@ -527,7 +527,7 @@
 static axis2_array_list_t *
 axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
                     const axis2_env_t *env,
-                    axis2_om_children_qname_iterator_t *op_itr)
+                    axiom_children_qname_iterator_t *op_itr)
 {
     axis2_svc_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *ops = NULL;
@@ -537,12 +537,12 @@
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
     
     ops = axis2_array_list_create(env, 0);
-    while(AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(op_itr, env))
+    while(AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(op_itr, env))
     {
-        axis2_om_element_t *op_element = NULL;
-        axis2_om_node_t *op_node = NULL;
-        axis2_om_attribute_t *op_name_att = NULL;
-        axis2_om_attribute_t *op_mep_att = NULL;
+        axiom_element_t *op_element = NULL;
+        axiom_node_t *op_node = NULL;
+        axiom_attribute_t *op_name_att = NULL;
+        axiom_attribute_t *op_mep_att = NULL;
         axis2_qname_t *qmep = NULL;
         axis2_qname_t *qopname = NULL;
         axis2_qname_t *qparamst = NULL;
@@ -553,17 +553,17 @@
         axis2_char_t *op_name = NULL;
         axis2_wsdl_op_t *wsdl_op = NULL;
         axis2_op_t *op_desc = NULL;
-        axis2_om_children_qname_iterator_t *params_itr = NULL;
-        axis2_om_children_qname_iterator_t *module_itr = NULL;
-        axis2_om_element_t *recv_element = NULL;
-        axis2_om_node_t *recv_node = NULL;
+        axiom_children_qname_iterator_t *params_itr = NULL;
+        axiom_children_qname_iterator_t *module_itr = NULL;
+        axiom_element_t *recv_element = NULL;
+        axiom_node_t *recv_node = NULL;
         axis2_status_t status = AXIS2_FAILURE;
         
-        op_node = AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(op_itr, env);
+        op_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(op_itr, env);
         /* getting operation name */
-        op_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(op_node, env);
+        op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        op_name_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(op_element, env, qattname);
+        op_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qattname);
         AXIS2_QNAME_FREE(qattname, env);
         qattname = NULL;
         if(NULL == op_name_att)
@@ -574,19 +574,19 @@
         }
         /* set the mep of the operation */
         qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
-        op_mep_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(op_element, env, qmep);
+        op_mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qmep);
         AXIS2_QNAME_FREE(qmep, env);
         qmep = NULL;
         if(NULL != op_mep_att)
         {
-            mep_url = AXIS2_OM_ATTRIBUTE_GET_VALUE(op_mep_att, env);
+            mep_url = AXIOM_ATTRIBUTE_GET_VALUE(op_mep_att, env);
             /*
             TODO value has to be validate
             TODO
              op_descrip.setMessageExchangePattern(mep);
             */
         }
-        op_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(op_name_att, env);
+        op_name = AXIOM_ATTRIBUTE_GET_VALUE(op_name_att, env);
         qopname = axis2_qname_create(env, op_name, NULL, NULL);
         wsdl_op = AXIS2_SVC_GET_WSDL_OP(builder_impl->svc, env, qopname);
         if(NULL == wsdl_op)
@@ -624,7 +624,7 @@
         qopname = NULL;
         /* operation parameters */
         qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
-        params_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        params_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
             qparamst, op_node);
         AXIS2_QNAME_FREE(qparamst, env);
         qparamst = NULL;
@@ -634,7 +634,7 @@
         /* loading the message receivers */
         
         qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
-        recv_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(op_element, 
+        recv_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(op_element, 
             env, qmsgrecv, op_node, &recv_node);
         AXIS2_QNAME_FREE(qmsgrecv, env);
         qmsgrecv = NULL;
@@ -656,7 +656,7 @@
         }
         /* process module refs */
         qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-        module_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
+        module_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(op_element, env,
             qmodulest, op_node);
         AXIS2_QNAME_FREE(qmodulest, env);
         qmodulest = NULL;
@@ -684,22 +684,22 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_process_svc_module_conf(axis2_svc_builder_t *svc_builder,
                                 const axis2_env_t *env,
-                                axis2_om_children_qname_iterator_t *module_confs,
+                                axiom_children_qname_iterator_t *module_confs,
                                 axis2_param_container_t *parent, 
                                 axis2_svc_t *svc)
 {
-    while(AXIS2_TRUE == AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_confs, env))
+    while(AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_confs, env))
     {
-        axis2_om_element_t *module_conf_element = NULL;
-        axis2_om_node_t *module_conf_node = NULL;
-        axis2_om_attribute_t *module_name_att = NULL;
+        axiom_element_t *module_conf_element = NULL;
+        axiom_node_t *module_conf_node = NULL;
+        axiom_attribute_t *module_name_att = NULL;
         axis2_qname_t *qattname = NULL;
         
-        module_conf_node = AXIS2_OM_CHILDREN_ITERATOR_NEXT(module_confs, env);
-        module_conf_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(module_conf_node,
+        module_conf_node = AXIOM_CHILDREN_ITERATOR_NEXT(module_confs, env);
+        module_conf_element = AXIOM_NODE_GET_DATA_ELEMENT(module_conf_node,
             env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        module_name_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(module_conf_element,
+        module_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_conf_element,
             env, qattname);
         AXIS2_QNAME_FREE(qattname, env);
         qattname = NULL;
@@ -717,7 +717,7 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_builder_process_module_refs(axis2_svc_builder_t *svc_builder,
                                         const axis2_env_t *env,
-                                        axis2_om_children_qname_iterator_t *
+                                        axiom_children_qname_iterator_t *
                                             module_refs)
 {
     axis2_svc_builder_impl_t *builder_impl = NULL;
@@ -726,18 +726,18 @@
     AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
     
-    while(AXIS2_TRUE == AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
+    while(AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
     {
-        axis2_om_element_t *module_ref_element = NULL;
-        axis2_om_node_t *module_ref_node = NULL;
-        axis2_om_attribute_t *module_ref_att = NULL;
+        axiom_element_t *module_ref_element = NULL;
+        axiom_node_t *module_ref_node = NULL;
+        axiom_attribute_t *module_ref_att = NULL;
         axis2_qname_t *qref = NULL;
         
-        module_ref_node = AXIS2_OM_CHILDREN_ITERATOR_NEXT(module_refs, env);
-        module_ref_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(module_ref_node,
+        module_ref_node = AXIOM_CHILDREN_ITERATOR_NEXT(module_refs, env);
+        module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node,
             env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(module_ref_element,
+        module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element,
             env, qref);
         AXIS2_QNAME_FREE(qref, env);
         if(NULL != module_ref_att)
@@ -745,7 +745,7 @@
             axis2_char_t *ref_name = NULL;
             axis2_qname_t *qrefname = NULL;
             
-            ref_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
+            ref_name = AXIOM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
             qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
             if(NULL == AXIS2_DEP_ENGINE_GET_MODULE(svc_builder->desc_builder->
                 engine, env, qrefname))

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Jun 12 01:26:30 2006
@@ -22,7 +22,7 @@
 typedef struct axis2_svc_grp_builder_impl
 {
    axis2_svc_grp_builder_t svc_grp_builder;
-    axis2_om_node_t *svc_grp;
+    axiom_node_t *svc_grp;
        
 } axis2_svc_grp_builder_impl_t;
 
@@ -43,12 +43,12 @@
 
 /**
  * To get the list og modules that is requird to be engage globally
- * @param module_refs  <code>axis2_om_children_qname_iterator_t</code>
+ * @param module_refs  <code>axiom_children_qname_iterator_t</code>
  */
 axis2_status_t AXIS2_CALL
 axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *grp_builder,
                                             const axis2_env_t *env,
-                                   axis2_om_children_qname_iterator_t *module_refs ,
+                                   axiom_children_qname_iterator_t *module_refs ,
                                             axis2_svc_grp_t *svc_grp);
                                             
 /************************** End of function prototypes ************************/
@@ -94,7 +94,7 @@
 
 axis2_svc_grp_builder_t * AXIS2_CALL 
 axis2_svc_grp_builder_create_with_svc_and_dep_engine (const axis2_env_t *env,
-                                                axis2_om_node_t *svc_grp,
+                                                axiom_node_t *svc_grp,
                                                 axis2_dep_engine_t *dep_engine)
 {
     axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
@@ -157,23 +157,23 @@
                                         axis2_svc_grp_t *svc_grp)
 {
     axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
-    axis2_om_children_qname_iterator_t *itr = NULL;
-    axis2_om_children_qname_iterator_t *module_ref_itr = NULL;
-    axis2_om_children_qname_iterator_t *svc_itr = NULL;
+    axiom_children_qname_iterator_t *itr = NULL;
+    axiom_children_qname_iterator_t *module_ref_itr = NULL;
+    axiom_children_qname_iterator_t *svc_itr = NULL;
     axis2_qname_t *qparamst = NULL;
     axis2_qname_t *qmodulest = NULL;
     axis2_qname_t *qsvc_element = NULL;
-    axis2_om_element_t *svc_grp_element = NULL;
+    axiom_element_t *svc_grp_element = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_conf_t *parent = NULL;
     
     grp_builder_impl = AXIS2_INTF_TO_IMPL(grp_builder);
     
     /* Processing service level paramters */
-    svc_grp_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(grp_builder_impl->svc_grp, env);
+    svc_grp_element = AXIOM_NODE_GET_DATA_ELEMENT(grp_builder_impl->svc_grp, env);
     qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
     
-    itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env, qparamst,
+    itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env, qparamst,
         grp_builder_impl->svc_grp);
     
     parent = AXIS2_SVC_GRP_GET_PARENT(svc_grp, env);
@@ -182,27 +182,27 @@
 
     /* processing servicewide modules required to engage gloabbly */
     qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
-    module_ref_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
+    module_ref_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
         qmodulest, grp_builder_impl->svc_grp);
     axis2_svc_grp_builder_process_module_refs(grp_builder, env, module_ref_itr, 
         svc_grp);
     qsvc_element = axis2_qname_create(env, AXIS2_SVC_ELEMENT, NULL, NULL);
-    svc_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
+    svc_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_grp_element, env,
         qsvc_element, grp_builder_impl->svc_grp);
-    while(AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(svc_itr, env))
+    while(AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(svc_itr, env))
     {
-        axis2_om_node_t *svc_node = NULL;
-        axis2_om_element_t *svc_element = NULL;
-        axis2_om_attribute_t *svc_name_att = NULL;
+        axiom_node_t *svc_node = NULL;
+        axiom_element_t *svc_element = NULL;
+        axiom_attribute_t *svc_name_att = NULL;
         axis2_char_t *svc_name = NULL;
         axis2_qname_t *qattname = NULL;
         
-        svc_node = (axis2_om_node_t *) AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(
+        svc_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
             svc_itr, env);
-        svc_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(svc_node, env);
+        svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
-        svc_name_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
-        svc_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(svc_name_att, env);
+        svc_name_att = AXIOM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
+        svc_name = AXIOM_ATTRIBUTE_GET_VALUE(svc_name_att, env);
         if(NULL == svc_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_NAME_ERROR,
@@ -248,7 +248,7 @@
 axis2_status_t AXIS2_CALL
 axis2_svc_grp_builder_process_module_refs(axis2_svc_grp_builder_t *grp_builder,
                                             const axis2_env_t *env,
-                                   axis2_om_children_qname_iterator_t *module_refs ,
+                                   axiom_children_qname_iterator_t *module_refs ,
                                             axis2_svc_grp_t *svc_grp)
 {
     axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
@@ -258,18 +258,18 @@
     AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
     grp_builder_impl = AXIS2_INTF_TO_IMPL(grp_builder);
     
-    while (AXIS2_TRUE == AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
+    while (AXIS2_TRUE == AXIOM_CHILDREN_ITERATOR_HAS_NEXT(module_refs, env))
     {
-        axis2_om_node_t *module_ref_node = NULL;
-        axis2_om_element_t *module_ref_element = NULL;
-        axis2_om_attribute_t *module_ref_att = NULL;
+        axiom_node_t *module_ref_node = NULL;
+        axiom_element_t *module_ref_element = NULL;
+        axiom_attribute_t *module_ref_att = NULL;
         axis2_qname_t *qref = NULL;
         
-        module_ref_node = (axis2_om_node_t *) AXIS2_OM_CHILDREN_ITERATOR_NEXT(
+        module_ref_node = (axiom_node_t *) AXIOM_CHILDREN_ITERATOR_NEXT(
             module_refs, env);
-        module_ref_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
+        module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
-        module_ref_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
+        module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
             qref);
         if(NULL != module_ref_att)
         {
@@ -278,7 +278,7 @@
             axis2_module_desc_t *module = NULL;
             
             
-            ref_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
+            ref_name = AXIOM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
             qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
             module = AXIS2_DEP_ENGINE_GET_MODULE(grp_builder->desc_builder->
                 engine, env, qrefname);

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Mon Jun 12 01:26:30 2006
@@ -104,24 +104,24 @@
         axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
         if (soap_body)
         {
-            axis2_om_node_t *body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+            axiom_node_t *body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
             if (body_node)
             {
-                axis2_om_node_t *body_first_child_node = 
-                    AXIS2_OM_NODE_GET_FIRST_CHILD(body_node, env);
+                axiom_node_t *body_first_child_node = 
+                    AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
                 if (body_first_child_node)
                 {                    
-                    if (AXIS2_OM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIS2_OM_ELEMENT)
+                    if (AXIOM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIOM_ELEMENT)
                     {
-                        axis2_om_element_t *element = NULL;                        
-                        element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
+                        axiom_element_t *element = NULL;                        
+                        element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
                         if (element)
                         {
-                            axis2_om_namespace_t *ns = 
-                                AXIS2_OM_ELEMENT_GET_NAMESPACE(element, env, body_first_child_node);
+                            axiom_namespace_t *ns = 
+                                AXIOM_ELEMENT_GET_NAMESPACE(element, env, body_first_child_node);
                             if (ns)
                             {
-                                axis2_char_t *uri = AXIS2_OM_NAMESPACE_GET_URI(ns, env);
+                                axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, env);
                                 if (uri)
                                 {
                                     axis2_char_t **url_tokens = NULL;
@@ -191,20 +191,20 @@
         axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
         if (soap_body)
         {
-            axis2_om_node_t *body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+            axiom_node_t *body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
             if (body_node)
             {
-                axis2_om_node_t *body_first_child_node = 
-                    AXIS2_OM_NODE_GET_FIRST_CHILD(body_node, env);
+                axiom_node_t *body_first_child_node = 
+                    AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
                 if (body_first_child_node)
                 {                    
-                    if (AXIS2_OM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIS2_OM_ELEMENT)
+                    if (AXIOM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIOM_ELEMENT)
                     {
-                        axis2_om_element_t *element = NULL;                        
-                        element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
+                        axiom_element_t *element = NULL;                        
+                        element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
                         if (element)
                         {
-                            axis2_char_t *element_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+                            axis2_char_t *element_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
                             if (element_name)
                             {
                                 axis2_qname_t *op_qname = NULL;

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Jun 12 01:26:30 2006
@@ -16,7 +16,7 @@
  
 #include <axis2_raw_xml_in_out_msg_recv.h>
 #include <string.h>
-#include <axis2_om_element.h>
+#include <axiom_element.h>
 #include <axis2_soap_envelope.h>
 #include <axis2_soap_header.h>
 #include <axis2_soap_body.h>
@@ -70,22 +70,22 @@
     axis2_op_ctx_t *op_ctx = NULL;
     axis2_op_t *op_desc = NULL;
     axis2_char_t *style = NULL;
-    axis2_om_node_t *om_node = NULL;
-    axis2_om_element_t *om_element = NULL;
+    axiom_node_t *om_node = NULL;
+    axiom_element_t *om_element = NULL;
     axis2_char_t *local_name = NULL;
-    axis2_om_node_t *result_node = NULL;
-    axis2_om_node_t *body_content_node = NULL;
-    axis2_om_element_t *body_content_element = NULL;
+    axiom_node_t *result_node = NULL;
+    axiom_node_t *body_content_node = NULL;
+    axiom_element_t *body_content_element = NULL;
     axis2_soap_envelope_t *default_envelope = NULL;
     axis2_soap_body_t *out_body = NULL;
     axis2_soap_header_t *out_header = NULL;
     axis2_soap_fault_t *soap_fault = NULL;
-    axis2_om_node_t *out_node = NULL;
+    axiom_node_t *out_node = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
     axis2_bool_t skel_invoked = AXIS2_FALSE;
     const axis2_char_t *soap_ns = AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
     int soap_version = AXIS2_SOAP12;
-    axis2_om_namespace_t *env_ns = NULL;
+    axiom_namespace_t *env_ns = NULL;
    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -116,23 +116,23 @@
             envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
             body = AXIS2_SOAP_ENVELOPE_GET_BODY(envelope, env);
             om_node = AXIS2_SOAP_BODY_GET_BASE_NODE(body, env);
-            om_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env);
-            om_node = AXIS2_OM_NODE_GET_FIRST_CHILD(om_node, env);            
+            om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
+            om_node = AXIOM_NODE_GET_FIRST_CHILD(om_node, env);            
         }
         else if(0 == AXIS2_STRCMP(AXIS2_STYLE_RPC, style))
         {
             axis2_soap_envelope_t *envelope = NULL;
             axis2_soap_body_t *body = NULL;
-            axis2_om_node_t *op_node = NULL;
-            axis2_om_element_t *op_element = NULL;
+            axiom_node_t *op_node = NULL;
+            axiom_element_t *op_element = NULL;
             
             envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
             body = AXIS2_SOAP_ENVELOPE_GET_BODY(envelope, env);
             op_node = AXIS2_SOAP_BODY_GET_BASE_NODE(body, env);
-            op_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(op_node, env);
+            op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
             if(NULL != op_element)
             {
-                local_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(op_element, env);
+                local_name = AXIOM_ELEMENT_GET_LOCALNAME(op_element, env);
                 if(NULL != local_name)
                 {
                     axis2_array_list_t *function_arr = NULL;
@@ -161,8 +161,8 @@
 
                     if(AXIS2_TRUE == matches)
                     {
-                        om_node = AXIS2_OM_NODE_GET_FIRST_CHILD(op_node, env);
-                        om_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env);   
+                        om_node = AXIOM_NODE_GET_FIRST_CHILD(op_node, env);
+                        om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);   
                     }
                     else
                     {
@@ -203,20 +203,20 @@
         {
             if(0 == AXIS2_STRCMP(style, AXIS2_STYLE_RPC))
             {
-                axis2_om_namespace_t *ns = NULL;
+                axiom_namespace_t *ns = NULL;
                 axis2_char_t *res_name = NULL;
                 
                 res_name = AXIS2_STRACAT(local_name, "Response", env);
-                ns = axis2_om_namespace_create(env, "http://soapenc/", "res");
+                ns = axiom_namespace_create(env, "http://soapenc/", "res");
                 if(!ns)
                 {
                     status = AXIS2_FAILURE;
                 }
                 else 
                 {
-                    body_content_element = axis2_om_element_create(env, NULL, res_name, 
+                    body_content_element = axiom_element_create(env, NULL, res_name, 
                         ns, &body_content_node);
-                    AXIS2_OM_NODE_ADD_CHILD(body_content_node, env, result_node);
+                    AXIOM_NODE_ADD_CHILD(body_content_node, env, result_node);
                 }
                 
             }
@@ -246,7 +246,7 @@
     }
     
     /* create the soap envelope here*/
-    env_ns = axis2_om_namespace_create(env, soap_ns, "soapenv"); 
+    env_ns = axiom_namespace_create(env, soap_ns, "soapenv"); 
     if (!env_ns)
     {
         return AXIS2_FAILURE;
@@ -303,7 +303,7 @@
 
     if (body_content_node)
     {
-        AXIS2_OM_NODE_ADD_CHILD(out_node , env, body_content_node);
+        AXIOM_NODE_ADD_CHILD(out_node , env, body_content_node);
         status = AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(new_msg_ctx, env, default_envelope);
     }
     else if (soap_fault)

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Mon Jun 12 01:26:30 2006
@@ -25,8 +25,8 @@
 #include <axis2_engine.h>
 #include <axis2_soap_body.h>
 #include <axis2_utils.h>
-#include <axis2_om_namespace.h>
-#include <axis2_om_node.h>
+#include <axiom_namespace.h>
+#include <axiom_node.h>
 #include <axis2_hash.h>
 #include <axis2_soap_const.h>
 #include <axis2_http_header.h>
@@ -67,7 +67,7 @@
                         const axis2_char_t *request_uri,
                         axis2_hash_t *request_params);
     
-AXIS2_EXTERN axis2_om_stax_builder_t*  AXIS2_CALL
+AXIS2_EXTERN axiom_stax_builder_t*  AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
@@ -75,7 +75,7 @@
     
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_is_optimized(const axis2_env_t *env, 
-                                        axis2_om_element_t *om_element);
+                                        axiom_element_t *om_element);
                                                 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_do_write_mtom(const axis2_env_t *env, 
@@ -128,7 +128,7 @@
 {
    axis2_soap_envelope_t *soap_envelope = NULL;
    axis2_soap_builder_t *soap_builder = NULL;
-   axis2_om_stax_builder_t *om_builder = NULL;
+   axiom_stax_builder_t *om_builder = NULL;
    axis2_bool_t is_soap11 = AXIS2_FALSE;
    axis2_xml_reader_t *xml_reader = NULL;
    axis2_char_t *char_set = NULL;
@@ -270,7 +270,7 @@
    AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
                property, AXIS2_TRUE);
 
-   om_builder = axis2_om_stax_builder_create(env, xml_reader);
+   om_builder = axiom_stax_builder_create(env, xml_reader);
    if(NULL == om_builder)
    {
       AXIS2_XML_READER_FREE(xml_reader, env);
@@ -287,7 +287,7 @@
       {
          /* We should not be freeing om_builder here as it is done by
             axis2_soap_builder_create in case of error - Samisa*/
-            /*AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);*/
+            /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
          om_builder = NULL;
          xml_reader = NULL;
          return AXIS2_FAILURE;
@@ -297,7 +297,7 @@
                env);
       if(NULL == soap_envelope)
       {
-         AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);
+         AXIOM_STAX_BUILDER_FREE(om_builder, env);
          om_builder = NULL;
          xml_reader = NULL;
          AXIS2_SOAP_BUILDER_FREE(soap_builder, env);
@@ -316,7 +316,7 @@
          {
              /* We should not be freeing om_builder here as it is done by
                 axis2_soap_builder_create in case of error - Samisa*/
-            /*AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);*/
+            /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
             om_builder = NULL;
             xml_reader = NULL;
             return AXIS2_FAILURE;
@@ -342,13 +342,13 @@
             {
                 /* TODO we have to check for NULLs */
                 axis2_soap_body_t *def_body = NULL;
-                axis2_om_document_t *om_doc = NULL;
-                axis2_om_node_t *root_node = NULL;
+                axiom_document_t *om_doc = NULL;
+                axiom_node_t *root_node = NULL;
                 soap_envelope = axis2_soap_envelope_create_default_soap_envelope
                             (env, AXIS2_SOAP11);
                 def_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-                om_doc = AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
-                root_node = AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+                om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+                root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
                 AXIS2_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
                 AXIS2_MSG_CTX_SET_DOING_REST(msg_ctx, env, AXIS2_TRUE);
             }
@@ -362,8 +362,8 @@
             binary_data_map);
     }
         
-   /* xml_char_set = AXIS2_OM_DOCUMENT_GET_CHARSET_ENC(
-    *               AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(env om_builder),
+   /* xml_char_set = AXIOM_DOCUMENT_GET_CHARSET_ENC(
+    *               AXIOM_STAX_BUILDER_GET_DOCUMENT(env om_builder),
     *               env);
     *
     *if(0 != AXIS2_STRCMP(char_set, xml_char_set))
@@ -374,7 +374,7 @@
     *   envelope = NULL;
     *   AXIS2_XML_READER_FREE(xml_reader, env);
     *   xml_reader = NULL;
-    *   AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);
+    *   AXIOM_STAX_BUILDER_FREE(om_builder, env);
     *   om_builder = NULL;
     *   if(NULL != soap_builder)
     *   {
@@ -497,11 +497,11 @@
 {
    axis2_char_t **values = NULL;
    axis2_soap_envelope_t *envelope = NULL;
-   axis2_om_namespace_t *om_ns = NULL;
-   axis2_om_namespace_t *def_om_ns = NULL;
-   axis2_om_node_t *document_node = NULL;
-   axis2_om_node_t *op_node = NULL;
-   axis2_om_element_t *op_ele = NULL;
+   axiom_namespace_t *om_ns = NULL;
+   axiom_namespace_t *def_om_ns = NULL;
+   axiom_node_t *document_node = NULL;
+   axiom_node_t *op_node = NULL;
+   axiom_element_t *op_ele = NULL;
    axis2_hash_index_t *hi = NULL;
    AXIS2_PARAM_CHECK(env->error, request_uri, NULL);
    AXIS2_PARAM_CHECK(env->error, request_params, NULL);
@@ -530,13 +530,13 @@
    }
    envelope = axis2_soap_envelope_create_default_soap_envelope(env, AXIS2_SOAP12);
     
-   om_ns = axis2_om_namespace_create(env, values[0], "services");
+   om_ns = axiom_namespace_create(env, values[0], "services");
    
-    def_om_ns = axis2_om_namespace_create(env, "", NULL);
+    def_om_ns = axiom_namespace_create(env, "", NULL);
    
     document_node = AXIS2_SOAP_BODY_GET_BASE_NODE(AXIS2_SOAP_ENVELOPE_GET_BODY(
                   envelope, env), env);
-   op_ele = axis2_om_element_create(env, document_node, values[1], om_ns, 
+   op_ele = axiom_element_create(env, document_node, values[1], om_ns, 
                   &op_node);
    
    for(hi = axis2_hash_first(request_params, env); NULL != hi; 
@@ -544,18 +544,18 @@
    {
       void *name = NULL;
       void *value = NULL;
-      axis2_om_element_t *tmp_ele = NULL;
-      axis2_om_node_t *tmp_node = NULL;
+      axiom_element_t *tmp_ele = NULL;
+      axiom_node_t *tmp_node = NULL;
       axis2_hash_this(hi, (const void **)&name, NULL, (void**)&value);
-      tmp_ele = axis2_om_element_create(env, op_node, (axis2_char_t*)name,
+      tmp_ele = axiom_element_create(env, op_node, (axis2_char_t*)name,
                   def_om_ns, &tmp_node);
-      AXIS2_OM_ELEMENT_SET_TEXT(tmp_ele, env, (axis2_char_t*)value, tmp_node);
+      AXIOM_ELEMENT_SET_TEXT(tmp_ele, env, (axis2_char_t*)value, tmp_node);
    }
     return envelope;
 }
 
 
-AXIS2_EXTERN axis2_om_stax_builder_t*  AXIS2_CALL
+AXIS2_EXTERN axiom_stax_builder_t*  AXIS2_CALL
 axis2_http_transport_utils_select_builder_for_mime
                         (const axis2_env_t *env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
@@ -570,7 +570,7 @@
 
 AXIS2_EXTERN axis2_bool_t  AXIS2_CALL 
 axis2_http_transport_utils_is_optimized(const axis2_env_t *env, 
-                                        axis2_om_element_t *om_element)
+                                        axiom_element_t *om_element)
 {
    /*
         TODO implement when MTOM support is added
@@ -1081,7 +1081,7 @@
     else if(AXIS2_TRUE != AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
     {
         axis2_xml_reader_t *xml_reader = NULL;
-        axis2_om_stax_builder_t *om_builder = NULL;
+        axiom_stax_builder_t *om_builder = NULL;
         axis2_soap_builder_t *soap_builder = NULL;
         axis2_soap_envelope_t *soap_envelope = NULL;
         
@@ -1092,7 +1092,7 @@
         {
             return NULL;
         }
-        om_builder = axis2_om_stax_builder_create(env, xml_reader);
+        om_builder = axiom_stax_builder_create(env, xml_reader);
         if(NULL == om_builder)
         {
             AXIS2_XML_READER_FREE(xml_reader, env);
@@ -1105,7 +1105,7 @@
         {
          /* We should not be freeing om_builder here as it is done by
             axis2_soap_builder_create in case of error - Samisa*/
-            /*AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);*/
+            /*AXIOM_STAX_BUILDER_FREE(om_builder, env);*/
             om_builder = NULL;
             xml_reader = NULL;
             return NULL;
@@ -1116,11 +1116,11 @@
     else
     {
         axis2_xml_reader_t *xml_reader = NULL;
-        axis2_om_stax_builder_t *om_builder = NULL;
+        axiom_stax_builder_t *om_builder = NULL;
         axis2_soap_envelope_t *soap_envelope = NULL;
         axis2_soap_body_t *def_body = NULL;
-        axis2_om_document_t *om_doc = NULL;
-        axis2_om_node_t *root_node = NULL;
+        axiom_document_t *om_doc = NULL;
+        axiom_node_t *root_node = NULL;
 
         xml_reader = axis2_xml_reader_create_for_io(env,
                         axis2_http_transport_utils_on_data_request,NULL,
@@ -1129,7 +1129,7 @@
         {
             return NULL;
         }
-        om_builder = axis2_om_stax_builder_create(env, xml_reader);
+        om_builder = axiom_stax_builder_create(env, xml_reader);
         if(NULL == om_builder)
         {
             AXIS2_XML_READER_FREE(xml_reader, env);
@@ -1139,8 +1139,8 @@
         soap_envelope = axis2_soap_envelope_create_default_soap_envelope
                             (env, AXIS2_SOAP11);
         def_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
-        om_doc = AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
-        root_node = AXIS2_OM_DOCUMENT_BUILD_ALL(om_doc, env);
+        om_doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(om_builder, env);
+        root_node = AXIOM_DOCUMENT_BUILD_ALL(om_doc, env);
         AXIS2_SOAP_BODY_ADD_CHILD(def_body, env, root_node);
         return soap_envelope;
     }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon Jun 12 01:26:30 2006
@@ -19,7 +19,7 @@
 #include <axis2_endpoint_ref.h>
 #include <axis2_addr.h>
 #include <axis2_xml_writer.h>
-#include <axis2_om_output.h>
+#include <axiom_output.h>
 #include <axis2_http_transport_utils.h>
 #include <axis2_http_out_transport_info.h>
 #include <axis2_http_transport.h>
@@ -72,7 +72,7 @@
                           const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
                      axis2_endpoint_ref_t *epr, 
                      axis2_soap_envelope_t *out, 
-                     axis2_om_output_t *om_output);
+                     axiom_output_t *om_output);
     
 axis2_status_t AXIS2_CALL 
 axis2_http_transport_sender_free 
@@ -156,12 +156,12 @@
     axis2_endpoint_ref_t *epr = NULL;
     axis2_char_t *transport_url = NULL;
     axis2_xml_writer_t *xml_writer = NULL;
-    axis2_om_output_t *om_output = NULL;
+    axiom_output_t *om_output = NULL;
     axis2_char_t *buffer = NULL;
     axis2_soap_envelope_t *soap_data_out = NULL;
     axis2_bool_t do_mtom;
     axis2_property_t *property = NULL;
-    axis2_om_node_t *data_out = NULL;
+    axiom_node_t *data_out = NULL;
    
    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -246,7 +246,7 @@
     {
         return AXIS2_FAILURE;
     }
-    om_output = axis2_om_output_create(env, xml_writer);
+    om_output = axiom_output_create(env, xml_writer);
     if(NULL == om_output)
     {
         AXIS2_XML_WRITER_FREE(xml_writer, env);
@@ -300,13 +300,13 @@
          {
             AXIS2_ERROR_SET(env->error, 
                      AXIS2_ERROR_OUT_TRNSPORT_INFO_NULL, AXIS2_FAILURE);
-                AXIS2_OM_OUTPUT_FREE(om_output, env);
+                AXIOM_OUTPUT_FREE(om_output, env);
                 om_output = NULL;
                 xml_writer = NULL;
             return AXIS2_FAILURE;
          }
          is_soap11 = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env);
-         /* AXIS2_OM_OUTPUT_SET_SOAP11(om_output, env, is_soap_11);
+         /* AXIOM_OUTPUT_SET_SOAP11(om_output, env, is_soap_11);
           */
          AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CHAR_ENCODING(out_info, env, 
                      char_set_enc);
@@ -322,13 +322,13 @@
             }
             /*
             AXIS2_HTTP_OUT_TRANSPORT_INFO_SET_CONTENT_TYPE(out_info, env, 
-                     AXIS2_OM_OUTPUT_GET_CONTENT_TYPE(om_output, env));*/
-         /* AXIS2_OM_OUTPUT_SET_DO_OPTIMIZE(om_output, env, 
+                     AXIOM_OUTPUT_GET_CONTENT_TYPE(om_output, env));*/
+         /* AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env, 
           *            AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env);
           */
             if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
             {
-                axis2_om_node_t *body_node = NULL;
+                axiom_node_t *body_node = NULL;
                 axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(
                                 soap_data_out, env);
                 
@@ -339,7 +339,7 @@
                                 AXIS2_FAILURE);
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "%s", 
                                 AXIS2_ERROR_GET_MESSAGE(env->error));
-                    AXIS2_OM_OUTPUT_FREE(om_output, env);
+                    AXIOM_OUTPUT_FREE(om_output, env);
                     om_output = NULL;
                     xml_writer = NULL;
                     return AXIS2_FAILURE;
@@ -347,21 +347,21 @@
                 body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body,env);
                 if(NULL == body_node)
                 {
-                    AXIS2_OM_OUTPUT_FREE(om_output, env);
+                    AXIOM_OUTPUT_FREE(om_output, env);
                     om_output = NULL;
                     xml_writer = NULL;
                     return AXIS2_FAILURE;
                 }
-                data_out = AXIS2_OM_NODE_GET_FIRST_CHILD(body_node, env);
-                if(NULL == data_out || AXIS2_OM_NODE_GET_NODE_TYPE(data_out,env)
-                                != AXIS2_OM_ELEMENT)
+                data_out = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+                if(NULL == data_out || AXIOM_NODE_GET_NODE_TYPE(data_out,env)
+                                != AXIOM_ELEMENT)
                 {
-                    AXIS2_OM_OUTPUT_FREE(om_output, env);
+                    AXIOM_OUTPUT_FREE(om_output, env);
                     om_output = NULL;
                     xml_writer = NULL;
                     return AXIS2_FAILURE;
                 }
-                AXIS2_OM_NODE_SERIALIZE(data_out, env, om_output);
+                AXIOM_NODE_SERIALIZE(data_out, env, om_output);
                 buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
             }
             else
@@ -392,7 +392,7 @@
             
       }
    }
-   AXIS2_OM_OUTPUT_FREE(om_output, env);
+   AXIOM_OUTPUT_FREE(om_output, env);
    om_output = NULL;
    xml_writer = NULL;
 
@@ -530,7 +530,7 @@
                           const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
                      axis2_endpoint_ref_t *epr, 
                      axis2_soap_envelope_t *out, 
-                     axis2_om_output_t *om_output)
+                     axiom_output_t *om_output)
 {
    const axis2_char_t *soap_action = NULL;
    axis2_char_t *url = NULL;
@@ -554,8 +554,8 @@
    }
    if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
     {
-        axis2_om_node_t *data_out = NULL;
-        axis2_om_node_t *body_node = NULL;
+        axiom_node_t *data_out = NULL;
+        axiom_node_t *body_node = NULL;
         axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(out, env);
         axis2_rest_sender_t *sender = NULL;
         
@@ -573,9 +573,9 @@
         {
             return AXIS2_FAILURE;
         }
-        data_out = AXIS2_OM_NODE_GET_FIRST_CHILD(body_node, env);
-        if(NULL == data_out || AXIS2_OM_NODE_GET_NODE_TYPE(data_out, env)
-                        != AXIS2_OM_ELEMENT)
+        data_out = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+        if(NULL == data_out || AXIOM_NODE_GET_NODE_TYPE(data_out, env)
+                        != AXIOM_ELEMENT)
         {
             return AXIS2_FAILURE;
         }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c Mon Jun 12 01:26:30 2006
@@ -18,7 +18,7 @@
 #include <axis2_string.h>
 #include <axis2_http_transport.h>
 #include <string.h>
-#include <axis2_om_output.h>
+#include <axiom_output.h>
 #include <axis2_op_ctx.h>
 #include <axis2_ctx.h>
 #include <axis2_http_client.h>
@@ -40,7 +40,7 @@
    axis2_bool_t chunked;
    int so_timeout;
    int connection_timeout;
-   axis2_om_output_t *om_output;
+   axiom_output_t *om_output;
    axis2_http_client_t *client;
 };
 
@@ -65,7 +65,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_rest_sender_send(axis2_rest_sender_t *sender, 
                   const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
-                  axis2_om_node_t *out, axis2_char_t *str_url);
+                  axiom_node_t *out, axis2_char_t *str_url);
 
 axis2_status_t AXIS2_CALL 
 axis2_rest_sender_set_chunked(axis2_rest_sender_t *sender, 
@@ -73,7 +73,7 @@
 
 axis2_status_t AXIS2_CALL 
 axis2_rest_sender_set_om_output(axis2_rest_sender_t *sender, 
-                  const axis2_env_t *env, axis2_om_output_t *om_output);
+                  const axis2_env_t *env, axiom_output_t *om_output);
                   
 axis2_status_t AXIS2_CALL
 axis2_rest_sender_set_http_version(axis2_rest_sender_t *sender, 
@@ -158,7 +158,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_rest_sender_send(axis2_rest_sender_t *sender, 
                   const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx,
-                  axis2_om_node_t *out, axis2_char_t *str_url)
+                  axiom_node_t *out, axis2_char_t *str_url)
 {
    axis2_http_simple_request_t *request = NULL;
    axis2_http_request_line_t *request_line = NULL;
@@ -213,7 +213,7 @@
                   AXIS2_FAILURE);
       return AXIS2_FAILURE;
    }
-   xml_writer = AXIS2_OM_OUTPUT_GET_XML_WRITER(sender_impl->om_output, env);
+   xml_writer = AXIOM_OUTPUT_GET_XML_WRITER(sender_impl->om_output, env);
    
    property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                      AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
@@ -226,10 +226,10 @@
    {
       char_set_enc = AXIS2_DEFAULT_CHAR_SET_ENCODING;
    }
-   /* AXIS2_OM_OUTPUT_SET_DO_OPTIMIZE(om_output, env, 
+   /* AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env, 
     *            AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env);
     */
-   AXIS2_OM_NODE_SERIALIZE (out, env, sender_impl->om_output);
+   AXIOM_NODE_SERIALIZE (out, env, sender_impl->om_output);
    buffer = AXIS2_XML_WRITER_GET_XML(xml_writer, env);
 
     if(NULL == buffer)
@@ -345,7 +345,7 @@
 
 axis2_status_t AXIS2_CALL 
 axis2_rest_sender_set_om_output(axis2_rest_sender_t *sender, 
-                  const axis2_env_t *env, axis2_om_output_t *om_output)
+                  const axis2_env_t *env, axiom_output_t *om_output)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(sender)->om_output = om_output;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Mon Jun 12 01:26:30 2006
@@ -18,7 +18,7 @@
 #include <axis2_string.h>
 #include <axis2_http_transport.h>
 #include <string.h>
-#include <axis2_om_output.h>
+#include <axiom_output.h>
 #include <axis2_op_ctx.h>
 #include <axis2_ctx.h>
 #include <axis2_http_client.h>
@@ -41,7 +41,7 @@
    axis2_bool_t chunked;
    int so_timeout;
    int connection_timeout;
-   axis2_om_output_t *om_output;
+   axiom_output_t *om_output;
    axis2_http_client_t *client;
 };
 
@@ -82,7 +82,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_soap_over_http_sender_set_om_output
                   (axis2_soap_over_http_sender_t *sender, 
-                  const axis2_env_t *env, axis2_om_output_t *om_output);
+                  const axis2_env_t *env, axiom_output_t *om_output);
                   
 axis2_status_t AXIS2_CALL
 axis2_soap_over_http_sender_set_http_version
@@ -245,7 +245,7 @@
                   AXIS2_FAILURE);
       return AXIS2_FAILURE;
    }
-   xml_writer = AXIS2_OM_OUTPUT_GET_XML_WRITER(sender_impl->om_output, env);
+   xml_writer = AXIOM_OUTPUT_GET_XML_WRITER(sender_impl->om_output, env);
    
    property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
                      AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
@@ -259,7 +259,7 @@
       char_set_enc = AXIS2_DEFAULT_CHAR_SET_ENCODING;
    }
    
-    AXIS2_OM_OUTPUT_SET_DO_OPTIMIZE(sender_impl->om_output, env, 
+    AXIOM_OUTPUT_SET_DO_OPTIMIZE(sender_impl->om_output, env, 
                doing_mtom);
    
    AXIS2_SOAP_ENVELOPE_SERIALIZE (out, env, sender_impl->om_output, 
@@ -267,7 +267,7 @@
 
     if (doing_mtom)
     {
-        AXIS2_OM_OUTPUT_FLUSH(sender_impl->om_output, env, &output_stream,
+        AXIOM_OUTPUT_FLUSH(sender_impl->om_output, env, &output_stream,
                                     &output_stream_size);
     }
     else
@@ -339,7 +339,7 @@
    /* TODO we need to set the content type with soap action header for soap12*/
     if (doing_mtom)
     {
-        content_type = (axis2_char_t *)AXIS2_OM_OUTPUT_GET_CONTENT_TYPE(sender_impl->om_output, 
+        content_type = (axis2_char_t *)AXIOM_OUTPUT_GET_CONTENT_TYPE(sender_impl->om_output, 
                         env);
     }
    else if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
@@ -459,7 +459,7 @@
 axis2_status_t AXIS2_CALL 
 axis2_soap_over_http_sender_set_om_output
                   (axis2_soap_over_http_sender_t *sender, 
-                  const axis2_env_t *env, axis2_om_output_t *om_output)
+                  const axis2_env_t *env, axiom_output_t *om_output)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(sender)->om_output = om_output;
@@ -697,8 +697,8 @@
         if(NULL != transport_attrs)
         {
             axis2_generic_obj_t *obj = NULL;
-            axis2_om_attribute_t *host_attr = NULL;
-            axis2_om_attribute_t *port_attr = NULL;
+            axiom_attribute_t *host_attr = NULL;
+            axiom_attribute_t *port_attr = NULL;
             axis2_char_t *proxy_host = NULL;
             axis2_char_t *proxy_port = NULL;
             
@@ -708,13 +708,13 @@
             {
                 return AXIS2_FAILURE;
             }
-            host_attr = (axis2_om_attribute_t*)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
+            host_attr = (axiom_attribute_t*)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
                         env);
             if(NULL == host_attr)
             {
                 return AXIS2_FAILURE;
             }
-            proxy_host = AXIS2_OM_ATTRIBUTE_GET_VALUE(host_attr, env);
+            proxy_host = AXIOM_ATTRIBUTE_GET_VALUE(host_attr, env);
             if(NULL == proxy_host)
             {
                 return AXIS2_FAILURE;
@@ -724,13 +724,13 @@
             
             obj = axis2_hash_get(transport_attrs, AXIS2_PROXY_HOST_PORT,
                         AXIS2_HASH_KEY_STRING);
-            port_attr = (axis2_om_attribute_t*)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
+            port_attr = (axiom_attribute_t*)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
                         env);
             if(NULL == port_attr)
             {
                 return AXIS2_FAILURE;
             }
-            proxy_port = AXIS2_OM_ATTRIBUTE_GET_VALUE(port_attr, env);
+            proxy_port = AXIOM_ATTRIBUTE_GET_VALUE(port_attr, env);
             if(NULL == proxy_port)
             {
                 return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=413606&r1=413605&r2=413606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Jun 12 01:26:30 2006
@@ -196,27 +196,27 @@
                        axis2_soap_header_t *soap_header, 
                        axis2_msg_ctx_t *msg_ctx)
 {
-    axis2_om_node_t *node = NULL;
-    axis2_om_element_t *element = NULL;
+    axiom_node_t *node = NULL;
+    axiom_element_t *element = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
-    if (node && AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+    if (node && AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
     {
         axis2_qname_t *qname = NULL;
-        element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+        element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
         qname = axis2_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI,
             AXIS2_NAMESPACE_PREFIX);
         if (qname)
         {
-            axis2_om_node_t *child_node = NULL;
-            axis2_om_element_t *child_element = NULL;
-            child_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, env, qname, node, &child_node);
+            axiom_node_t *child_node = NULL;
+            axiom_element_t *child_element = NULL;
+            child_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, env, qname, node, &child_node);
             if (child_element)
             {
                 axis2_conf_ctx_t * conf_ctx = NULL;
-                axis2_char_t *grp_id = AXIS2_OM_ELEMENT_GET_TEXT(child_element, env,
+                axis2_char_t *grp_id = AXIOM_ELEMENT_GET_TEXT(child_element, env,
                     child_node);
                 conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
                 if (conf_ctx && grp_id)
@@ -309,8 +309,8 @@
     {   
         void *hb = NULL;
         axis2_soap_header_block_t *header_block =    NULL;
-        axis2_om_node_t *header_block_node = NULL;
-        axis2_om_element_t *header_block_ele = NULL;
+        axiom_node_t *header_block_node = NULL;
+        axiom_element_t *header_block_ele = NULL;
         axis2_char_t *ele_localname = NULL;
         axis2_endpoint_ref_t *epr = NULL;        
         axis2_char_t *role = NULL;
@@ -319,8 +319,8 @@
         
         header_block = (axis2_soap_header_block_t *)hb;
         header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
-        header_block_ele  = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env);
-        ele_localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(header_block_ele, env);
+        header_block_ele  = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+        ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(header_block_ele, env);
 
         role = AXIS2_SOAP_HEADER_BLOCK_GET_ROLE(header_block, env);
         if (role && AXIS2_STRCMP(role, AXIS2_SOAP12_SOAP_ROLE_NONE) == 0)
@@ -333,7 +333,7 @@
         {
              /* here the addressing epr overidde what ever already there in the message context */   
                 
-            epr = axis2_endpoint_ref_create(env, AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node));
+            epr = axis2_endpoint_ref_create(env, AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node));
             if (to_found == AXIS2_TRUE)
             {
                 /* Duplicate To */
@@ -421,7 +421,7 @@
                 continue;
             }
             
-            text = AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            text = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
             AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, text);
             AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);              
             msg_id_found = AXIS2_TRUE;
@@ -439,7 +439,7 @@
                 continue;
             }
             
-            text = AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            text = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
             AXIS2_MSG_INFO_HEADERS_SET_ACTION(msg_info_headers, env, text); 
             AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);       
             action_found = AXIS2_TRUE;
@@ -448,7 +448,7 @@
         {
             axis2_char_t *address = NULL;
             axis2_qname_t *rqn = NULL;
-            axis2_om_attribute_t *relationship_type = NULL;
+            axiom_attribute_t *relationship_type = NULL;
             const axis2_char_t *relationship_type_default_value =  NULL;
             const axis2_char_t *relationship_type_value = NULL;
             axis2_relates_to_t *relates_to =  NULL;
@@ -463,7 +463,7 @@
             }                
             rqn = axis2_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL);
             
-            relationship_type = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, rqn);
+            relationship_type = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, rqn);
             
             if(!relationship_type)
             {
@@ -472,10 +472,10 @@
             }
             else 
             {
-                relationship_type_value = AXIS2_OM_ATTRIBUTE_GET_VALUE(relationship_type, env);    
+                relationship_type_value = AXIOM_ATTRIBUTE_GET_VALUE(relationship_type, env);    
             }
             
-            address = AXIS2_OM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
+            address = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
             relates_to = axis2_relates_to_create(env, address, relationship_type_value);
             AXIS2_MSG_INFO_HEADERS_SET_RELATES_TO(msg_info_headers, env, relates_to);
             AXIS2_SOAP_HEADER_BLOCK_SET_PRECESSED(header_block, env);       
@@ -503,52 +503,52 @@
     axis2_qname_t *epr_addr_qn = NULL;
     axis2_qname_t *epr_ref_qn = NULL;
     axis2_qname_t *wsa_meta_qn = NULL;
-    axis2_om_node_t *header_block_node = NULL;
-    axis2_om_element_t *header_block_ele = NULL;
-    axis2_om_child_element_iterator_t *child_ele_iter = NULL;
+    axiom_node_t *header_block_node = NULL;
+    axiom_element_t *header_block_ele = NULL;
+    axiom_child_element_iterator_t *child_ele_iter = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, soap_header_block, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, endpoint_ref, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, addr_ns_str, AXIS2_FAILURE);
     
     header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(soap_header_block, env);
-    header_block_ele  = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+    header_block_ele  = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
     
     
-    child_ele_iter = AXIS2_OM_ELEMENT_GET_CHILD_ELEMENTS(header_block_ele, env, header_block_node);
+    child_ele_iter = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(header_block_ele, env, header_block_node);
     if(!child_ele_iter)
         return AXIS2_FAILURE;
     epr_addr_qn = axis2_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL); 
     epr_ref_qn = axis2_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL);
     wsa_meta_qn = axis2_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL);
-    while(AXIS2_OM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(child_ele_iter, env))
+    while(AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(child_ele_iter, env))
     {
-        axis2_om_node_t *child_node = NULL;
-        axis2_om_element_t *child_ele = NULL;
+        axiom_node_t *child_node = NULL;
+        axiom_element_t *child_ele = NULL;
         axis2_qname_t *child_qn = NULL;
-        child_node = AXIS2_OM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env);
-        child_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(child_node, env);
+        child_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env);
+        child_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
        
         
-        child_qn = AXIS2_OM_ELEMENT_GET_QNAME(child_ele, env, child_node);
+        child_qn = AXIOM_ELEMENT_GET_QNAME(child_ele, env, child_node);
         if(axis2_addr_in_check_element(env, epr_addr_qn, child_qn ))
         {
             AXIS2_ENDPOINT_REF_SET_ADDRESS(endpoint_ref, env,
-                AXIS2_OM_ELEMENT_GET_TEXT(child_ele, env, child_node));            
+                AXIOM_ELEMENT_GET_TEXT(child_ele, env, child_node));            
         }
         else if(axis2_addr_in_check_element(env, epr_ref_qn , child_qn))
         {
-            axis2_om_child_element_iterator_t *ref_param_iter = NULL;       
+            axiom_child_element_iterator_t *ref_param_iter = NULL;       
             
-            ref_param_iter = AXIS2_OM_ELEMENT_GET_CHILD_ELEMENTS(child_ele, env, child_node);
+            ref_param_iter = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(child_ele, env, child_node);
             if(ref_param_iter)
             {
-                while(AXIS2_OM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(ref_param_iter, env))
+                while(AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(ref_param_iter, env))
                 {
-                   axis2_om_node_t *om_node =  NULL;
-                   axis2_om_element_t *om_ele = NULL;
-                   om_node = AXIS2_OM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env);
-                   om_ele  = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(om_node, env);
+                   axiom_node_t *om_node =  NULL;
+                   axiom_element_t *om_ele = NULL;
+                   om_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(ref_param_iter, env);
+                   om_ele  = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
                 }                    
             }
             
@@ -586,8 +586,8 @@
     {   
         void *hb = NULL;
         axis2_soap_header_block_t *header_block =    NULL;
-        axis2_om_node_t *header_block_node = NULL;
-        axis2_om_element_t *header_block_ele = NULL;
+        axiom_node_t *header_block_node = NULL;
+        axiom_element_t *header_block_ele = NULL;
         
         axis2_hash_this(hash_index, NULL, NULL, &hb);
         
@@ -595,15 +595,15 @@
         header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
         
         if(header_block_node && 
-            (AXIS2_OM_NODE_GET_NODE_TYPE(header_block_node, env) == AXIS2_OM_ELEMENT))
+            (AXIOM_NODE_GET_NODE_TYPE(header_block_node, env) == AXIOM_ELEMENT))
         {
-            axis2_om_attribute_t *om_attr = NULL;
+            axiom_attribute_t *om_attr = NULL;
             axis2_char_t *attr_value = NULL;
-            header_block_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env);
-            om_attr = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, wsa_qname);
+            header_block_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+            om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, wsa_qname);
             if(om_attr)
             {
-                attr_value = AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+                attr_value = AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
                 if(AXIS2_STRCMP(attr_value, AXIS2_WSA_TYPE_ATTRIBUTE_VALUE) == 0)
                 {
                     AXIS2_MSG_INFO_HEADERS_ADD_REF_PARAM(msg_info_headers, env, header_block_node);    
@@ -644,11 +644,11 @@
     for(hash_index = axis2_hash_first(header_blocks_ht, env); hash_index;
             hash_index = axis2_hash_next( env, hash_index))
     {
-        axis2_om_element_t *header_block_ele = NULL;
-        axis2_om_node_t *header_block_node = NULL;
+        axiom_element_t *header_block_ele = NULL;
+        axiom_node_t *header_block_node = NULL;
         axis2_soap_header_block_t *header_block = NULL;
         void *hb = NULL;
-        axis2_om_attribute_t *is_ref_param_attr = NULL;
+        axiom_attribute_t *is_ref_param_attr = NULL;
         axis2_char_t *attr_value = NULL;
         
         axis2_hash_this(hash_index, NULL, NULL, &hb);
@@ -656,12 +656,12 @@
         {
               header_block = (axis2_soap_header_block_t*)hb; 
               header_block_node = AXIS2_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
-              header_block_ele = (axis2_om_element_t*)
-                    AXIS2_OM_NODE_GET_DATA_ELEMENT(header_block_node, env);
-              is_ref_param_attr  = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, is_ref_qn);
+              header_block_ele = (axiom_element_t*)
+                    AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
+              is_ref_param_attr  = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, is_ref_qn);
               if(is_ref_param_attr)
               {
-                    attr_value = AXIS2_OM_ATTRIBUTE_GET_LOCALNAME(is_ref_param_attr, env);
+                    attr_value = AXIOM_ATTRIBUTE_GET_LOCALNAME(is_ref_param_attr, env);
                     if(AXIS2_STRCMP("true", attr_value) == 0)
                     {
                         AXIS2_ENDPOINT_REF_ADD_REF_PARAM(to_epr, env, header_block_node);
@@ -708,9 +708,9 @@
     axis2_soap_envelope_t *envelope = NULL;
     axis2_array_list_t *sub_codes = NULL;
     int soap_version = AXIS2_SOAP12;
-    axis2_om_node_t* text_om_node = NULL;
-    axis2_om_element_t * text_om_ele = NULL;
-    axis2_om_namespace_t *ns1 = NULL;
+    axiom_node_t* text_om_node = NULL;
+    axiom_element_t * text_om_ele = NULL;
+    axiom_namespace_t *ns1 = NULL;
 
     if (AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
     {
@@ -718,9 +718,9 @@
     }
     
 
-    ns1 = axis2_om_namespace_create (env, addr_ns_str, "wsa");
-    text_om_ele = axis2_om_element_create(env, NULL, "ProblemHeaderQName", ns1, &text_om_node);
-    AXIS2_OM_ELEMENT_SET_TEXT(text_om_ele, env, header_name, text_om_node);
+    ns1 = axiom_namespace_create (env, addr_ns_str, "wsa");
+    text_om_ele = axiom_element_create(env, NULL, "ProblemHeaderQName", ns1, &text_om_node);
+    AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, header_name, text_om_node);
 
     sub_codes = axis2_array_list_create(env, 2);
     if (sub_codes)



---------------------------------------------------------------------
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