You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/12 10:25:35 UTC
svn commit: r517143 - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/soap/ axiom/src/util/ modules/core/deployment/
modules/core/transport/http/sender/ modules/mod_addr/
rampart/src/omxmlsec/c14n/ tools/codegen/src/util/ tools/tc...
Author: pini
Date: Mon Mar 12 02:25:33 2007
New Revision: 517143
URL: http://svn.apache.org/viewvc?view=rev&rev=517143
Log:
Dropped macros
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_attribute.h
webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
webservices/axis2/trunk/c/tools/tcpmon/build.sh
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_attribute.h?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_attribute.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_attribute.h Mon Mar 12 02:25:33 2007
@@ -179,38 +179,6 @@
axiom_attribute_increment_ref(struct axiom_attribute *om_attribute,
const axis2_env_t *env);
- /** free given attribute */
-#define AXIOM_ATTRIBUTE_FREE(om_attribute, env) \
- axiom_attribute_free(om_attribute, env)
-
- /** get qname of given attribute */
-#define AXIOM_ATTRIBUTE_GET_QNAME(om_attribute,env) \
- axiom_attribute_get_qname(om_attribute, env)
-
- /** serialize given attribute */
-#define AXIOM_ATTRIBUTE_SERIALIZE(om_attribute, env, om_ouput) \
- axiom_attribute_serialize(om_attribute, env, om_output)
- /** get namespace of an the attribute */
-#define AXIOM_ATTRIBUTE_GET_NAMESPACE(om_attribute, env) \
- axiom_attribute_get_namespace(om_attribute, env)
- /** get attribute localname */
-#define AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attribute, env) \
- axiom_attribute_get_localname(om_attribute, env)
- /** grt value of attribute */
-#define AXIOM_ATTRIBUTE_GET_VALUE(om_attribute, env) \
- axiom_attribute_get_value(om_attribute, env)
- /** set namespace for this attribute */
-#define AXIOM_ATTRIBUTE_SET_NAMESPACE(om_attribute, env,ns) \
- axiom_attribute_set_namespace(om_attribute, env,ns)
- /** set localname for this attribute */
-#define AXIOM_ATTRIBUTE_SET_LOCALNAME(om_attribute, env,localname) \
- axiom_attribute_set_localname(om_attribute, env,localname)
- /** set attribue value */
-#define AXIOM_ATTRIBUTE_SET_VALUE(om_attribute, env,value) \
- axiom_attribute_set_value(om_attribute, env,value)
-
-#define AXIOM_ATTRIBUTE_CLONE(om_attribute, env) \
- axiom_attribute_clone(om_attribute, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Mon Mar 12 02:25:33 2007
@@ -211,7 +211,7 @@
iterator_impl->attr_qname);
break;
if (om_attr &&
- (AXIS2_STRCMP(AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env),
+ (AXIS2_STRCMP(axiom_attribute_get_value(om_attr, env),
iterator_impl->attr_value) == 0))
{
matching_node_found = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Mon Mar 12 02:25:33 2007
@@ -526,7 +526,7 @@
AXIS2_PARAM_CHECK(env->error, attribute, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, element_node, AXIS2_FAILURE);
- om_namespace = AXIOM_ATTRIBUTE_GET_NAMESPACE(attribute, env);
+ om_namespace = axiom_attribute_get_namespace(attribute, env);
if (om_namespace)
{
@@ -552,7 +552,7 @@
return AXIS2_FAILURE;
}
- qname = AXIOM_ATTRIBUTE_GET_QNAME(attribute, env);
+ qname = axiom_attribute_get_qname(attribute, env);
if (qname)
{
axis2_char_t *name = AXIS2_QNAME_TO_STRING(qname, env);
@@ -613,7 +613,7 @@
if (val)
{
- AXIOM_ATTRIBUTE_FREE((axiom_attribute_t *)val, env);
+ axiom_attribute_free((axiom_attribute_t *)val, env);
}
val = NULL;
}
@@ -718,7 +718,7 @@
if (val)
status =
- AXIOM_ATTRIBUTE_SERIALIZE((axiom_attribute_t *)val,
+ axiom_attribute_serialize((axiom_attribute_t *)val,
env, om_output);
else
{
@@ -1002,7 +1002,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_attribute, AXIS2_FAILURE);
- qname = AXIOM_ATTRIBUTE_GET_QNAME(om_attribute, env);
+ qname = axiom_attribute_get_qname(om_attribute, env);
if (qname && (om_element->attributes))
{
axis2_char_t *name = NULL;
@@ -1349,7 +1349,7 @@
name, AXIS2_HASH_KEY_STRING);
if (attr)
{
- return AXIOM_ATTRIBUTE_GET_VALUE(attr, env);
+ return axiom_attribute_get_value(attr, env);
}
}
return NULL;
@@ -1402,15 +1402,15 @@
if (val)
{
om_attr = (axiom_attribute_t *)val;
- cloned_attr = AXIOM_ATTRIBUTE_CLONE(om_attr, env);
+ cloned_attr = axiom_attribute_clone(om_attr, env);
- om_ns = AXIOM_ATTRIBUTE_GET_NAMESPACE(om_attr, env);
+ om_ns = axiom_attribute_get_namespace(om_attr, env);
if (om_ns)
{
cloned_ns = AXIOM_NAMESPACE_CLONE(om_ns, env);
- AXIOM_ATTRIBUTE_SET_NAMESPACE(cloned_attr, env, cloned_ns);
+ axiom_attribute_set_namespace(cloned_attr, env, cloned_ns);
}
- qn = AXIOM_ATTRIBUTE_GET_QNAME(cloned_attr, env);
+ qn = axiom_attribute_get_qname(cloned_attr, env);
key = AXIS2_QNAME_TO_STRING(qn, env);
axis2_hash_set(ht_cloned, key, AXIS2_HASH_KEY_STRING, cloned_attr);
}
@@ -1451,9 +1451,9 @@
axis2_char_t *prefix = NULL;
om_attr = (axiom_attribute_t*)attr;
- this_attr_name = AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
- this_attr_value = AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
- attr_ns = AXIOM_ATTRIBUTE_GET_NAMESPACE(om_attr, env);
+ this_attr_name = axiom_attribute_get_localname(om_attr, env);
+ this_attr_value = axiom_attribute_get_value(om_attr, env);
+ attr_ns = axiom_attribute_get_namespace(om_attr, env);
if (attr_ns)
{
prefix = AXIOM_NAMESPACE_GET_PREFIX(attr_ns, env);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Mon Mar 12 02:25:33 2007
@@ -154,7 +154,7 @@
if (om_text->om_attribute)
{
- AXIOM_ATTRIBUTE_FREE(om_text->om_attribute, env);
+ axiom_attribute_free(om_text->om_attribute, env);
om_text->om_attribute = NULL;
}
@@ -205,7 +205,7 @@
/*send binary as MTOM optimised*/
if (om_text->om_attribute)
{
- AXIOM_ATTRIBUTE_FREE(om_text->om_attribute, env);
+ axiom_attribute_free(om_text->om_attribute, env);
om_text->om_attribute = NULL;
}
@@ -397,7 +397,7 @@
local_name);
}
if (om_text->om_attribute)
- AXIOM_ATTRIBUTE_SERIALIZE(om_text->om_attribute, env, om_output);
+ axiom_attribute_serialize(om_text->om_attribute, env, om_output);
if (om_text->ns)
AXIOM_NAMESPACE_SERIALIZE(om_text->ns, env, om_output);
@@ -425,13 +425,13 @@
om_namespace = axiom_namespace_create(env, "" , "");
namespace_uri = AXIOM_NAMESPACE_GET_URI(om_text->ns, env);
- attribute_local_name = AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attribute, env);
+ attribute_local_name = axiom_attribute_get_localname(om_attribute, env);
if (om_namespace)
{
prefix = AXIOM_NAMESPACE_GET_PREFIX(om_text->ns, env);
- attribute_value = AXIOM_ATTRIBUTE_GET_VALUE(om_attribute, env);
+ attribute_value = axiom_attribute_get_value(om_attribute, env);
if (prefix)
{
AXIOM_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Mon Mar 12 02:25:33 2007
@@ -154,7 +154,7 @@
if (fault_text->lang_attribute)
{
axis2_char_t *attr_lang = NULL;
- attr_lang = AXIOM_ATTRIBUTE_GET_VALUE(fault_text->lang_attribute, env);
+ attr_lang = axiom_attribute_get_value(fault_text->lang_attribute, env);
if (attr_lang)
{
if (AXIS2_STRCMP(attr_lang, lang) == 0)
@@ -163,7 +163,7 @@
return AXIS2_SUCCESS;
}
}
- AXIOM_ATTRIBUTE_SET_VALUE(fault_text->lang_attribute, env, lang);
+ axiom_attribute_set_value(fault_text->lang_attribute, env, lang);
return AXIS2_SUCCESS;
}
@@ -188,7 +188,7 @@
fault_text->lang_ns_used = AXIS2_TRUE;
else
{
- AXIOM_ATTRIBUTE_FREE(fault_text->lang_attribute, env);
+ axiom_attribute_free(fault_text->lang_attribute, env);
fault_text->lang_attribute = NULL;
}
return status;
@@ -225,7 +225,7 @@
}
if (fault_text->lang_attribute)
{
- return AXIOM_ATTRIBUTE_GET_VALUE(fault_text->lang_attribute, env);
+ return axiom_attribute_get_value(fault_text->lang_attribute, env);
}
else
return NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Mon Mar 12 02:25:33 2007
@@ -322,7 +322,7 @@
AXIS2_QNAME_FREE(qn, env);
if (om_attr)
{
- return AXIOM_ATTRIBUTE_SET_VALUE(om_attr, env, attr_value);
+ return axiom_attribute_set_value(om_attr, env, attr_value);
}
else
{
@@ -387,7 +387,7 @@
header_block->om_ele_node, env);
om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(om_ele, env, qn);
if (om_attr)
- attr_value = AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
+ attr_value = axiom_attribute_get_value(om_attr, env);
AXIS2_QNAME_FREE(qn, env);
return attr_value;
}
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Mon Mar 12 02:25:33 2007
@@ -719,10 +719,10 @@
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
- AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+ axiom_attribute_get_localname(om_attr, env);
om_attr_value =
- AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
+ axiom_attribute_get_value(om_attr, env);
if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
@@ -769,10 +769,10 @@
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
- AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+ axiom_attribute_get_localname(om_attr, env);
om_attr_value =
- AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
+ axiom_attribute_get_value(om_attr, env);
if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
@@ -845,10 +845,10 @@
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
- AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+ axiom_attribute_get_localname(om_attr, env);
om_attr_value =
- AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
+ axiom_attribute_get_value(om_attr, env);
if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
@@ -920,10 +920,10 @@
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
- AXIOM_ATTRIBUTE_GET_LOCALNAME(om_attr, env);
+ axiom_attribute_get_localname(om_attr, env);
om_attr_value =
- AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
+ axiom_attribute_get_value(om_attr, env);
if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Mon Mar 12 02:25:33 2007
@@ -260,7 +260,7 @@
}
qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(msg_recv_element, env, qmep);
- att_value = AXIOM_ATTRIBUTE_GET_VALUE(mep_att, env);
+ att_value = axiom_attribute_get_value(mep_att, env);
AXIS2_CONF_ADD_MSG_RECV(builder_impl->conf, env, att_value, msg_recv);
AXIS2_QNAME_FREE(qmep, env);
}
@@ -389,7 +389,7 @@
axis2_qname_t *qrefname = NULL;
axis2_char_t *ref_name = NULL;
- ref_name = AXIOM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
+ ref_name = axiom_attribute_get_value(module_ref_att, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module %s found in axis2.xml", ref_name);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
status = AXIS2_DEP_ENGINE_ADD_MODULE(conf_builder->desc_builder->
@@ -463,7 +463,7 @@
env);
continue;
}
- class_name = AXIOM_ATTRIBUTE_GET_VALUE(disp_att, env);
+ class_name = axiom_attribute_get_value(disp_att, env);
dll_desc = axis2_dll_desc_create(env);
dll_name =
axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
@@ -562,7 +562,7 @@
if (phase_orders_att)
{
- flow_type = AXIOM_ATTRIBUTE_GET_VALUE(phase_orders_att, env);
+ flow_type = axiom_attribute_get_value(phase_orders_att, env);
}
phase_list = axis2_conf_builder_get_phase_list(conf_builder, env,
@@ -657,7 +657,7 @@
}
if (phase_att)
{
- att_value = AXIOM_ATTRIBUTE_GET_VALUE(phase_att, env);
+ att_value = axiom_attribute_get_value(phase_att, env);
}
if (att_value)
{
@@ -747,7 +747,7 @@
axis2_char_t *temp_path3 = NULL;
AXIS2_TRANSPORT_ENUMS transport_enum;
- name = AXIOM_ATTRIBUTE_GET_VALUE(trs_name, env);
+ name = axiom_attribute_get_value(trs_name, env);
if (name)
{
if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
@@ -782,7 +782,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- class_name = AXIOM_ATTRIBUTE_GET_VALUE(trs_dll_att, env);
+ class_name = axiom_attribute_get_value(trs_dll_att, env);
impl_info_param = axis2_param_create(env, class_name, NULL);
if (!impl_info_param)
{
@@ -983,7 +983,7 @@
axiom_node_t *out_fault_flow_node = NULL;
AXIS2_TRANSPORT_ENUMS transport_enum;
- name = AXIOM_ATTRIBUTE_GET_VALUE(trs_name, env);
+ name = axiom_attribute_get_value(trs_name, env);
if (name)
{
if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
@@ -1027,7 +1027,7 @@
axis2_char_t *temp_path2 = NULL;
axis2_char_t *temp_path3 = NULL;
- class_name = AXIOM_ATTRIBUTE_GET_VALUE(trs_class_name, env);
+ class_name = axiom_attribute_get_value(trs_class_name, env);
impl_info_param = axis2_param_create(env, class_name, NULL);
dll_desc = axis2_dll_desc_create(env);
dll_name =
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Mar 12 02:25:33 2007
@@ -442,7 +442,7 @@
axis2_string_t *handler_name = NULL;
axis2_char_t *value = NULL;
- value = AXIOM_ATTRIBUTE_GET_VALUE(name_attrib, env);
+ value = axiom_attribute_get_value(name_attrib, env);
handler_name = axis2_string_create(env, value);
status = axis2_handler_desc_set_name(handler_desc, env, handler_name);
if (handler_name)
@@ -471,7 +471,7 @@
}
else
{
- attrib_value = AXIOM_ATTRIBUTE_GET_VALUE(class_attrib, env);
+ attrib_value = axiom_attribute_get_value(class_attrib, env);
status = axis2_handler_desc_set_class_name(handler_desc, env, attrib_value);
/*if(AXIS2_FAILURE == status)
{
@@ -521,10 +521,10 @@
axis2_hash_this(index_i, NULL, NULL, &v);
order_attrib = (axiom_attribute_t *) v;
- qname = AXIOM_ATTRIBUTE_GET_QNAME(order_attrib, env);
+ qname = axiom_attribute_get_qname(order_attrib, env);
name = AXIS2_QNAME_GET_LOCALPART(qname, env);
- value = AXIOM_ATTRIBUTE_GET_VALUE(order_attrib, env);
+ value = axiom_attribute_get_value(order_attrib, env);
if (0 == AXIS2_STRCMP(AXIS2_AFTER, name))
{
struct axis2_phase_rule *phase_rule = NULL;
@@ -668,7 +668,7 @@
axis2_generic_obj_set_value(obj, env, value);
axis2_generic_obj_set_free_func(obj, env,
axiom_attribute_free_void_arg);
- attr_qname = AXIOM_ATTRIBUTE_GET_QNAME(value, env);
+ attr_qname = axiom_attribute_get_qname(value, env);
attr_name = AXIS2_QNAME_TO_STRING(attr_qname, env);
axis2_hash_set(attrs, attr_name, AXIS2_HASH_KEY_STRING, obj);
}
@@ -862,7 +862,7 @@
AXIS2_PARAM_FREE(param, env);
return AXIS2_FAILURE;
}
- pname = AXIOM_ATTRIBUTE_GET_VALUE(para_name, env);
+ pname = axiom_attribute_get_value(para_name, env);
status = AXIS2_PARAM_SET_NAME(param, env, pname);
if (AXIS2_SUCCESS != status)
{
@@ -889,7 +889,7 @@
if (para_locked)
{
axis2_char_t *locked_value = NULL;
- locked_value = AXIOM_ATTRIBUTE_GET_VALUE(para_locked, env);
+ locked_value = axiom_attribute_get_value(para_locked, env);
if (0 == AXIS2_STRCMP("true", locked_value))
{
axis2_char_t *param_name = NULL;
@@ -983,7 +983,7 @@
axis2_qname_t *ref_qname = NULL;
axis2_module_desc_t *module_desc = NULL;
- ref_name = AXIOM_ATTRIBUTE_GET_VALUE(module_ref_attrib, env);
+ ref_name = axiom_attribute_get_value(module_ref_attrib, env);
ref_qname = axis2_qname_create(env, ref_name, NULL, NULL);
module_desc = AXIS2_DEP_ENGINE_GET_MODULE(desc_builder->engine, env,
ref_qname);
@@ -1036,7 +1036,7 @@
class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
recv_name = AXIOM_ELEMENT_GET_ATTRIBUTE(recv_element, env, class_qname);
AXIS2_QNAME_FREE(class_qname, env);
- class_name = AXIOM_ATTRIBUTE_GET_VALUE(recv_name, env);
+ class_name = axiom_attribute_get_value(recv_name, env);
conf = AXIS2_DEP_ENGINE_GET_AXIS2_CONF(desc_builder->engine, env);
if (!conf)
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Mar 12 02:25:33 2007
@@ -206,7 +206,7 @@
{
axis2_char_t *module_name = NULL;
- module_name = AXIOM_ATTRIBUTE_GET_VALUE(module_name_att, env);
+ module_name = axiom_attribute_get_value(module_name_att, env);
if( module_name && (0 != AXIS2_STRCMP("", module_name)))
{
axis2_qname_t *qmodule_name = NULL;
@@ -263,7 +263,7 @@
axis2_char_t *class_name = NULL;
- class_name = AXIOM_ATTRIBUTE_GET_VALUE(module_dll_att, env);
+ class_name = axiom_attribute_get_value(module_dll_att, env);
if (class_name && (0 != AXIS2_STRCMP("", class_name)))
{
if (module_builder->desc_builder->engine)
@@ -465,7 +465,7 @@
if (op_mep_att)
{
- mep_url = AXIOM_ATTRIBUTE_GET_VALUE(op_mep_att, env);
+ mep_url = axiom_attribute_get_value(op_mep_att, env);
}
if (NULL == mep_url)
{
@@ -480,7 +480,7 @@
op_desc = axis2_op_create_from_module(env);
}
- op_name = AXIOM_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);
axis2_op_set_qname(op_desc, env, qopname);
if (qopname)
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?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Mar 12 02:25:33 2007
@@ -315,7 +315,7 @@
/* my logic to get set service name */
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
name_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(svc_element, env, qattname);
- svc_name = AXIOM_ATTRIBUTE_GET_VALUE(name_attr, env);
+ svc_name = axiom_attribute_get_value(name_attr, env);
AXIS2_SVC_SET_NAME(builder_impl->svc, env, svc_name);
AXIS2_QNAME_FREE(qattname, env);
@@ -563,14 +563,14 @@
qmep = NULL;
if (op_mep_att)
{
- mep_url = AXIOM_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 = AXIOM_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)
@@ -738,7 +738,7 @@
axis2_char_t *ref_name = NULL;
axis2_qname_t *qrefname = NULL;
- ref_name = AXIOM_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?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Mar 12 02:25:33 2007
@@ -235,7 +235,7 @@
qattname = NULL;
}
- svc_name = AXIOM_ATTRIBUTE_GET_VALUE(svc_name_att, env);
+ svc_name = axiom_attribute_get_value(svc_name_att, env);
if (NULL == svc_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_NAME_ERROR,
@@ -312,7 +312,7 @@
axis2_module_desc_t *module = NULL;
- ref_name = AXIOM_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/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Mar 12 02:25:33 2007
@@ -970,7 +970,7 @@
{
return AXIS2_FAILURE;
}
- proxy_host = AXIOM_ATTRIBUTE_GET_VALUE(host_attr, env);
+ proxy_host = axiom_attribute_get_value(host_attr, env);
if (NULL == proxy_host)
{
return AXIS2_FAILURE;
@@ -986,7 +986,7 @@
{
return AXIS2_FAILURE;
}
- proxy_port = AXIOM_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?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Mon Mar 12 02:25:33 2007
@@ -476,7 +476,7 @@
}
else
{
- relationship_type_value = AXIOM_ATTRIBUTE_GET_VALUE(relationship_type, env);
+ relationship_type_value = axiom_attribute_get_value(relationship_type, env);
}
address = AXIOM_ELEMENT_GET_TEXT(header_block_ele, env, header_block_node);
@@ -607,7 +607,7 @@
om_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, wsa_qname);
if (om_attr)
{
- attr_value = AXIOM_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);
@@ -665,7 +665,7 @@
is_ref_param_attr = AXIOM_ELEMENT_GET_ATTRIBUTE(header_block_ele, env, is_ref_qn);
if (is_ref_param_attr)
{
- attr_value = AXIOM_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);
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Mar 12 02:25:33 2007
@@ -455,7 +455,7 @@
{
AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
addr_ns_obj = NULL ;
- AXIOM_ATTRIBUTE_SET_NAMESPACE(om_attr, env, dec_ns);
+ axiom_attribute_set_namespace(om_attr, env, dec_ns);
}
}
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Mon Mar 12 02:25:33 2007
@@ -943,14 +943,14 @@
attr1 = (axiom_attribute_t *)a1;
attr2 = (axiom_attribute_t *)a2;
- ns1 = AXIOM_ATTRIBUTE_GET_NAMESPACE((axiom_attribute_t *)a1, ctx->env);
- ns2 = AXIOM_ATTRIBUTE_GET_NAMESPACE((axiom_attribute_t *)a2, ctx->env);
+ ns1 = axiom_attribute_get_namespace((axiom_attribute_t *)a1, ctx->env);
+ ns2 = axiom_attribute_get_namespace((axiom_attribute_t *)a2, ctx->env);
if (ns1 == ns2)
return AXIS2_STRCMP(
- (const axis2_char_t *)AXIOM_ATTRIBUTE_GET_LOCALNAME(
+ (const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a1, ctx->env),
- (const axis2_char_t *)AXIOM_ATTRIBUTE_GET_LOCALNAME(
+ (const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a2, ctx->env));
if (!ns1) return -1;
@@ -962,9 +962,9 @@
if (res == 0)
return AXIS2_STRCMP(
- (const axis2_char_t *)AXIOM_ATTRIBUTE_GET_LOCALNAME(
+ (const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a1, ctx->env),
- (const axis2_char_t *)AXIOM_ATTRIBUTE_GET_LOCALNAME(
+ (const axis2_char_t *)axiom_attribute_get_localname(
(axiom_attribute_t *)a2, ctx->env));
else
return res;
@@ -981,7 +981,7 @@
{
c14n_ctx_t *ctx = (c14n_ctx_t *) context;
axiom_attribute_t *attr = (axiom_attribute_t *) attribute;
- axiom_namespace_t *ns = AXIOM_ATTRIBUTE_GET_NAMESPACE(attr, ctx->env);
+ axiom_namespace_t *ns = axiom_attribute_get_namespace(attr, ctx->env);
axis2_char_t *attvalue = NULL;
c14n_output(" ", ctx);
@@ -995,11 +995,11 @@
c14n_output(":", ctx);
}
}
- c14n_output(AXIOM_ATTRIBUTE_GET_LOCALNAME(attr, ctx->env), ctx);
+ c14n_output(axiom_attribute_get_localname(attr, ctx->env), ctx);
c14n_output("=\"", ctx);
/* TODO:DONE Normalize the text before output */
- attvalue = AXIOM_ATTRIBUTE_GET_VALUE(attr, ctx->env);
+ attvalue = axiom_attribute_get_value(attr, ctx->env);
attvalue = c14n_normalize_attribute(attvalue, (c14n_ctx_t const *)context);
c14n_output(attvalue, ctx);
@@ -1456,7 +1456,7 @@
if (v)
{
axiom_attribute_t *attr = (axiom_attribute_t*)v;
- axiom_namespace_t *ns_attr = AXIOM_ATTRIBUTE_GET_NAMESPACE(
+ axiom_namespace_t *ns_attr = axiom_attribute_get_namespace(
attr, ctx->env);
axis2_char_t *attr_pfx = NULL;
@@ -1537,7 +1537,7 @@
if (v)
{
axiom_attribute_t *attr = (axiom_attribute_t*)v;
- axiom_namespace_t *attr_ns = AXIOM_ATTRIBUTE_GET_NAMESPACE(
+ axiom_namespace_t *attr_ns = axiom_attribute_get_namespace(
attr, ctx->env);
axis2_char_t *attr_pfx = NULL;
axis2_char_t *attr_uri = NULL;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Mon Mar 12 02:25:33 2007
@@ -140,7 +140,7 @@
if(NULL != val)
{
om_attri = (axiom_attribute_t *)val;
- om_attri = AXIOM_ATTRIBUTE_CLONE ( om_attri, env );
+ om_attri = axiom_attribute_clone( om_attri, env );
AXIOM_ELEMENT_ADD_ATTRIBUTE ( to_ele, env, om_attri, to);
}
}
Modified: webservices/axis2/trunk/c/tools/tcpmon/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/build.sh?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/build.sh (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/build.sh Mon Mar 12 02:25:33 2007
@@ -11,4 +11,3 @@
./configure --prefix=${AXIS2C_HOME} --enable-tests=no
make
-make install
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Mon Mar 12 02:25:33 2007
@@ -691,12 +691,12 @@
axis2_hash_this(index, NULL, NULL, &v);
attr = (axiom_attribute_t *) v;
- namespc = AXIOM_ATTRIBUTE_GET_NAMESPACE(attr, env);
+ namespc = axiom_attribute_get_namespace(attr, env);
if (!namespc)
continue;
namespc_uri = AXIOM_NAMESPACE_GET_URI(namespc, env);
- local_part = AXIOM_ATTRIBUTE_GET_LOCALNAME(attr, env);
- value = AXIOM_ATTRIBUTE_GET_VALUE(attr, env);
+ local_part = axiom_attribute_get_localname(attr, env);
+ value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
if (0 == AXIS2_STRCMP(WODEN_NS_URI_XMLNS, namespc_uri))
{
@@ -3833,8 +3833,8 @@
axis2_qname_t *attr_type = NULL;
axis2_hash_this(index, NULL, NULL, &om_attr);
- localname = AXIOM_ATTRIBUTE_GET_LOCALNAME((axiom_attribute_t *) om_attr, env);
- namespc = AXIOM_ATTRIBUTE_GET_NAMESPACE((axiom_attribute_t *) om_attr, env);
+ localname = axiom_attribute_get_localname((axiom_attribute_t *) om_attr, env);
+ namespc = axiom_attribute_get_namespace((axiom_attribute_t *) om_attr, env);
if (namespc)
{
namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
@@ -3861,7 +3861,7 @@
{
axis2_char_t *attr_value = NULL;
- attr_value = AXIOM_ATTRIBUTE_GET_VALUE((axiom_attribute_t *) om_attr, env);
+ attr_value = axiom_attribute_get_value((axiom_attribute_t *) om_attr, env);
WODEN_XML_ATTR_INIT(xml_attr, env, om_el,
om_el_node, attr_type, attr_value);
WODEN_ATTR_EXTENSIBLE_SET_EXT_ATTR(wsdl_obj, env,
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=517143&r1=517142&r2=517143
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Mon Mar 12 02:25:33 2007
@@ -684,12 +684,12 @@
axis2_hash_this(index, NULL, NULL, &v);
attr = (axiom_attribute_t *) v;
- namespc = AXIOM_ATTRIBUTE_GET_NAMESPACE(attr, env);
+ namespc = axiom_attribute_get_namespace(attr, env);
if (!namespc)
continue;
namespc_uri = AXIOM_NAMESPACE_GET_URI(namespc, env);
- local_part = AXIOM_ATTRIBUTE_GET_LOCALNAME(attr, env);
- value = AXIOM_ATTRIBUTE_GET_VALUE(attr, env);
+ local_part = axiom_attribute_get_localname(attr, env);
+ value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
if (0 == AXIS2_STRCMP(WODEN_WSDL10_NS_URI_XMLNS, namespc_uri))
{
@@ -3657,8 +3657,8 @@
axis2_qname_t *attr_type = NULL;
axis2_hash_this(index, NULL, NULL, &om_attr);
- localname = AXIOM_ATTRIBUTE_GET_LOCALNAME((axiom_attribute_t *) om_attr, env);
- namespc = AXIOM_ATTRIBUTE_GET_NAMESPACE((axiom_attribute_t *) om_attr, env);
+ localname = axiom_attribute_get_localname((axiom_attribute_t *) om_attr, env);
+ namespc = axiom_attribute_get_namespace((axiom_attribute_t *) om_attr, env);
if (namespc)
{
namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
@@ -3686,7 +3686,7 @@
axis2_char_t *attr_value = NULL;
void *wsdl_el = NULL;
- attr_value = AXIOM_ATTRIBUTE_GET_VALUE((axiom_attribute_t *) om_attr, env);
+ attr_value = axiom_attribute_get_value((axiom_attribute_t *) om_attr, env);
WODEN_XML_ATTR_INIT(xml_attr, env, om_el,
om_el_node, attr_type, attr_value);
wsdl_el = WODEN_WSDL_OBJ_GET_BASE_IMPL(wsdl_obj, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org