axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r419502 - in /webservices/axis2/trunk/c/woden/src: builder/wsdl10/ wsdl10/ wsdl10/extensions/ wsdl10/extensions/soap/
Date Thu, 06 Jul 2006 09:42:32 GMT
Author: damitha
Date: Thu Jul  6 02:42:31 2006
New Revision: 419502

URL: http://svn.apache.org/viewvc?rev=419502&view=rev
Log:
More refactoring

Modified:
    webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/ext_registry.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_ref_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_msg_ref_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_op_exts.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
    webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
    webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Thu Jul  6 02:42:31 2006
@@ -642,7 +642,7 @@
     AXIS2_PARAM_CHECK(env->error, desc_el_node, NULL);
     reader_impl = INTF_TO_IMPL(reader);
 
-    qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DEFINITIONS);
+    qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
     check_element_qname(reader, env, desc_el_node, qname);
     
     desc = woden_wsdl10_desc_create(env);
@@ -668,7 +668,7 @@
 
     desc_el = AXIOM_NODE_GET_DATA_ELEMENT(desc_el_node, env);
     target_namespc = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(desc_el, 
-            env, WODEN_ATTR_TARGET_NAMESPACE); 
+            env, WODEN_WSDL10_ATTR_TARGET_NAMESPACE); 
     
     if(NULL != target_namespc)
     {
@@ -697,9 +697,9 @@
         local_part = AXIOM_ATTRIBUTE_GET_LOCALNAME(attr, env);
         value = AXIOM_ATTRIBUTE_GET_VALUE(attr, env);
         uri = get_uri(reader, env, value);
-        if(0 == AXIS2_STRCMP(WODEN_NS_URI_XMLNS, namespc_uri))
+        if(0 == AXIS2_STRCMP(WODEN_WSDL10_NS_URI_XMLNS, namespc_uri))
         {
-            if(0 == AXIS2_STRCMP(WODEN_ATTR_XMLNS, local_part))
+            if(0 == AXIS2_STRCMP(WODEN_WSDL10_ATTR_XMLNS, local_part))
             {
                 WODEN_WSDL10_DESC_ELEMENT_ADD_NAMESPACE(desc, env, local_part, uri); 
                     /* a prefixed namespace */
@@ -734,14 +734,14 @@
         axis2_qname_t *q_elem_binding = NULL;
         axis2_qname_t *q_elem_svc = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_import = axis2_qname_create_from_string(env, WODEN_Q_ELEM_IMPORT);
-        q_elem_include = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INCLUDE);
-        q_elem_types = axis2_qname_create_from_string(env, WODEN_Q_ELEM_TYPES);
-        q_elem_msg_ref = axis2_qname_create_from_string(env, WODEN_Q_ELEM_MSG_REF);
-        q_elem_interface = axis2_qname_create_from_string(env, WODEN_Q_ELEM_INTERFACE);
-        q_elem_binding = axis2_qname_create_from_string(env, WODEN_Q_ELEM_BINDING);
-        q_elem_svc = axis2_qname_create_from_string(env, WODEN_Q_ELEM_SERVICE);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_import = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_IMPORT);
+        q_elem_include = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INCLUDE);
+        q_elem_types = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_TYPES);
+        q_elem_msg_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_MSG_REF);
+        q_elem_interface = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_INTERFACE);
+        q_elem_binding = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_BINDING);
+        q_elem_svc = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SERVICE);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -866,7 +866,7 @@
        
         types = WODEN_WSDL10_DESC_ELEMENT_CREATE_TYPES_ELEMENT(desc, env);
         types = woden_types_to_types_element(types, env);
-        WODEN_TYPES_ELEMENT_SET_TYPE_SYSTEM(types, env, WODEN_TYPE_XSD_2001);
+        WODEN_TYPES_ELEMENT_SET_TYPE_SYSTEM(types, env, WODEN_WSDL10_TYPE_XSD_2001);
         WODEN_WSDL10_DESC_ELEMENT_SET_TYPES_ELEMENT(desc, env, types);
     }
     schema_ns = axiom_namespace_create(env, 
@@ -961,9 +961,9 @@
     import_el = AXIOM_NODE_GET_DATA_ELEMENT(import_el_node, env);
     
     namespc_uri = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env, 
-            WODEN_ATTR_NAMESPACE); 
+            WODEN_WSDL10_ATTR_NAMESPACE); 
     location_uri = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env, 
-            WODEN_ATTR_LOCATION); 
+            WODEN_WSDL10_ATTR_LOCATION); 
   
     imp = woden_import_to_attr_extensible(imp, env);
     status = parse_ext_attributes(reader, env, import_el_node, "import_element", imp, desc);
@@ -1014,7 +1014,7 @@
     include_el = AXIOM_NODE_GET_DATA_ELEMENT(include_el_node, env);
     
     location_uri = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(include_el, env, 
-            WODEN_ATTR_LOCATION); 
+            WODEN_WSDL10_ATTR_LOCATION); 
   
     include = woden_include_to_attr_extensible(include, env);
     status = parse_ext_attributes(reader, env, include_el_node, "include_element", 
@@ -1061,7 +1061,7 @@
     desc = woden_wsdl10_desc_to_desc_element(desc, env);
     types = WODEN_WSDL10_DESC_ELEMENT_CREATE_TYPES_ELEMENT(desc, env);
     types = woden_types_to_types_element(types, env);
-    WODEN_TYPES_ELEMENT_SET_TYPE_SYSTEM(types, env, WODEN_TYPE_XSD_2001);
+    WODEN_TYPES_ELEMENT_SET_TYPE_SYSTEM(types, env, WODEN_WSDL10_TYPE_XSD_2001);
  
     types = woden_types_to_attr_extensible(types, env); 
     status = parse_ext_attributes(reader, env, types_el_node, "types_element", 
@@ -1080,7 +1080,7 @@
 
         q_temp_el_type = axis2_qname_util_new_qname(env, temp_el_node);
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -1158,10 +1158,10 @@
     schema = woden_inlined_schema_create(env);
     schema_el = AXIOM_NODE_GET_DATA_ELEMENT(schema_el_node, env);
     attr_id = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(schema_el, env, 
-            WODEN_ATTR_ID); 
+            WODEN_WSDL10_ATTR_ID); 
     WODEN_INLINED_SCHEMA_SET_ID(schema, env, attr_id);
     tns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(schema_el, env, 
-            WODEN_ATTR_TARGET_NAMESPACE); 
+            WODEN_WSDL10_ATTR_TARGET_NAMESPACE); 
    
     if(NULL != tns)
     {
@@ -1246,7 +1246,7 @@
         return NULL;
     import_el = AXIOM_NODE_GET_DATA_ELEMENT(import_el_node, env);
     ns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env, 
-            WODEN_ATTR_NAMESPACE);
+            WODEN_WSDL10_ATTR_NAMESPACE);
     if(NULL != ns)
     {
         uri = get_uri(reader, env, ns);
@@ -1367,7 +1367,7 @@
     msg = WODEN_WSDL10_DESC_ELEMENT_CREATE_MSG_ELEMENT(desc, env);
 
     msg_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -1404,8 +1404,8 @@
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_part = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_part = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PART);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_part = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PART);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -1486,12 +1486,12 @@
     
     part_el = AXIOM_NODE_GET_DATA_ELEMENT(part_el_node, env);
     localname = AXIOM_ELEMENT_GET_LOCALNAME(part_el, env);
