You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by du...@apache.org on 2007/03/16 09:31:06 UTC
svn commit: r518887 [3/5] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/soap/ axiom/src/util/ axiom/test/om/
axiom/test/soap/ modules/core/deployment/ modules/core/engine/
modules/core/receivers/ modules/core/transport/http/se...
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_c14n_method.c Fri Mar 16 01:30:59 2007
@@ -53,7 +53,7 @@
algo_attr = axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(c14n_method_ele, env, algo_attr, c14n_method_node);
+ ret = axiom_element_add_attribute(c14n_method_ele, env, algo_attr, c14n_method_node);
return c14n_method_node;
@@ -79,7 +79,7 @@
return NULL;
}
- c14n_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(c14n_mtd_ele, env, OXS_ATTR_ALGORITHM);
+ c14n_mtd = axiom_element_get_attribute_value_by_name(c14n_mtd_ele, env, OXS_ATTR_ALGORITHM);
if((!c14n_mtd) ||(0 == AXIS2_STRCMP("", c14n_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_cipher_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_cipher_value.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_cipher_value.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_cipher_value.c Fri Mar 16 01:30:59 2007
@@ -58,7 +58,7 @@
if (cipher_val)
{
- ret = AXIOM_ELEMENT_SET_TEXT(cipher_value_ele, env, cipher_val, cipher_value_node);
+ ret = axiom_element_set_text(cipher_value_ele, env, cipher_val, cipher_value_node);
}
return cipher_value_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_data_reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_data_reference.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_data_reference.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_data_reference.c Fri Mar 16 01:30:59 2007
@@ -52,7 +52,7 @@
data_ref_attr = axiom_attribute_create(env, OXS_ATTR_URI , data_ref, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(data_reference_ele, env, data_ref_attr, data_reference_node);
+ ret = axiom_element_add_attribute(data_reference_ele, env, data_ref_attr, data_reference_node);
return data_reference_node;
}
@@ -71,7 +71,7 @@
return NULL;
}
- data_ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(data_reference_ele, env, OXS_ATTR_URI);
+ data_ref = axiom_element_get_attribute_value_by_name(data_reference_ele, env, OXS_ATTR_URI);
return data_ref;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_method.c Fri Mar 16 01:30:59 2007
@@ -53,7 +53,7 @@
algo_attr = axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(digest_method_ele, env, algo_attr, digest_method_node);
+ ret = axiom_element_add_attribute(digest_method_ele, env, algo_attr, digest_method_node);
return digest_method_node;
@@ -79,7 +79,7 @@
return NULL;
}
- digest_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(digest_mtd_ele, env, OXS_ATTR_ALGORITHM);
+ digest_mtd = axiom_element_get_attribute_value_by_name(digest_mtd_ele, env, OXS_ATTR_ALGORITHM);
if((!digest_mtd) ||(0 == AXIS2_STRCMP("", digest_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_value.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_value.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_digest_value.c Fri Mar 16 01:30:59 2007
@@ -58,7 +58,7 @@
if (digest_val)
{
- ret = AXIOM_ELEMENT_SET_TEXT(digest_value_ele, env, digest_val, digest_value_node);
+ ret = axiom_element_set_text(digest_value_ele, env, digest_val, digest_value_node);
}
return digest_value_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_ds_reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_ds_reference.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_ds_reference.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_ds_reference.c Fri Mar 16 01:30:59 2007
@@ -49,19 +49,19 @@
if(id){
axiom_attribute_t *id_attr = NULL;
id_attr = axiom_attribute_create(env, OXS_ATTR_ID , id, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(ds_reference_ele, env, id_attr, ds_reference_node);
+ ret = axiom_element_add_attribute(ds_reference_ele, env, id_attr, ds_reference_node);
}
if(uri){
axiom_attribute_t *uri_attr = NULL;
uri_attr = axiom_attribute_create(env, OXS_ATTR_URI , uri, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(ds_reference_ele, env, uri_attr, ds_reference_node);
+ ret = axiom_element_add_attribute(ds_reference_ele, env, uri_attr, ds_reference_node);
}
if(type){
axiom_attribute_t *type_attr = NULL;
type_attr = axiom_attribute_create(env, OXS_ATTR_TYPE , type, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(ds_reference_ele, env, type_attr, ds_reference_node);
+ ret = axiom_element_add_attribute(ds_reference_ele, env, type_attr, ds_reference_node);
}
return ds_reference_node;
@@ -81,7 +81,7 @@
return NULL;
}
- ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(reference_ele, env, OXS_ATTR_URI);
+ ref = axiom_element_get_attribute_value_by_name(reference_ele, env, OXS_ATTR_URI);
return ref;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_embedded.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_embedded.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_embedded.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_embedded.c Fri Mar 16 01:30:59 2007
@@ -54,7 +54,7 @@
id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(embedded_ele, env, id_attr, embedded_node);
+ ret = axiom_element_add_attribute(embedded_ele, env, id_attr, embedded_node);
return embedded_node;
@@ -76,7 +76,7 @@
return NULL;
}
- embedded = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(embedded_ele, env, OXS_ATTR_ID);
+ embedded = axiom_element_get_attribute_value_by_name(embedded_ele, env, OXS_ATTR_ID);
return embedded;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encrypted_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encrypted_data.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encrypted_data.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encrypted_data.c Fri Mar 16 01:30:59 2007
@@ -52,19 +52,19 @@
if (type_attribute)
{
type_attr = axiom_attribute_create(env, OXS_ATTR_TYPE, type_attribute, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, type_attr, encrypted_data_node);
+ ret = axiom_element_add_attribute(encrypted_data_ele, env, type_attr, encrypted_data_node);
}
if (id)
{
id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, id_attr, encrypted_data_node);
+ ret = axiom_element_add_attribute(encrypted_data_ele, env, id_attr, encrypted_data_node);
}
else
{
/*TODO Get a unique value for this*/
id_attr = axiom_attribute_create(env, OXS_ATTR_ID, "EncDataId-54321", NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, id_attr, encrypted_data_node);
+ ret = axiom_element_add_attribute(encrypted_data_ele, env, id_attr, encrypted_data_node);
}
return encrypted_data_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_encryption_method.c Fri Mar 16 01:30:59 2007
@@ -53,7 +53,7 @@
algo_attr = axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encryption_method_ele, env, algo_attr, encryption_method_node);
+ ret = axiom_element_add_attribute(encryption_method_ele, env, algo_attr, encryption_method_node);
return encryption_method_node;
@@ -79,7 +79,7 @@
return NULL;
}
- enc_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
+ enc_mtd = axiom_element_get_attribute_value_by_name(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
if((!enc_mtd) ||(0 == AXIS2_STRCMP("", enc_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_identifier.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_identifier.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_identifier.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_identifier.c Fri Mar 16 01:30:59 2007
@@ -51,12 +51,12 @@
encoding_type_att = axiom_attribute_create(env, OXS_ATTR_ENCODING_TYPE, encoding_type, NULL);
value_type_att = axiom_attribute_create(env, OXS_ATTR_VALUE_TYPE, value_type, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(ki_ele, env, encoding_type_att, ki_node);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(ki_ele, env, value_type_att, ki_node);
+ ret = axiom_element_add_attribute(ki_ele, env, encoding_type_att, ki_node);
+ ret = axiom_element_add_attribute(ki_ele, env, value_type_att, ki_node);
if (value)
{
- ret = AXIOM_ELEMENT_SET_TEXT(ki_ele, env, value, ki_node);
+ ret = axiom_element_set_text(ki_ele, env, value, ki_node);
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_name.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_name.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_key_name.c Fri Mar 16 01:30:59 2007
@@ -45,7 +45,7 @@
return NULL;
}
- ret = AXIOM_ELEMENT_SET_TEXT(key_name_ele, env, key_name_val, key_name_node);
+ ret = axiom_element_set_text(key_name_ele, env, key_name_val, key_name_node);
return key_name_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference.c Fri Mar 16 01:30:59 2007
@@ -55,8 +55,8 @@
ref_attr = axiom_attribute_create(env, OXS_ATTR_URI , ref, NULL);
value_type_attr = axiom_attribute_create(env, OXS_ATTR_VALUE_TYPE , value_type, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(reference_ele, env, ref_attr, reference_node);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(reference_ele, env, value_type_attr, reference_node);
+ ret = axiom_element_add_attribute(reference_ele, env, ref_attr, reference_node);
+ ret = axiom_element_add_attribute(reference_ele, env, value_type_attr, reference_node);
return reference_node;
}
@@ -75,7 +75,7 @@
return NULL;
}
- ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(reference_ele, env, OXS_ATTR_URI);
+ ref = axiom_element_get_attribute_value_by_name(reference_ele, env, OXS_ATTR_URI);
return ref;
}
@@ -94,6 +94,6 @@
return NULL;
}
- val_type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(reference_ele, env, OXS_ATTR_VALUE_TYPE);
+ val_type = axiom_element_get_attribute_value_by_name(reference_ele, env, OXS_ATTR_VALUE_TYPE);
return val_type;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c Fri Mar 16 01:30:59 2007
@@ -91,7 +91,7 @@
/*Get children*/
qname = axis2_qname_create(env, OXS_NODE_DATA_REFERENCE, NULL, NULL);
- iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(ref_list_ele, env, qname, ref_list_node);
+ iter = axiom_element_get_children_with_qname(ref_list_ele, env, qname, ref_list_node);
AXIS2_QNAME_FREE(qname, env);
qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature.c Fri Mar 16 01:30:59 2007
@@ -50,7 +50,7 @@
if (id)
{
id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(signature_ele, env, id_attr, signature_node);
+ ret = axiom_element_add_attribute(signature_ele, env, id_attr, signature_node);
}
return signature_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_method.c Fri Mar 16 01:30:59 2007
@@ -53,7 +53,7 @@
algo_attr = axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(signature_method_ele, env, algo_attr, signature_method_node);
+ ret = axiom_element_add_attribute(signature_method_ele, env, algo_attr, signature_method_node);
return signature_method_node;
@@ -79,7 +79,7 @@
return NULL;
}
- enc_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
+ enc_mtd = axiom_element_get_attribute_value_by_name(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
if((!enc_mtd) ||(0 == AXIS2_STRCMP("", enc_mtd))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_value.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_value.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_signature_value.c Fri Mar 16 01:30:59 2007
@@ -58,7 +58,7 @@
if (signature_val)
{
- ret = AXIOM_ELEMENT_SET_TEXT(signature_value_ele, env, signature_val, signature_value_node);
+ ret = axiom_element_set_text(signature_value_ele, env, signature_val, signature_value_node);
}
return signature_value_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_transform.c Fri Mar 16 01:30:59 2007
@@ -53,7 +53,7 @@
algo_attr = axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
- ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(transform_ele, env, algo_attr, transform_node);
+ ret = axiom_element_add_attribute(transform_ele, env, algo_attr, transform_node);
return transform_node;
@@ -79,7 +79,7 @@
return NULL;
}
- transform = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(transform_ele, env, OXS_ATTR_ALGORITHM);
+ transform = axiom_element_get_attribute_value_by_name(transform_ele, env, OXS_ATTR_ALGORITHM);
if((!transform) ||(0 == AXIS2_STRCMP("", transform))){
return NULL;
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_certificate.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_certificate.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_certificate.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_certificate.c Fri Mar 16 01:30:59 2007
@@ -57,7 +57,7 @@
if (cert_data)
{
- ret = AXIOM_ELEMENT_SET_TEXT(x509_certificate_ele, env, cert_data, x509_certificate_node);
+ ret = axiom_element_set_text(x509_certificate_ele, env, cert_data, x509_certificate_node);
}
return x509_certificate_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_issuer_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_issuer_name.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_issuer_name.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_issuer_name.c Fri Mar 16 01:30:59 2007
@@ -58,7 +58,7 @@
if (value)
{
- ret = AXIOM_ELEMENT_SET_TEXT(issuer_name_ele, env, value, issuer_name_node);
+ ret = axiom_element_set_text(issuer_name_ele, env, value, issuer_name_node);
}
return issuer_name_node;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_serial_number.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_serial_number.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_serial_number.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_x509_serial_number.c Fri Mar 16 01:30:59 2007
@@ -58,7 +58,7 @@
if (value)
{
- ret = AXIOM_ELEMENT_SET_TEXT(serial_number_ele, env, value, serial_number_node);
+ ret = axiom_element_set_text(serial_number_ele, env, value, serial_number_node);
}
return serial_number_node;
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/algorithmsuite_builder.c Fri Mar 16 01:30:59 2007
@@ -57,7 +57,7 @@
name_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(name, env);
if(name_ele)
{
- algosuite_string = AXIOM_ELEMENT_GET_LOCALNAME(name_ele, env);
+ algosuite_string = axiom_element_get_localname(name_ele, env);
if(algosuite_string)
{
algorithm_suite = rp_algorithmsuite_create(env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c Fri Mar 16 01:30:59 2007
@@ -54,7 +54,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -70,7 +70,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
if(rp_asymmetric_binding_builder_istoken(env,local_name))
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c Fri Mar 16 01:30:59 2007
@@ -59,7 +59,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -75,7 +75,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_https_token_builder_set_properties(node,ele,local_name,https_token,env);
@@ -112,7 +112,7 @@
if(!qname)
return AXIS2_FAILURE;
- inclusion_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element,env,qname);
AXIS2_QNAME_FREE(qname,env);
qname = NULL;
@@ -130,7 +130,7 @@
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(element,env,RP_REQUIRE_CLIENT_CERTIFICATE);
+ value = axiom_element_get_attribute_value_by_name(element,env,RP_REQUIRE_CLIENT_CERTIFICATE);
if(value)
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/layout_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/layout_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/layout_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/layout_builder.c Fri Mar 16 01:30:59 2007
@@ -45,7 +45,7 @@
name_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(name, env);
if(name_ele)
{
- value = AXIOM_ELEMENT_GET_LOCALNAME(name_ele, env);
+ value = axiom_element_get_localname(name_ele, env);
if(value)
{
lay_out = rp_layout_create(env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/policy_creator.c Fri Mar 16 01:30:59 2007
@@ -71,7 +71,7 @@
root_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (root, env);
if(root_ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(root_ele,env);
+ local_name = axiom_element_get_localname(root_ele,env);
if(local_name)
{
if(AXIS2_STRCMP(local_name,RP_POLICY)==0)
@@ -99,7 +99,7 @@
exat_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (exat_node, env);
if(exat_ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(exat_ele,env);
+ local_name = axiom_element_get_localname(exat_ele,env);
if(local_name)
{
if(AXIS2_STRCMP(local_name,RP_EXACTLY_ONE)==0)
@@ -130,7 +130,7 @@
all_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(all_node, env);
if(all_ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(all_ele,env);
+ local_name = axiom_element_get_localname(all_ele,env);
if(local_name)
{
if(AXIS2_STRCMP(local_name,RP_ALL)==0)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/qname_matcher.c Fri Mar 16 01:30:59 2007
@@ -35,7 +35,7 @@
if(!qname)
return AXIS2_FALSE;
- node_qname = AXIOM_ELEMENT_GET_QNAME(element,env,node);
+ node_qname = axiom_element_get_qname(element,env,node);
if(!node_qname)
{
@@ -67,7 +67,7 @@
if(!qname)
return AXIS2_FALSE;
- node_qname = AXIOM_ELEMENT_GET_QNAME(element,env,node);
+ node_qname = axiom_element_get_qname(element,env,node);
if(!node_qname)
{
@@ -104,7 +104,7 @@
if(!qname)
return AXIS2_FALSE;
- node_qname = AXIOM_ELEMENT_GET_QNAME(element,env,node);
+ node_qname = axiom_element_get_qname(element,env,node);
if(!node_qname)
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c Fri Mar 16 01:30:59 2007
@@ -41,7 +41,7 @@
if(config_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(config_ele, env, config);
+ children_iter = axiom_element_get_children(config_ele, env, config);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -57,7 +57,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
{
@@ -94,7 +94,7 @@
if(rp_match_rampart_config_qname(env,RP_USER,node,element))
{
axis2_char_t *user = NULL;
- user = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ user = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_user(rampart_config,env,user);
}
@@ -106,7 +106,7 @@
if(rp_match_rampart_config_qname(env,RP_ENCRYPTION_USER,node,element))
{
axis2_char_t *encryption_user = NULL;
- encryption_user = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ encryption_user = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_encryption_user(rampart_config,env,encryption_user);
}
else
@@ -117,7 +117,7 @@
if(rp_match_rampart_config_qname(env,RP_PASSWORD_CALLBACK_CLASS,node,element))
{
axis2_char_t *password_callback_class = NULL;
- password_callback_class = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ password_callback_class = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_password_callback_class(rampart_config,env,password_callback_class);
}
else
@@ -128,7 +128,7 @@
if(rp_match_rampart_config_qname(env,RP_AUTHN_MODULE_NAME,node,element))
{
axis2_char_t *authenticate_module = NULL;
- authenticate_module = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ authenticate_module = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_authenticate_module(rampart_config,env,authenticate_module);
}
else
@@ -139,7 +139,7 @@
if(rp_match_rampart_config_qname(env,RP_PASSWORD_TYPE,node,element))
{
axis2_char_t *password_type = NULL;
- password_type = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ password_type = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_password_type(rampart_config,env,password_type);
}
else
@@ -151,7 +151,7 @@
if(rp_match_rampart_config_qname(env,RP_CERTIFICATE,node,element))
{
axis2_char_t *certificate_file = NULL;
- certificate_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ certificate_file = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_certificate_file(rampart_config,env,certificate_file);
}
else
@@ -163,7 +163,7 @@
if(rp_match_rampart_config_qname(env,RP_RECEIVER_CERTIFICATE,node,element))
{
axis2_char_t *receiver_certificate_file = NULL;
- receiver_certificate_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ receiver_certificate_file = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_receiver_certificate_file(rampart_config,env,receiver_certificate_file);
}
else
@@ -175,7 +175,7 @@
if(rp_match_rampart_config_qname(env,RP_PRIVATE_KEY,node,element))
{
axis2_char_t *private_key_file = NULL;
- private_key_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ private_key_file = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_private_key_file(rampart_config,env,private_key_file);
}
else
@@ -186,7 +186,7 @@
if(rp_match_rampart_config_qname(env,RP_TIME_TO_LIVE,node,element))
{
axis2_char_t *time_to_live = NULL;
- time_to_live = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ time_to_live = axiom_element_get_text(element,env,node);
return rp_rampart_config_set_time_to_live(rampart_config,env,time_to_live);
}
else
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c Fri Mar 16 01:30:59 2007
@@ -40,7 +40,7 @@
if(all_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(all_ele, env, all);
+ children_iter = axiom_element_get_children(all_ele, env, all);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -56,7 +56,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT (node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele, env);
+ local_name = axiom_element_get_localname(ele, env);
if(local_name)
rp_secpolicy_builder_set_properties(env,secpolicy,node,ele,local_name);
}
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c Fri Mar 16 01:30:59 2007
@@ -49,7 +49,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -65,7 +65,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_security_context_token_builder_set_properties(node,ele,local_name,security_context_token,env);
@@ -102,7 +102,7 @@
if(!qname)
return AXIS2_FAILURE;
- inclusion_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element,env,qname);
AXIS2_QNAME_FREE(qname,env);
qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c Fri Mar 16 01:30:59 2007
@@ -41,7 +41,7 @@
{
axiom_children_iterator_t *children_iter = NULL;
rp_signed_encrypted_elements_builder_set_xpath_version(elements_ele,signed_encrypted_elements,env);
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(elements_ele, env, elements);
+ children_iter = axiom_element_get_children(elements_ele, env, elements);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -57,7 +57,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_signed_encrypted_elements_builder_set_properties(node,ele,local_name,signed_encrypted_elements,env);
@@ -94,7 +94,7 @@
if(rp_match_secpolicy_qname(env,RP_XPATH,node,element))
{
axis2_char_t *xpath = NULL;
- xpath = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ xpath = axiom_element_get_text(element,env,node);
if(!xpath)
return AXIS2_FAILURE;
@@ -117,7 +117,7 @@
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- xpath_version = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(element,env,RP_XPATH_VERSION);
+ xpath_version = axiom_element_get_attribute_value_by_name(element,env,RP_XPATH_VERSION);
if(xpath_version)
rp_signed_encrypted_elements_set_xpath_version(signed_encrypted_elements,env,RP_XPATH_VERSION);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c Fri Mar 16 01:30:59 2007
@@ -46,7 +46,7 @@
if(parts_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(parts_ele, env, parts);
+ children_iter = axiom_element_get_children(parts_ele, env, parts);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -62,7 +62,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_signed_encrypted_parts_builder_set_properties(node,ele,local_name,signed_encrypted_parts,env);
@@ -137,8 +137,8 @@
if(!header)
return NULL;
- name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(element,env,RP_NAME);
- namespace = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(element,env,RP_NAMESPACE);
+ name = axiom_element_get_attribute_value_by_name(element,env,RP_NAME);
+ namespace = axiom_element_get_attribute_value_by_name(element,env,RP_NAMESPACE);
if(!namespace)
{
rp_header_free(header,env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c Fri Mar 16 01:30:59 2007
@@ -45,7 +45,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -61,7 +61,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
if(rp_supporting_tokens_builder_istoken(env,local_name))
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c Fri Mar 16 01:30:59 2007
@@ -55,7 +55,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -71,7 +71,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
if(rp_symmetric_binding_builder_istoken(env,local_name))
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/token_builder.c Fri Mar 16 01:30:59 2007
@@ -48,7 +48,7 @@
token_name_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(token_name, env);
if(token_name_ele)
{
- token_value = AXIOM_ELEMENT_GET_LOCALNAME(token_name_ele, env);
+ token_value = axiom_element_get_localname(token_name_ele, env);
if(token_value)
{
status = rp_token_builder_set_token(token_name,token_name_ele,token_value,property,env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c Fri Mar 16 01:30:59 2007
@@ -49,7 +49,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -65,7 +65,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
if(rp_transport_binding_builder_istoken(env,local_name))
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c Fri Mar 16 01:30:59 2007
@@ -52,7 +52,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -68,7 +68,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_username_token_builder_set_properties(node,ele,local_name,username_token,env);
@@ -105,7 +105,7 @@
if(!qname)
return AXIS2_FAILURE;
- inclusion_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element,env,qname);
AXIS2_QNAME_FREE(qname,env);
qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c Fri Mar 16 01:30:59 2007
@@ -42,7 +42,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -58,7 +58,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_wss10_builder_set_properties(node,ele,local_name,wss10,env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c Fri Mar 16 01:30:59 2007
@@ -43,7 +43,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele,env,policy);
+ children_iter = axiom_element_get_children(pol_ele,env,policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -59,7 +59,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_wss11_builder_set_properties(node,ele,local_name,wss11,env);
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c Fri Mar 16 01:30:59 2007
@@ -50,7 +50,7 @@
if(pol_ele)
{
axiom_children_iterator_t *children_iter = NULL;
- children_iter = AXIOM_ELEMENT_GET_CHILDREN(pol_ele, env, policy);
+ children_iter = axiom_element_get_children(pol_ele, env, policy);
if(children_iter )
{
while(axiom_children_iterator_has_next(children_iter, env))
@@ -66,7 +66,7 @@
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if(ele)
{
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(ele,env);
+ local_name = axiom_element_get_localname(ele,env);
if(local_name)
{
status = rp_x509_token_builder_set_properties(node,ele,local_name,x509_token,env);
@@ -103,7 +103,7 @@
if(!qname)
return AXIS2_FAILURE;
- inclusion_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE(element,env,qname);
+ inclusion_value = axiom_element_get_attribute_value(element,env,qname);
AXIS2_QNAME_FREE(qname,env);
qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_context.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Fri Mar 16 01:30:59 2007
@@ -838,7 +838,7 @@
{
axiom_namespace_t *ns = NULL;
axis2_char_t *namespace_uri = NULL;
- ns = AXIOM_ELEMENT_GET_NAMESPACE(ret_node_ele, env,ret_node);
+ ns = axiom_element_get_namespace(ret_node_ele, env,ret_node);
if(ns)
{
namespace_uri = axiom_namespace_get_uri(ns, env);
@@ -931,7 +931,7 @@
{
axiom_namespace_t *ns = NULL;
axis2_char_t *namespace_uri = NULL;
- ns = AXIOM_ELEMENT_GET_NAMESPACE(ret_node_ele, env,ret_node);
+ ns = axiom_element_get_namespace(ret_node_ele, env,ret_node);
if(ns)
{
namespace_uri = axiom_namespace_get_uri(ns, env);
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c Fri Mar 16 01:30:59 2007
@@ -259,7 +259,7 @@
header_block = (axiom_soap_header_block_t *)hb;
header_block_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
header_block_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
- ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(header_block_ele, env);
+ ele_localname = axiom_element_get_localname(header_block_ele, env);
if (AXIS2_STRCMP(ele_localname, RAMPART_SECURITY) == 0)
{
@@ -293,7 +293,7 @@
ns1 = axiom_namespace_create(env, RAMPART_WSSE_XMLNS, RAMPART_WSSE);
text_om_ele = axiom_element_create(env, NULL, "ProblemSecurityHeader", ns1, &text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, detail_node_text, text_om_node);
+ axiom_element_set_text(text_om_ele, env, detail_node_text, text_om_node);
envelope = axiom_soap_envelope_create_default_soap_fault_envelope(env,
"soapenv:Sender",
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c Fri Mar 16 01:30:59 2007
@@ -56,7 +56,7 @@
if(!node_ele)
return AXIS2_FALSE;
- local_name = AXIOM_ELEMENT_GET_LOCALNAME(node_ele,env);
+ local_name = axiom_element_get_localname(node_ele,env);
if(!local_name)
return AXIS2_FALSE;
@@ -86,7 +86,7 @@
if(!qname)
return AXIS2_FALSE;
- node_qname = AXIOM_ELEMENT_GET_QNAME(node_ele,env,node);
+ node_qname = axiom_element_get_qname(node_ele,env,node);
if(!node_qname)
{
Modified: webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Fri Mar 16 01:30:59 2007
@@ -160,7 +160,7 @@
if (created_ele)
{
created_val = rampart_generate_time(env, 0); /*Current time*/
- AXIOM_ELEMENT_SET_TEXT(created_ele, env, created_val, created_node);
+ axiom_element_set_text(created_ele, env, created_val, created_node);
}
/*Then we build Expires element*/
/*If ttl<0 then we dont build the expires element.*/
@@ -174,7 +174,7 @@
if (expires_ele)
{
expires_val = rampart_generate_time(env, ttl);
- AXIOM_ELEMENT_SET_TEXT(expires_ele, env, expires_val, expires_node);
+ axiom_element_set_text(expires_ele, env, expires_val, expires_node);
}
}
@@ -225,13 +225,13 @@
created_node = axiom_node_get_first_element(ts_node, env);
created_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(created_node, env);
if (AXIS2_STRCMP(RAMPART_SECURITY_TIMESTAMP_CREATED ,
- AXIOM_ELEMENT_GET_LOCALNAME(created_ele, env)) != 0)
+ axiom_element_get_localname(created_ele, env)) != 0)
{
AXIS2_LOG_INFO(env->log, "[rampart][ts]Timestamp not valid: Cannot find created in timestamp element. The first element MUST be CREATED");
return AXIS2_FAILURE;
}
- created_val = AXIOM_ELEMENT_GET_TEXT(created_ele, env, created_node);
+ created_val = axiom_element_get_text(created_ele, env, created_node);
rampart_set_security_processed_result(env, msg_ctx,RAMPART_SPR_TS_CREATED, created_val);
/*Check whether created is less than current time or not*/
current_val = rampart_generate_time(env, 0);
@@ -252,7 +252,7 @@
}
expires_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(expires_node, env);
if (AXIS2_STRCMP(RAMPART_SECURITY_TIMESTAMP_EXPIRES ,
- AXIOM_ELEMENT_GET_LOCALNAME(expires_ele, env)) != 0)
+ axiom_element_get_localname(expires_ele, env)) != 0)
{
AXIS2_LOG_INFO(env->log, "[rampart][ts] Timestamp not valid: The second element of timestamp token (if any) MUST be EXPIRES");
return AXIS2_FAILURE;
@@ -260,7 +260,7 @@
/*Now the expires element is present. So check whether this has a valid timestamp.
If not it's a failure*/
- expires_val = AXIOM_ELEMENT_GET_TEXT(expires_ele, env, expires_node);
+ expires_val = axiom_element_get_text(expires_ele, env, expires_node);
rampart_set_security_processed_result(env, msg_ctx,RAMPART_SPR_TS_EXPIRES, expires_val);
/*Check whether time has expired or not*/
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Fri Mar 16 01:30:59 2007
@@ -225,7 +225,7 @@
wsu_ns_obj = axiom_namespace_create(env, RAMPART_WSU_XMLNS,
RAMPART_WSU);
- AXIOM_ELEMENT_DECLARE_NAMESPACE(ut_ele, env,
+ axiom_element_declare_namespace(ut_ele, env,
ut_node, wsu_ns_obj);
if (ut_ele)
@@ -236,13 +236,13 @@
if (un_ele)
{
axiom_namespace_t *dec_ns = NULL;
- AXIOM_ELEMENT_SET_TEXT(un_ele, env, username, un_node);
- dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(un_ele, env,
+ axiom_element_set_text(un_ele, env, username, un_node);
+ dec_ns = axiom_element_find_declared_namespace(un_ele, env,
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
- AXIOM_ELEMENT_SET_NAMESPACE(un_ele, env, sec_ns_obj, un_node);
+ axiom_element_set_namespace(un_ele, env, sec_ns_obj, un_node);
}
password_type = rampart_context_get_password_type(rampart_context,env);
@@ -264,8 +264,8 @@
if (pw_ele)
{
- AXIOM_ELEMENT_SET_TEXT(pw_ele, env, digest_val, pw_node);
- dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(pw_ele, env,
+ axiom_element_set_text(pw_ele, env, digest_val, pw_node);
+ dec_ns = axiom_element_find_declared_namespace(pw_ele, env,
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
@@ -275,7 +275,7 @@
RAMPART_PASSWORD_DIGEST_URI,
NULL);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(pw_ele, env,
+ axiom_element_add_attribute(pw_ele, env,
om_attr, pw_node);
}
@@ -284,8 +284,8 @@
if (nonce_ele)
{
axiom_namespace_t *dec_ns = NULL;
- AXIOM_ELEMENT_SET_TEXT(nonce_ele, env, nonce_val , nonce_node);
- dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(nonce_ele, env,
+ axiom_element_set_text(nonce_ele, env, nonce_val , nonce_node);
+ dec_ns = axiom_element_find_declared_namespace(nonce_ele, env,
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
}
@@ -294,12 +294,12 @@
if (created_ele)
{
axiom_namespace_t *dec_ns = NULL;
- AXIOM_ELEMENT_SET_TEXT(created_ele, env, created_val, created_node);
- dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(created_ele, env,
+ axiom_element_set_text(created_ele, env, created_val, created_node);
+ dec_ns = axiom_element_find_declared_namespace(created_ele, env,
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
- AXIOM_ELEMENT_SET_NAMESPACE(created_ele, env, wsu_ns_obj, created_node);
+ axiom_element_set_namespace(created_ele, env, wsu_ns_obj, created_node);
}
@@ -323,8 +323,8 @@
if (pw_ele)
{
axiom_namespace_t *dec_ns = NULL;
- AXIOM_ELEMENT_SET_TEXT(pw_ele, env, password, pw_node);
- dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(pw_ele, env,
+ axiom_element_set_text(pw_ele, env, password, pw_node);
+ dec_ns = axiom_element_find_declared_namespace(pw_ele, env,
RAMPART_WSSE_XMLNS,
RAMPART_WSSE);
@@ -333,7 +333,7 @@
RAMPART_PASSWORD_TEXT_URI,
NULL);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(pw_ele, env,
+ axiom_element_add_attribute(pw_ele, env,
om_attr, pw_node);
}
} /*End if passwordType == passwordText*/
@@ -397,7 +397,7 @@
}
/*Get thru children of UsernameToken element*/
- children = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(ut_ele, env, ut_node);
+ children = axiom_element_get_child_elements(ut_ele, env, ut_node);
if (children)
{
/*Go thru children and find username token parameters*/
@@ -409,16 +409,16 @@
node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(children, env);
element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- localname = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
+ localname = axiom_element_get_localname(element, env);
if (0 == AXIS2_STRCMP(localname, RAMPART_SECURITY_USERNAMETOKEN_USERNAME))
{
- username = AXIOM_ELEMENT_GET_TEXT(element, env, node);
+ username = axiom_element_get_text(element, env, node);
}
else if (0 == AXIS2_STRCMP(localname , RAMPART_SECURITY_USERNAMETOKEN_PASSWORD))
{
- password_type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(element,
+ password_type = axiom_element_get_attribute_value_by_name(element,
env,
RAMPART_SECURITY_USERNAMETOKEN_PASSWORD_ATTR_TYPE);
@@ -449,24 +449,24 @@
return AXIS2_FAILURE;
}
}
- password = AXIOM_ELEMENT_GET_TEXT(element, env, node);
+ password = axiom_element_get_text(element, env, node);
}
else if (0 == AXIS2_STRCMP(localname, RAMPART_SECURITY_USERNAMETOKEN_NONCE))
{
- nonce = AXIOM_ELEMENT_GET_TEXT(element, env, node);
+ nonce = axiom_element_get_text(element, env, node);
rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_NONCE, nonce);
}
else if (0 == AXIS2_STRCMP(localname , RAMPART_SECURITY_USERNAMETOKEN_CREATED))
{
- created = AXIOM_ELEMENT_GET_TEXT(element, env, node);
+ created = axiom_element_get_text(element, env, node);
rampart_set_security_processed_result(env, msg_ctx, RAMPART_SPR_UT_CREATED, created);
}
else
{
- AXIS2_LOG_INFO(env->log, "\n[rampart][rampart_usernametoken] Unknown element found %s -> %s", localname, AXIOM_ELEMENT_GET_TEXT(element, env, node));
+ AXIS2_LOG_INFO(env->log, "\n[rampart][rampart_usernametoken] Unknown element found %s -> %s", localname, axiom_element_get_text(element, env, node));
}
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/dynamic_client.c Fri Mar 16 01:30:59 2007
@@ -240,13 +240,13 @@
attr_name_arg0 = axiom_attribute_create(env, "name", "arg_0_0", ns1);
attr_name_arg1 = axiom_attribute_create(env, "name", "arg_1_0", ns1);
arg0_om_ele = axiom_element_create(env, seq_om_node, "arg_0_0", NULL, &arg0_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg0_om_ele, env, "5", arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr, arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
+ axiom_element_set_text(arg0_om_ele, env, "5", arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr, arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
arg1_om_ele = axiom_element_create(env, seq_om_node, "arg_1_0", NULL, &arg1_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg1_om_ele, env, "10", arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr, arg1_om_node);
+ axiom_element_set_text(arg1_om_ele, env, "10", arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr, arg1_om_node);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE,
AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
@@ -297,13 +297,13 @@
attr_name_arg0 = axiom_attribute_create(env, "name", "arg_0_0", ns1);
attr_name_arg1 = axiom_attribute_create(env, "name", "arg_1_0", ns1);
arg0_om_ele = axiom_element_create(env, seq_om_node, "arg_0_0", NULL, &arg0_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg0_om_ele, env, "5", arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr, arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
+ axiom_element_set_text(arg0_om_ele, env, "5", arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr, arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
arg1_om_ele = axiom_element_create(env, seq_om_node, "arg_1_0", NULL, &arg1_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg1_om_ele, env, "10", arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr, arg1_om_node);
+ axiom_element_set_text(arg1_om_ele, env, "10", arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr, arg1_om_node);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE,
AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/test.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/test.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/test.c Fri Mar 16 01:30:59 2007
@@ -82,13 +82,13 @@
attr_name_arg0 = axiom_attribute_create(env, "name", "arg_0_0", ns1);
attr_name_arg1 = axiom_attribute_create(env, "name", "arg_1_0", ns1);
arg0_om_ele = axiom_element_create(env, seq_om_node, "arg_0_0", ns1, &arg0_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg0_om_ele, env, "5", arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr, arg0_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
+ axiom_element_set_text(arg0_om_ele, env, "5", arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr, arg0_om_node);
+ axiom_element_add_attribute(arg0_om_ele, env, attr_name_arg0, arg0_om_node);
arg1_om_ele = axiom_element_create(env, seq_om_node, "arg_1_0", ns1, &arg1_om_node);
- AXIOM_ELEMENT_SET_TEXT(arg1_om_ele, env, "10", arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(arg1_om_ele, env, attr, arg1_om_node);
+ axiom_element_set_text(arg1_om_ele, env, "10", arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr_name_arg1, arg1_om_node);
+ axiom_element_add_attribute(arg1_om_ele, env, attr, arg1_om_node);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE,
AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
Modified: webservices/axis2/trunk/c/samples/client/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/echo.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/client/echo/echo.c Fri Mar 16 01:30:59 2007
@@ -166,7 +166,7 @@
ns1 = axiom_namespace_create(env, "http://ws.apache.org/axis2/c/samples", "ns1");
echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, &echo_om_node);
text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, "Hello World!", text_om_node);
+ axiom_element_set_text(text_om_ele, env, "Hello World!", text_om_node);
om_str = AXIOM_NODE_TO_STRING(echo_om_node, env);
if (om_str)
Modified: webservices/axis2/trunk/c/samples/client/google/google_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/google_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/google_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/google/google_client.c Fri Mar 16 01:30:59 2007
@@ -116,7 +116,7 @@
axiom_node_t *ret_node1 = NULL;
result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
- if (AXIS2_STRCMP(AXIOM_ELEMENT_GET_LOCALNAME(result_ele, env), "doSpellingSuggestionResponse") != 0)
+ if (AXIS2_STRCMP(axiom_element_get_localname(result_ele, env), "doSpellingSuggestionResponse") != 0)
{
print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
@@ -129,7 +129,7 @@
return AXIS2_FAILURE;
}
result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node1, env);
- result = AXIOM_ELEMENT_GET_TEXT(result_ele, env, ret_node1);
+ result = axiom_element_get_text(result_ele, env, ret_node1);
printf("\nResult = %s\n", result);
}
else
@@ -178,18 +178,18 @@
"http://schemas.xmlsoap.org/soap/encoding/", ns0);
google_om_ele = axiom_element_create(env, NULL, operation, ns1, &google_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(google_om_ele, env, attri1, google_om_node);
- AXIOM_ELEMENT_DECLARE_NAMESPACE(google_om_ele, env, google_om_node, ns2);
- AXIOM_ELEMENT_DECLARE_NAMESPACE(google_om_ele, env, google_om_node, ns3);
+ axiom_element_add_attribute(google_om_ele, env, attri1, google_om_node);
+ axiom_element_declare_namespace(google_om_ele, env, google_om_node, ns2);
+ axiom_element_declare_namespace(google_om_ele, env, google_om_node, ns3);
text_om_ele = axiom_element_create(env, google_om_node, "key", NULL, &text_om_node);
attri1 = axiom_attribute_create(env, "type", "xsd:string", ns2);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(text_om_ele, env, attri1, text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, google_key, text_om_node);
+ axiom_element_add_attribute(text_om_ele, env, attri1, text_om_node);
+ axiom_element_set_text(text_om_ele, env, google_key, text_om_node);
text_om_ele = axiom_element_create(env, google_om_node, "phrase", NULL, &text_om_node);
- AXIOM_ELEMENT_ADD_ATTRIBUTE(text_om_ele, env, attri1, text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, word_to_spell, text_om_node);
+ axiom_element_add_attribute(text_om_ele, env, attri1, text_om_node);
+ axiom_element_set_text(text_om_ele, env, word_to_spell, text_om_node);
buffer = AXIOM_NODE_TO_STRING(google_om_node, env);
printf("%s\n", buffer);
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Fri Mar 16 01:30:59 2007
@@ -84,7 +84,7 @@
axis2_char_t *result = NULL;
axiom_element_t *result_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(ret_node, env);
- result = AXIOM_ELEMENT_GET_TEXT(result_ele, env, ret_node);
+ result = axiom_element_get_text(result_ele, env, ret_node);
printf("\nResult = %s\n", result);
}
else
@@ -156,10 +156,10 @@
math_om_ele = axiom_element_create(env, NULL, operation, ns1, &math_om_node);
text_om_ele = axiom_element_create(env, math_om_node, "param1", NULL, &text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, param1, text_om_node);
+ axiom_element_set_text(text_om_ele, env, param1, text_om_node);
text_om_ele = axiom_element_create(env, math_om_node, "param2", NULL, &text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, param2, text_om_node);
+ axiom_element_set_text(text_om_ele, env, param2, text_om_node);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE,
AXIS2_XML_PARSER_TYPE_BUFFER);
Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Fri Mar 16 01:30:59 2007
@@ -169,7 +169,7 @@
mtom_om_ele = axiom_element_create(env, NULL, "mtomSample", ns1, &mtom_om_node);
file_om_ele = axiom_element_create(env, mtom_om_node, "fileName", ns1, &file_om_node);
- AXIOM_ELEMENT_SET_TEXT(file_om_ele, env, to_save_name, file_om_node);
+ axiom_element_set_text(file_om_ele, env, to_save_name, file_om_node);
image_om_ele = axiom_element_create(env, mtom_om_node, "image", ns1, &image_om_node);
Modified: webservices/axis2/trunk/c/samples/client/notify/notify_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/notify_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/notify_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/notify/notify_client.c Fri Mar 16 01:30:59 2007
@@ -131,7 +131,7 @@
ns1 = axiom_namespace_create(env, "http://example.org/notify", "m");
notify_om_ele = axiom_element_create(env, NULL, "notify", ns1, ¬ify_om_node);
- AXIOM_ELEMENT_SET_TEXT(notify_om_ele, env, "notify5", notify_om_node);
+ axiom_element_set_text(notify_om_ele, env, "notify5", notify_om_node);
buffer = AXIOM_NODE_TO_STRING(notify_om_node, env);
if (buffer)
Modified: webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/yahoo_client.c Fri Mar 16 01:30:59 2007
@@ -134,12 +134,12 @@
query_node = axiom_node_create (env);
root_element = axiom_element_create (env, NULL, "yahoo_rest_search", NULL, &root_node);
appid_element = axiom_element_create (env, root_node, "appid", NULL, &appid_node);
- AXIOM_ELEMENT_SET_TEXT (appid_element, env, "YahooDemo", appid_node);
+ axiom_element_set_text (appid_element, env, "YahooDemo", appid_node);
query_element = axiom_element_create (env, root_node, "query", NULL, &query_node);
if (string)
- AXIOM_ELEMENT_SET_TEXT (query_element, env, string, query_node);
+ axiom_element_set_text (query_element, env, string, query_node);
else
- AXIOM_ELEMENT_SET_TEXT (query_element, env, "finance", query_node);
+ axiom_element_set_text (query_element, env, "finance", query_node);
return root_node;
}
Modified: webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c Fri Mar 16 01:30:59 2007
@@ -72,11 +72,11 @@
value_ele = axiom_element_create(env, op_node, "in1", NULL, &value_node);
sprintf(value_str, "%d", value1);
- AXIOM_ELEMENT_SET_TEXT(value_ele, env, value_str , value_node);
+ axiom_element_set_text(value_ele, env, value_str , value_node);
value_ele = axiom_element_create(env, op_node, "in2", NULL, &value_node);
sprintf(value_str, "%d", value1);
- AXIOM_ELEMENT_SET_TEXT(value_ele, env, value_str , value_node);
+ axiom_element_set_text(value_ele, env, value_str , value_node);
printf("requesting %d + %d \n", value1, value2);
om_str = AXIOM_NODE_TO_STRING(op_node, env);
@@ -102,7 +102,7 @@
if (node)
{
ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- text = AXIOM_ELEMENT_GET_TEXT(ele, env, node);
+ text = axiom_element_get_text(ele, env, node);
printf("answer = %s\n", text);
}
Modified: webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c Fri Mar 16 01:30:59 2007
@@ -64,12 +64,12 @@
{
node = AXIOM_NODE_GET_FIRST_CHILD(req, env);
ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- text = AXIOM_ELEMENT_GET_TEXT(ele, env, node);
+ text = axiom_element_get_text(ele, env, node);
value1 = atoi(text);
node = AXIOM_NODE_GET_NEXT_SIBLING(node, env);
ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- text = AXIOM_ELEMENT_GET_TEXT(ele, env, node);
+ text = axiom_element_get_text(ele, env, node);
value2 = atoi(text);
}
@@ -82,7 +82,7 @@
value_ele = axiom_element_create(env, op_node, "in1", NULL, &value_node);
sprintf(value_str, "%d", result);
- AXIOM_ELEMENT_SET_TEXT(value_ele, env, value_str , value_node);
+ axiom_element_set_text(value_ele, env, value_str , value_node);
return op_node;
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c Fri Mar 16 01:30:59 2007
@@ -115,7 +115,7 @@
element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if (element)
{
- axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
+ axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
if (AXIS2_STRCMP(op_name, "add") == 0)
Modified: webservices/axis2/trunk/c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo.c Fri Mar 16 01:30:59 2007
@@ -94,7 +94,7 @@
text_om_ele = axiom_element_create(env, echo_om_node, "text", NULL, &text_om_node);
- AXIOM_ELEMENT_SET_TEXT(text_om_ele, env, text, text_om_node);
+ axiom_element_set_text(text_om_ele, env, text, text_om_node);
return echo_om_node;
}
Modified: webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c Fri Mar 16 01:30:59 2007
@@ -110,7 +110,7 @@
axiom_element_t *error_ele = NULL;
error_ele = axiom_element_create(env, NULL, "EchoServiceError", NULL, &error_node);
- AXIOM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ", text_node);
+ axiom_element_set_text(error_ele, env, "Echo service failed ", text_node);
return error_node;
}
Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Fri Mar 16 01:30:59 2007
@@ -115,7 +115,7 @@
element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if (element)
{
- axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
+ axis2_char_t *op_name = axiom_element_get_localname(element, env);
if (op_name)
{
if (AXIS2_STRCMP(op_name, "add") == 0)
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom.c Fri Mar 16 01:30:59 2007
@@ -138,7 +138,7 @@
mtom_om_ele = axiom_element_create(env, NULL, "response", ns1, &mtom_om_node);
- AXIOM_ELEMENT_SET_TEXT(mtom_om_ele, env, "Image Saved", mtom_om_node);
+ axiom_element_set_text(mtom_om_ele, env, "Image Saved", mtom_om_node);
return mtom_om_node;
}
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c?view=diff&rev=518887&r1=518886&r2=518887
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c Fri Mar 16 01:30:59 2007
@@ -107,7 +107,7 @@
axiom_element_t *error_ele = NULL;
error_ele = axiom_element_create(env, node, "EchoServiceError", NULL,
&error_node);
- AXIOM_ELEMENT_SET_TEXT(error_ele, env, "Echo service failed ",
+ axiom_element_set_text(error_ele, env, "Echo service failed ",
text_node);
return error_node;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org