-    if(0 != AXIS2_STRCMP(WODEN_ELEM_PART, localname))
+    if(0 != AXIS2_STRCMP(WODEN_WSDL10_ELEM_PART, localname))
     {
         /* TODO Set No element error */
         return NULL;
     }
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -1505,7 +1505,7 @@
         part = woden_wsdl10_part_to_part_element(part, env);
         WODEN_WSDL10_PART_ELEMENT_SET_QNAME(part, env, qname);
     }
-    element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_ATTR_ELEMENT);
+    element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_WSDL10_ATTR_ELEMENT);
     
     if(NULL != element)
     {
@@ -1535,7 +1535,7 @@
         axis2_qname_t *q_elem_documentation = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -1593,7 +1593,7 @@
     intface = WODEN_WSDL10_DESC_ELEMENT_CREATE_INTERFACE_ELEMENT(desc, env);
 
     interface_el = AXIOM_NODE_GET_DATA_ELEMENT(interface_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -1609,7 +1609,7 @@
     }
     
     style_default = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el, 
-            env, WODEN_ATTR_STYLE_DEFAULT);
+            env, WODEN_WSDL10_ATTR_STYLE_DEFAULT);
     
     if(NULL != style_default)
     {
@@ -1654,10 +1654,10 @@
         axis2_qname_t *q_elem_feature = NULL;
         axis2_qname_t *q_elem_property = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
-        q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
-        q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_op = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
+        q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+        q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -1752,7 +1752,7 @@
     WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent); 
 
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_NAME);
     
     if(NULL != name)
     {
@@ -1767,7 +1767,7 @@
         WODEN_INTERFACE_OP_ELEMENT_SET_QNAME(op, env, qname);
     }
     
-    style = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_STYLE);
+    style = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_STYLE);
     
     if(NULL != style)
     {
@@ -1787,7 +1787,7 @@
         }
     }
      
-    pat = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_PATTERN);
+    pat = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_PATTERN);
     
     if(NULL != pat)
     {
@@ -1823,19 +1823,19 @@
         axis2_qname_t *q_elem_outfault = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
         q_elem_feature = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_FEATURE);
+                WODEN_WSDL10_Q_ELEM_FEATURE);
         q_elem_property = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_PROPERTY);
+                WODEN_WSDL10_Q_ELEM_PROPERTY);
         q_elem_input = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_INPUT);
+                WODEN_WSDL10_Q_ELEM_INPUT);
         q_elem_output = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_OUTPUT);
+                WODEN_WSDL10_Q_ELEM_OUTPUT);
         q_elem_infault = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_INFAULT);
+                WODEN_WSDL10_Q_ELEM_INFAULT);
         q_elem_outfault = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_OUTFAULT);
+                WODEN_WSDL10_Q_ELEM_OUTFAULT);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -1956,14 +1956,14 @@
 
     fault_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_ref_el_node, env);
     localname = AXIOM_ELEMENT_GET_LOCALNAME(fault_ref_el, env);
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_INFAULT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INFAULT, localname))
     {
         woden_direction_t *direction_in = NULL;
         
         direction_in = woden_direction_get_direction_in(env);
         WODEN_WSDL10_INTERFACE_FAULT_REF_ELEMENT_SET_DIRECTION(fault_ref, env, direction_in);
     }
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTFAULT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTFAULT, localname))
     {
         woden_direction_t *direction_out = NULL;
         
@@ -1973,7 +1973,7 @@
         WODEN_WSDL10_INTERFACE_FAULT_REF_ELEMENT_SET_DIRECTION(fault_ref, env, direction_out);
     }
          
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_NAME);
     if(NULL != name)
     {
         axis2_qname_t *qname = NULL;
@@ -1989,7 +1989,7 @@
         WODEN_WSDL10_INTERFACE_FAULT_REF_ELEMENT_SET_QNAME(fault_ref, env, qname);
     }
 
-    msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_ATTR_MSG);
+    msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_MSG);
     if(NULL != msg)
     {
         axis2_qname_t *qname = NULL;
@@ -2019,7 +2019,7 @@
         axis2_qname_t *q_elem_documentation = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -2086,7 +2086,7 @@
     
     msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
     localname = AXIOM_ELEMENT_GET_LOCALNAME(msg_ref_el, env);
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_INPUT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INPUT, localname))
     {
         woden_direction_t *direction_in = NULL;
         
@@ -2095,7 +2095,7 @@
                 msg_ref, env);
         WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
     }
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTPUT, localname))
     {
         woden_direction_t *direction_out = NULL;
         
@@ -2105,7 +2105,7 @@
         WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_out);
     }
         
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_WSDL10_ATTR_NAME);
     if(NULL != name)
     {
         axis2_qname_t *qname = NULL;
@@ -2120,7 +2120,7 @@
         WODEN_WSDL10_INTERFACE_MSG_REF_ELEMENT_SET_QNAME(msg_ref, env, qname);
     }
 
-    msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_ATTR_MSG);
+    msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_WSDL10_ATTR_MSG);
     if(NULL != msg)
     {
         axis2_qname_t *qname = NULL;
@@ -2166,7 +2166,7 @@
         axis2_qname_t *q_elem_documentation = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -2229,7 +2229,7 @@
     binding = WODEN_WSDL10_DESC_ELEMENT_CREATE_BINDING_ELEMENT(desc, env);
 
     binding_el = AXIOM_NODE_GET_DATA_ELEMENT(binding_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -2244,7 +2244,7 @@
         WODEN_BINDING_ELEMENT_SET_QNAME(binding, env, qname);
     }
  
-    intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_INTERFACE);
+    intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_INTERFACE);
     if(NULL != intface)
     {
         axis2_hash_t *namespcs = NULL;
@@ -2279,7 +2279,7 @@
         }
     }
     
-    type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_TYPE);
+    type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_TYPE);
     
     if(NULL != type)
     {
@@ -2316,10 +2316,10 @@
         axis2_qname_t *q_elem_feature = NULL;
         axis2_qname_t *q_elem_property = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_op = axis2_qname_create_from_string(env, WODEN_Q_ELEM_OPERATION);
-        q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
-        q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_op = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_OPERATION);
+        q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+        q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -2409,7 +2409,7 @@
     WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent); 
 
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_NAME);
     
     if(NULL != name)
     {
@@ -2478,19 +2478,19 @@
         axis2_qname_t *q_elem_outfault = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
         q_elem_feature = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_FEATURE);
+                WODEN_WSDL10_Q_ELEM_FEATURE);
         q_elem_property = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_PROPERTY);
+                WODEN_WSDL10_Q_ELEM_PROPERTY);
         q_elem_input = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_INPUT);
+                WODEN_WSDL10_Q_ELEM_INPUT);
         q_elem_output = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_OUTPUT);
+                WODEN_WSDL10_Q_ELEM_OUTPUT);
         q_elem_infault = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_INFAULT);
+                WODEN_WSDL10_Q_ELEM_INFAULT);
         q_elem_outfault = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_OUTFAULT);
+                WODEN_WSDL10_Q_ELEM_OUTFAULT);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -2604,8 +2604,8 @@
     WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(nested_configurable, env, parent); 
 
     fault_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_ref_el_node, env);
-    attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
-    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_ATTR_REF);
+    attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
+    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_REF);
     
     if(NULL != ref)
     {
@@ -2620,7 +2620,7 @@
     }
     
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, 
-            WODEN_ATTR_MESSAGE_LABEL);
+            WODEN_WSDL10_ATTR_MESSAGE_LABEL);
     
     if(NULL != msg_label_str)
     {
@@ -2740,11 +2740,11 @@
         axis2_qname_t *q_elem_property = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
         q_elem_feature = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_FEATURE);
+                WODEN_WSDL10_Q_ELEM_FEATURE);
         q_elem_property = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_PROPERTY);
+                WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -2829,7 +2829,7 @@
 
     msg_ref_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_ref_el_node, env);
     localname = AXIOM_ELEMENT_GET_LOCALNAME(msg_ref_el, env);
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_INPUT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_INPUT, localname))
     {
         woden_direction_t *direction_in = NULL;
         
@@ -2837,7 +2837,7 @@
         msg_ref = woden_wsdl10_binding_msg_ref_to_binding_msg_ref_element(msg_ref, env);
         WODEN_WSDL10_BINDING_MSG_REF_ELEMENT_SET_DIRECTION(msg_ref, env, direction_in);
     }
-    if(0 == AXIS2_STRCMP(WODEN_ELEM_OUTPUT, localname))
+    if(0 == AXIS2_STRCMP(WODEN_WSDL10_ELEM_OUTPUT, localname))
     {
         woden_direction_t *direction_out = NULL;
         
@@ -2847,7 +2847,7 @@
     }
     
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, 
-            WODEN_ATTR_NAME);
+            WODEN_WSDL10_ATTR_NAME);
     
     if(NULL != name)
     {
@@ -2926,11 +2926,11 @@
         axis2_qname_t *q_elem_property = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
         q_elem_feature = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_FEATURE);
+                WODEN_WSDL10_Q_ELEM_FEATURE);
         q_elem_property = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_PROPERTY);
+                WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -3009,7 +3009,7 @@
     svc = WODEN_WSDL10_DESC_ELEMENT_CREATE_SVC_ELEMENT(desc, env);
 
     svc_el = AXIOM_NODE_GET_DATA_ELEMENT(svc_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -3024,7 +3024,7 @@
         WODEN_WSDL10_SVC_ELEMENT_SET_QNAME(svc, env, qname);
     }
  
-    intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_ATTR_INTERFACE);
+    intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_WSDL10_ATTR_INTERFACE);
     if(NULL != intface)
     {
         axis2_hash_t *namespcs = NULL;
@@ -3084,10 +3084,10 @@
         axis2_qname_t *q_elem_feature = NULL;
         axis2_qname_t *q_elem_property = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_endpoint = axis2_qname_create_from_string(env, WODEN_Q_ELEM_ENDPOINT);
-        q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
-        q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_endpoint = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_ENDPOINT);
+        q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+        q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -3183,7 +3183,7 @@
 
 
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
-    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_NAME);
+    name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_NAME);
    
     if(NULL != name)
     {
@@ -3192,8 +3192,8 @@
         WODEN_WSDL10_ENDPOINT_ELEMENT_SET_NAME(endpoint, env, nc_name);
     }
  
-    attr_binding = axis2_qname_create_from_string(env, WODEN_ATTR_BINDING);
-    binding = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_BINDING);
+    attr_binding = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_BINDING);
+    binding = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_BINDING);
     if(NULL != binding)
     {
         axis2_hash_t *namespcs = NULL;
@@ -3229,9 +3229,9 @@
         }
     }
     
-    attr_address = axis2_qname_create_from_string(env, WODEN_ATTR_ADDRESS);
+    attr_address = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_ADDRESS);
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
-    address = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_ADDRESS);
+    address = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_ADDRESS);
    
     if(NULL != address)
     {
@@ -3261,9 +3261,9 @@
         axis2_qname_t *q_elem_feature = NULL;
         axis2_qname_t *q_elem_property = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
-        q_elem_feature = axis2_qname_create_from_string(env, WODEN_Q_ELEM_FEATURE);
-        q_elem_property = axis2_qname_create_from_string(env, WODEN_Q_ELEM_PROPERTY);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
+        q_elem_feature = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_FEATURE);
+        q_elem_property = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_PROPERTY);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -3346,9 +3346,9 @@
     WODEN_NESTED_ELEMENT_SET_PARENT_ELEMENT(feature, env, parent); 
 
 
-    attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+    attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
     feature_el = AXIOM_NODE_GET_DATA_ELEMENT(feature_el_node, env);
-    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_ATTR_REF);
+    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_WSDL10_ATTR_REF);
    
     if(NULL != ref)
     {
@@ -3357,10 +3357,10 @@
         WODEN_FEATURE_ELEMENT_SET_REF(feature, env, ref_uri);
     }
  
-    attr_req = axis2_qname_create_from_string(env, WODEN_ATTR_REQUIRED);
+    attr_req = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REQUIRED);
     
-    req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_ATTR_REQUIRED);
-    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+    req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_WSDL10_ATTR_REQUIRED);
+    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
             required = AXIS2_TRUE;
     else
             required = AXIS2_FALSE;
@@ -3389,7 +3389,7 @@
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
-        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DOCUMENTATION);
+        q_elem_documentation = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -3473,9 +3473,9 @@
     types = WODEN_WSDL10_DESC_ELEMENT_GET_TYPES_ELEMENT(desc, env);
     WODEN_PROPERTY_SET_TYPES(property, env, types);
 
-    attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
+    attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
     property_el = AXIOM_NODE_GET_DATA_ELEMENT(property_el_node, env);
-    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(property_el, env, WODEN_ATTR_REF);
+    ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(property_el, env, WODEN_WSDL10_ATTR_REF);
    
     if(NULL != ref)
     {
@@ -3500,11 +3500,11 @@
         axis2_qname_t *q_elem_constraint = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
         q_elem_value = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_VALUE);
+                WODEN_WSDL10_Q_ELEM_VALUE);
         q_elem_constraint = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_CONSTRAINT);
+                WODEN_WSDL10_Q_ELEM_CONSTRAINT);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))
@@ -3552,7 +3552,7 @@
                 len = AXIS2_STRLEN(text_value);
                 if(len > 0)
                 {
-                    if(0 == AXIS2_STRCMP(text_value, WODEN_NMTOKEN_VALUE))
+                    if(0 == AXIS2_STRCMP(text_value, WODEN_WSDL10_NMTOKEN_VALUE))
                     {
                         property = woden_property_to_property_element(property, env);
                         WODEN_PROPERTY_ELEMENT_SET_HAS_VALUE_TOKEN(property, env, AXIS2_TRUE);
@@ -3642,10 +3642,10 @@
         if(!prefix) prefix = "";
         attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
         if(NULL != namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str, 
-                    WODEN_NS_URI_WSDL20))
+                    WODEN_WSDL10_NS_URI_WSDL20))
         {
-            if(0 != AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_XMLNS) &&
-               0 != AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_XSI))
+            if(0 != AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_XMLNS) &&
+               0 != AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_XSI))
             {
                 void *xml_attr = NULL;
                 woden_wsdl10_ext_registry_t *ext_reg = NULL;
@@ -3712,7 +3712,7 @@
     el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
     namespc = AXIOM_ELEMENT_GET_NAMESPACE(el, env, el_node);
     namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
-    if(NULL == namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_WSDL20)))
+    if(NULL == namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_WSDL20)))
     {
         /* TODO Set error message */
         return NULL;
@@ -3817,7 +3817,7 @@
             return NULL;
         }
         /* The referenced document should contain a WSDL <description> */
-        qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_DEFINITIONS);
+        qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_DEFINITIONS);
         if(AXIS2_TRUE != axis2_qname_util_matches(env, qname, doc_el_node))
         {
             /* Cannot continue without a <description> element */

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/ext_registry.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/ext_registry.c Thu Jul  6 02:42:31 2006
@@ -383,7 +383,7 @@
     {
         
         element_qtype = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_SOAP_MODULE);
+                WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
         elem_name = AXIS2_QNAME_TO_STRING(element_qtype, env);
         ed = axis2_hash_get(inner_deserializer_reg, elem_name, 
                 AXIS2_HASH_KEY_STRING);
@@ -426,7 +426,7 @@
     if(NULL != inner_ext_element_reg)
     {
         element = axis2_hash_get(inner_ext_element_reg, 
-                WODEN_Q_ELEM_SOAP_MODULE, AXIS2_HASH_KEY_STRING);
+                WODEN_WSDL10_Q_ELEM_SOAP_MODULE, AXIS2_HASH_KEY_STRING);
     }
     return element;
 }
@@ -734,37 +734,37 @@
         woden_qname_list_or_token_any_attr_create(env, NULL, NULL, NULL, 
                 NULL);
 
-    q_attr_soap_version = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_VERSION);
+    q_attr_soap_version = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
         "binding_element", q_attr_soap_version, 
         registry_impl->string_attr);
    
-    q_attr_soap_protocol = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_PROTOCOL);
+    q_attr_soap_protocol = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
         "binding_element", q_attr_soap_protocol, 
         registry_impl->uri_attr);
    
-    q_attr_soap_mepdefault = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_MEPDEFAULT);
+    q_attr_soap_mepdefault = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env,
         "binding_element", q_attr_soap_mepdefault, 
         registry_impl->uri_attr);
    
-    q_attr_soap_code = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_CODE);
+    q_attr_soap_code = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env, 
         "binding_fault_element", q_attr_soap_code, 
         registry_impl->qname_or_token_any_attr);
    
-    q_attr_soap_subcodes = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_SUBCODES);
+    q_attr_soap_subcodes = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env, 
         "binding_fault_element", q_attr_soap_subcodes, 
         registry_impl->qname_list_or_token_any_attr);
    
-    q_attr_soap_mep = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_MEP);
+    q_attr_soap_mep = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEP);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env, 
         "binding_op_element", q_attr_soap_mep, 
         registry_impl->uri_attr);
    
-    q_attr_soap_action = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_ACTION);
+    q_attr_soap_action = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_ACTION);
     woden_wsdl10_ext_registry_register_ext_attr_type(registry, env, 
         "binding_op_element", q_attr_soap_action, 
         registry_impl->uri_attr);
@@ -778,7 +778,7 @@
 
     registry_impl->soap_module = woden_wsdl10_soap_module_create(env);
     
-    q_elem_soap_module = axis2_qname_create_from_string(env, WODEN_Q_ELEM_SOAP_MODULE);
+    q_elem_soap_module = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     
     woden_wsdl10_ext_registry_register_deserializer(registry, env, "binding_element",
             q_elem_soap_module,
@@ -825,7 +825,7 @@
         woden_wsdl10_soap_header_block_deserializer_create(env);
     registry_impl->soap_header_block = woden_wsdl10_soap_header_block_create(env);
     
-    q_elem_soap_header = axis2_qname_create_from_string(env, WODEN_Q_ELEM_SOAP_HEADER);
+    q_elem_soap_header = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
     
     woden_wsdl10_ext_registry_register_deserializer(registry, env, "binding_fault_element",
             q_elem_soap_header,

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_exts.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_exts.c Thu Jul  6 02:42:31 2006
@@ -377,7 +377,7 @@
             binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_VERSION);
+    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_VERSION);
     version = (woden_string_attr_t *) 
         WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname); 
     return version != NULL ? WODEN_STRING_ATTR_GET_STRING(version, env) : 
@@ -401,7 +401,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_PROTOCOL);
+    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL);
     protocol = (woden_uri_attr_t *) WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
             parent_element, env, binding_exts_impl->qname);
     return protocol != NULL ? WODEN_URI_ATTR_GET_URI(protocol, env) : NULL;
@@ -424,7 +424,7 @@
 
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_MEPDEFAULT);
+    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT);
     mep_default = (woden_uri_attr_t *) 
         WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_exts_impl->qname);
     return mep_default != NULL ? WODEN_URI_ATTR_GET_URI(mep_default, env) : 
@@ -447,7 +447,7 @@
             binding_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ELEM_SOAP_MODULE);
+    binding_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     ext_els = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_exts_impl->qname);
     return ext_els;

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_exts.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_exts.c Thu Jul  6 02:42:31 2006
@@ -384,7 +384,7 @@
             binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_CODE);
+    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_CODE);
     code = (woden_qname_or_token_any_attr_t *) 
         WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname); 
     if(NULL == code)
@@ -432,7 +432,7 @@
             binding_fault_exts_impl->component_exts, env);
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
-    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_Q_ATTR_SOAP_SUBCODES);
+    binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES);
     subcodes = (woden_qname_list_or_token_any_attr_t *) 
         WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(parent_element, env, binding_fault_exts_impl->qname); 
     if(NULL == subcodes)
@@ -478,7 +478,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_MODULE);
+            WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_fault_exts_impl->qname); 
 
@@ -502,7 +502,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_fault_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_HEADER);
+            WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
     soap_headers = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_fault_exts_impl->qname); 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_ref_exts.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_fault_ref_exts.c Thu Jul  6 02:42:31 2006
@@ -331,7 +331,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_fault_ref_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_MODULE);
+            WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_fault_ref_exts_impl->qname); 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_msg_ref_exts.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_msg_ref_exts.c Thu Jul  6 02:42:31 2006
@@ -347,7 +347,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_msg_ref_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_MODULE);
+            WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_msg_ref_exts_impl->qname); 
 
@@ -371,7 +371,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_msg_ref_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_HEADER);
+            WODEN_WSDL10_Q_ELEM_SOAP_HEADER);
     soap_headers = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_msg_ref_exts_impl->qname); 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_op_exts.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_binding_op_exts.c Thu Jul  6 02:42:31 2006
@@ -342,7 +342,7 @@
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
     binding_op_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ATTR_SOAP_MEP);
+            WODEN_WSDL10_Q_ATTR_SOAP_MEP);
     mep = WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
             parent_element, env, binding_op_exts_impl->qname); 
 
@@ -366,7 +366,7 @@
     parent_element = woden_wsdl_element_to_attr_extensible(parent_element, 
             env);
     binding_op_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ATTR_SOAP_MEP);
+            WODEN_WSDL10_Q_ATTR_SOAP_MEP);
     action = WODEN_ATTR_EXTENSIBLE_GET_EXT_ATTR(
             parent_element, env, binding_op_exts_impl->qname); 
 
@@ -390,7 +390,7 @@
     parent_element = woden_wsdl_element_to_element_extensible(parent_element, 
             env);
     binding_op_exts_impl->qname = axis2_qname_create_from_string(env, 
-            WODEN_Q_ELEM_SOAP_MODULE);
+            WODEN_WSDL10_Q_ELEM_SOAP_MODULE);
     soap_mods = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS_OF_TYPE(
             parent_element, env, binding_op_exts_impl->qname); 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_header_block_deserializer.c Thu Jul  6 02:42:31 2006
@@ -339,7 +339,7 @@
     WODEN_WSDL10_SOAP_HEADER_BLOCK_ELEMENT_SET_PARENT_ELEMENT(soap_hdr, env, parent);
 
     element_decl_qn = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(ext_el, env, 
-            WODEN_ATTR_ELEMENT); 
+            WODEN_WSDL10_ATTR_ELEMENT); 
     if(NULL != element_decl_qn)
     {
         axis2_qname_t *qname = NULL;
@@ -354,8 +354,8 @@
         WODEN_WSDL10_SOAP_HEADER_BLOCK_ELEMENT_SET_ELEMENT_QNAME(soap_hdr, env, qname);
     }
     must_understand = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(ext_el, env, 
-            WODEN_ATTR_MUSTUNDERSTAND);
-    if(NULL != must_understand && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, must_understand))
+            WODEN_WSDL10_ATTR_MUSTUNDERSTAND);
+    if(NULL != must_understand && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, must_understand))
             understood = AXIS2_TRUE;
     else
             understood = AXIS2_FALSE;
@@ -363,8 +363,8 @@
     WODEN_WSDL10_SOAP_HEADER_BLOCK_ELEMENT_SET_MUST_UNDERSTAND(soap_hdr, env, understood);
 
     req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(ext_el, env, 
-            WODEN_ATTR_REQUIRED);
-    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+            WODEN_WSDL10_ATTR_REQUIRED);
+    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
             required = AXIS2_TRUE;
     else
             required = AXIS2_FALSE;
@@ -384,7 +384,7 @@
         axis2_qname_t *q_elem_documentation = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/soap_module_deserializer.c Thu Jul  6 02:42:31 2006
@@ -336,7 +336,7 @@
     el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
 
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(el, env, 
-            WODEN_ATTR_REF); 
+            WODEN_WSDL10_ATTR_REF); 
     if(NULL != ref)
     {
         axis2_uri_t *uri = axis2_uri_parse_string(env, ref);
@@ -345,8 +345,8 @@
         WODEN_WSDL10_SOAP_MODULE_ELEMENT_SET_REF(soap_mod, env, uri);
     }
     req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(el, env, 
-            WODEN_ATTR_REQUIRED);
-    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+            WODEN_WSDL10_ATTR_REQUIRED);
+    if(NULL != req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
             required = AXIS2_TRUE;
     else
             required = AXIS2_FALSE;
@@ -361,7 +361,7 @@
         axis2_qname_t *q_elem_documentation = NULL;
 
         q_elem_documentation = axis2_qname_create_from_string(env, 
-                WODEN_Q_ELEM_DOCUMENTATION);
+                WODEN_WSDL10_Q_ELEM_DOCUMENTATION);
 
         if(AXIS2_TRUE == axis2_qname_util_matches(env, 
                     q_elem_documentation, temp_el_node))

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_constants.h Thu Jul  6 02:42:31 2006
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
  
-#ifndef WODEN_SOAP_CONSTANTS_H
-#define WODEN_SOAP_CONSTANTS_H
+#ifndef WODEN_WSDL10_SOAP_CONSTANTS_H
+#define WODEN_WSDL10_SOAP_CONSTANTS_H
 
 /**
  * @file axiom_soap_constants.h
@@ -37,50 +37,50 @@
 /*********************************** Constansts********************************/
 
 /* Namespace URIs.*/
-#define WODEN_NS_URI_SOAP "http://schemas.xmlsoap.org/wsdl/soap"
+#define WODEN_WSDL10_NS_URI_SOAP "http://schemas.xmlsoap.org/wsdl/soap"
 
 /* Protocol URIs.*/
-#define WODEN_PROTOCOL_URI_HTTP "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+#define WODEN_WSDL10_PROTOCOL_URI_HTTP "http://www.w3.org/2003/05/soap/bindings/HTTP/"
 
 /* Element names. */
-#define WODEN_ELEM_MODULE "module"
-#define WODEN_ELEM_HEADER "header"
+#define WODEN_WSDL10_ELEM_MODULE "module"
+#define WODEN_WSDL10_ELEM_HEADER "header"
 
 /* Attribute names. */
-#define WODEN_ATTR_VERSION "version"
-#define WODEN_ATTR_PROTOCOL "protocol"
-#define WODEN_ATTR_MEPDEFAULT "mepDefault"
-#define WODEN_ATTR_CODE "code"
-#define WODEN_ATTR_SUBCODES "subcodes"
-#define WODEN_ATTR_MEP "mep"
-#define WODEN_ATTR_ACTION "action"
-#define WODEN_ATTR_MUSTUNDERSTAND "mustUnderstand"
+#define WODEN_WSDL10_ATTR_VERSION "version"
+#define WODEN_WSDL10_ATTR_PROTOCOL "protocol"
+#define WODEN_WSDL10_ATTR_MEPDEFAULT "mepDefault"
+#define WODEN_WSDL10_ATTR_CODE "code"
+#define WODEN_WSDL10_ATTR_SUBCODES "subcodes"
+#define WODEN_WSDL10_ATTR_MEP "mep"
+#define WODEN_WSDL10_ATTR_ACTION "action"
+#define WODEN_WSDL10_ATTR_MUSTUNDERSTAND "mustUnderstand"
 
 /* Prefixes */
-#define WODEN_PFX_WSOAP "wsoap"
-#define WODEN_PFX_WHTTP "whttp"   /* TODO move to HTTPConstants? */
+#define WODEN_WSDL10_PFX_WSOAP "wsoap"
+#define WODEN_WSDL10_PFX_WHTTP "whttp"   /* TODO move to HTTPConstants? */
 
 /* Qualified element names.*/
 
-#define WODEN_Q_ELEM_SOAP_MODULE "module|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ELEM_SOAP_MODULE "module|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ELEM_SOAP_HEADER "header|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ELEM_SOAP_HEADER "header|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
 /* Qualified attribute names.*/
 
-#define WODEN_Q_ATTR_SOAP_VERSION "version|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_VERSION "version|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_PROTOCOL "protocol|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_PROTOCOL "protocol|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_MEPDEFAULT "mepDefault|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_MEPDEFAULT "mepDefault|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_CODE "ATTR_CODE|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_CODE "ATTR_CODE|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_SUBCODES "subcodes|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_SUBCODES "subcodes|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_MEP "mep|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_MEP "mep|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
-#define WODEN_Q_ATTR_SOAP_ACTION "action|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
+#define WODEN_WSDL10_Q_ATTR_SOAP_ACTION "action|http://schemas.xmlsoap.org/wsdl/soap|wsoap"
 
 
 
@@ -91,6 +91,6 @@
 }
 #endif
 
-#endif /* WODEN_SOAP_CONSTANTS_H */
+#endif /* WODEN_WSDL10_SOAP_CONSTANTS_H */
 
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h?rev=419502&r1=419501&r2=419502&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_constants.h Thu Jul  6 02:42:31 2006
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
  
-#ifndef WODEN_CONSTANTS_H
-#define WODEN_CONSTANTS_H
+#ifndef WODEN_WSDL10_CONSTANTS_H
+#define WODEN_WSDL10_CONSTANTS_H
 
 /**
  * @file woden_constants.h
@@ -36,89 +36,89 @@
   */
 /*********************************** Constansts********************************/
 /* Namespace URIs. */
-#define WODEN_NS_URI_WSDL20 "http://schemas.xmlsoap.org/wsdl"
-#define WODEN_NS_URI_XMLNS "http://www.w3.org/2000/xmlns/"
-#define WODEN_NS_URI_XSI "http://www.w3.org/2001/XMLSchema-instance"
+#define WODEN_WSDL10_NS_URI_WSDL20 "http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_NS_URI_XMLNS "http://www.w3.org/2000/xmlns/"
+#define WODEN_WSDL10_NS_URI_XSI "http://www.w3.org/2001/XMLSchema-instance"
 
 /* Top-level WSDL 2.0 element names. */
-#define WODEN_ELEM_DEFINITIONS "description"
-#define WODEN_ELEM_DOCUMENTATION "documentation"
-#define WODEN_ELEM_IMPORT "import"
-#define WODEN_ELEM_INCLUDE "include"
-#define WODEN_ELEM_TYPES "types"
-#define WODEN_ELEM_INTERFACE "portType"
-#define WODEN_ELEM_BINDING "binding"
-#define WODEN_ELEM_SERVICE "service"
+#define WODEN_WSDL10_ELEM_DEFINITIONS "description"
+#define WODEN_WSDL10_ELEM_DOCUMENTATION "documentation"
+#define WODEN_WSDL10_ELEM_IMPORT "import"
+#define WODEN_WSDL10_ELEM_INCLUDE "include"
+#define WODEN_WSDL10_ELEM_TYPES "types"
+#define WODEN_WSDL10_ELEM_INTERFACE "portType"
+#define WODEN_WSDL10_ELEM_BINDING "binding"
+#define WODEN_WSDL10_ELEM_SERVICE "service"
 
 /* Nested WSDL 2.0 element names. */
-#define WODEN_ELEM_FAULT "fault"
-#define WODEN_ELEM_OPERATION "operation"
-#define WODEN_ELEM_INPUT "input"
-#define WODEN_ELEM_OUTPUT "output"
-#define WODEN_ELEM_INFAULT "infault"
-#define WODEN_ELEM_OUTFAULT "outfault"
-#define WODEN_ELEM_FEATURE "feature"
-#define WODEN_ELEM_PROPERTY "property"
-#define WODEN_ELEM_VALUE "value"
-#define WODEN_ELEM_CONSTRAINT "constraint"
-#define WODEN_ELEM_ENDPOINT "endpoint"
-#define WODEN_ELEM_PART "part"
+#define WODEN_WSDL10_ELEM_FAULT "fault"
+#define WODEN_WSDL10_ELEM_OPERATION "operation"
+#define WODEN_WSDL10_ELEM_INPUT "input"
+#define WODEN_WSDL10_ELEM_OUTPUT "output"
+#define WODEN_WSDL10_ELEM_INFAULT "infault"
+#define WODEN_WSDL10_ELEM_OUTFAULT "outfault"
+#define WODEN_WSDL10_ELEM_FEATURE "feature"
+#define WODEN_WSDL10_ELEM_PROPERTY "property"
+#define WODEN_WSDL10_ELEM_VALUE "value"
+#define WODEN_WSDL10_ELEM_CONSTRAINT "constraint"
+#define WODEN_WSDL10_ELEM_ENDPOINT "endpoint"
+#define WODEN_WSDL10_ELEM_PART "part"
 
 /* Top-level WSDL 2.0 qualified element names. */
-#define WODEN_Q_ELEM_DEFINITIONS "definitions|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_DOCUMENTATION "documentation|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_IMPORT "import|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_TYPES "types|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_MSG_REF "message|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_PART "part|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_INTERFACE "portType|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_BINDING "binding|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_SERVICE "service|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_DEFINITIONS "definitions|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_DOCUMENTATION "documentation|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_IMPORT "import|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_INCLUDE "include|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_TYPES "types|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_MSG_REF "message|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_PART "part|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_INTERFACE "portType|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_BINDING "binding|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_SERVICE "service|http://schemas.xmlsoap.org/wsdl"
 
 /* Nested WSDL 2.0 qualified element names. */
-#define WODEN_Q_ELEM_FAULT "fault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_OPERATION "operation|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_INPUT "input|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_OUTPUT "output|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_INFAULT "infault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_OUTFAULT "outfault|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_FEATURE "feature|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_PROPERTY "property|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_VALUE "value|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_CONSTRAINT "constraint|http://schemas.xmlsoap.org/wsdl"
-#define WODEN_Q_ELEM_ENDPOINT "endpoint|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_FAULT "fault|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_OPERATION "operation|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_INPUT "input|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_OUTPUT "output|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_INFAULT "infault|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_OUTFAULT "outfault|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_FEATURE "feature|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_PROPERTY "property|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_VALUE "value|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_CONSTRAINT "constraint|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ELEM_ENDPOINT "endpoint|http://schemas.xmlsoap.org/wsdl"
 
 /* Attribute names. */
-#define WODEN_ATTR_ID "id"
-#define WODEN_ATTR_NAME "name"
-#define WODEN_ATTR_TARGET_NAMESPACE "targetNamespace"
-#define WODEN_ATTR_NAMESPACE "namespace"
-#define WODEN_ATTR_XMLNS "xmlns"
-#define WODEN_ATTR_EXTENDS "extends"
-#define WODEN_ATTR_STYLE_DEFAULT "styleDefault"
-#define WODEN_ATTR_ELEMENT "element"
-#define WODEN_ATTR_PATTERN "pattern"
-#define WODEN_ATTR_STYLE "style"
-#define WODEN_ATTR_MESSAGE_LABEL "messageLabel"
-#define WODEN_ATTR_REF "ref"
-#define WODEN_ATTR_REQUIRED "required"
-#define WODEN_ATTR_INTERFACE "type"
-#define WODEN_ATTR_TYPE "type"
-#define WODEN_ATTR_BINDING "binding"
-#define WODEN_ATTR_ADDRESS "address"
-#define WODEN_ATTR_LOCATION "location"
-#define WODEN_ATTR_MSG "message"
+#define WODEN_WSDL10_ATTR_ID "id"
+#define WODEN_WSDL10_ATTR_NAME "name"
+#define WODEN_WSDL10_ATTR_TARGET_NAMESPACE "targetNamespace"
+#define WODEN_WSDL10_ATTR_NAMESPACE "namespace"
+#define WODEN_WSDL10_ATTR_XMLNS "xmlns"
+#define WODEN_WSDL10_ATTR_EXTENDS "extends"
+#define WODEN_WSDL10_ATTR_STYLE_DEFAULT "styleDefault"
+#define WODEN_WSDL10_ATTR_ELEMENT "element"
+#define WODEN_WSDL10_ATTR_PATTERN "pattern"
+#define WODEN_WSDL10_ATTR_STYLE "style"
+#define WODEN_WSDL10_ATTR_MESSAGE_LABEL "messageLabel"
+#define WODEN_WSDL10_ATTR_REF "ref"
+#define WODEN_WSDL10_ATTR_REQUIRED "required"
+#define WODEN_WSDL10_ATTR_INTERFACE "type"
+#define WODEN_WSDL10_ATTR_TYPE "type"
+#define WODEN_WSDL10_ATTR_BINDING "binding"
+#define WODEN_WSDL10_ATTR_ADDRESS "address"
+#define WODEN_WSDL10_ATTR_LOCATION "location"
+#define WODEN_WSDL10_ATTR_MSG "message"
 
 /* Attribute values and NMTokens */
-#define WODEN_VALUE_EMPTY_STRING ""
-#define WODEN_VALUE_TRUE "true"
-#define WODEN_VALUE_FALSE "false"
-#define WODEN_NMTOKEN_VALUE "#value"
-#define WODEN_NMTOKEN_ANY "#any"
-#define WODEN_NMTOKEN_NONE "#none"
-#define WODEN_NMTOKEN_OTHER "#other"
-#define WODEN_NMTOKEN_ELEMENT "#element"
+#define WODEN_WSDL10_VALUE_EMPTY_STRING ""
+#define WODEN_WSDL10_VALUE_TRUE "true"
+#define WODEN_WSDL10_VALUE_FALSE "false"
+#define WODEN_WSDL10_NMTOKEN_VALUE "#value"
+#define WODEN_WSDL10_NMTOKEN_ANY "#any"
+#define WODEN_WSDL10_NMTOKEN_NONE "#none"
+#define WODEN_WSDL10_NMTOKEN_OTHER "#other"
+#define WODEN_WSDL10_NMTOKEN_ELEMENT "#element"
 
 /* Constants representing the values of the properties used to 
  * configure the Woden runtime (i.e. different to WSDL 2.0 properties).
@@ -129,24 +129,24 @@
  * TYPE_  describes a supported type system, such as the W3C XML Schema.
  * API_   describes a supported external API, such as DOM
  */ 
-#define WODEN_TYPE_XSD_2001 "http://www.w3.org/2001/XMLSchema"
-#define WODEN_API_W3C_DOM "org.w3c.dom"
-#define WODEN_API_W3C_XS "http://www.w3.org/Submission/xmlschema-api/"   /*XML Schema API implemented in Xerces */
-#define WODEN_API_APACHE_WS_XS "org.apache.ws.commons.schema"   /*Apache WS-Commons XmlSchema */
+#define WODEN_WSDL10_TYPE_XSD_2001 "http://www.w3.org/2001/XMLSchema"
+#define WODEN_WSDL10_API_W3C_DOM "org.w3c.dom"
+#define WODEN_WSDL10_API_W3C_XS "http://www.w3.org/Submission/xmlschema-api/"   /*XML Schema API implemented in Xerces */
+#define WODEN_WSDL10_API_APACHE_WS_XS "org.apache.ws.commons.schema"   /*Apache WS-Commons XmlSchema */
 
 
 /* Qualified attribute names.*/
-#define WODEN_Q_ATTR_REQUIRED "required|http://schemas.xmlsoap.org/wsdl"
+#define WODEN_WSDL10_Q_ATTR_REQUIRED "required|http://schemas.xmlsoap.org/wsdl"
 
 /* XML Declaration string.*/
-#define WODEN_XML_DECL_DEFAULT "UTF-8"
-#define WODEN_XML_DECL_START "<?xml version=\"1.0\" encoding=\""
-#define WODEN_XML_DECL_END "\"?>"
+#define WODEN_WSDL10_XML_DECL_DEFAULT "UTF-8"
+#define WODEN_WSDL10_XML_DECL_START "<?xml version=\"1.0\" encoding=\""
+#define WODEN_WSDL10_XML_DECL_END "\"?>"
 
 /* Feature names. */
 /* TODO org.apache and import optionality */
-#define WODEN_FEATURE_VERBOSE "verbose"
-#define WODEN_FEATURE_IMPORT_DOCUMENTS "import_documents"
+#define WODEN_WSDL10_FEATURE_VERBOSE "verbose"
+#define WODEN_WSDL10_FEATURE_IMPORT_DOCUMENTS "import_documents"
 
 
 
@@ -157,6 +157,6 @@
 }
 #endif
 
-#endif /* WODEN_CONSTANTS_H */
+#endif /* WODEN_WSDL10_CONSTANTS_H */
 
 



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