axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kausha...@apache.org
Subject svn commit: r517164 - in /webservices/axis2/trunk/c/rampart/src: omxmlsec/ omxmlsec/tokens/ util/
Date Mon, 12 Mar 2007 10:35:10 GMT
Author: kaushalye
Date: Mon Mar 12 03:35:03 2007
New Revision: 517164

URL: http://svn.apache.org/viewvc?view=rev&rev=517164
Log:
Changing references of macro AXIOM_NODE_GET_FIRST_CHILD to axiom_node_get_first_element()
function

Modified:
    webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_token_processor.c
    webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Mon Mar 12 03:35:03 2007
@@ -109,7 +109,7 @@
         /*Doesn't match? Get the first child*/    
         axiom_node_t *temp_node = NULL;
 
-        temp_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+        temp_node = axiom_node_get_first_element(node, env);
         while (temp_node)
         {
             axiom_node_t *res_node = NULL;       
@@ -151,7 +151,7 @@
         /*Doesn't match? Get the first child*/    
         axiom_node_t *temp_node = NULL;
 
-        temp_node = AXIOM_NODE_GET_FIRST_CHILD(node, env);
+        temp_node = axiom_node_get_first_element(node, env);
         while (temp_node)
         {
             axiom_node_t *res_node = NULL;       

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_binary_security_token.c Mon
Mar 12 03:35:03 2007
@@ -53,7 +53,7 @@
 
     /*Binary security token must be added as the first child of the paretn*/
     binary_security_token_node = AXIOM_NODE_DETACH(binary_security_token_node, env);
-    first_child_of_parent = AXIOM_NODE_GET_FIRST_CHILD(parent, env);
+    first_child_of_parent = axiom_node_get_first_element(parent, env);
     if(first_child_of_parent){
         /*If there is a child add bst before it*/
         AXIOM_NODE_INSERT_SIBLING_BEFORE(first_child_of_parent, env, binary_security_token_node);

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c Mon Mar 12 03:35:03 2007
@@ -218,7 +218,7 @@
      * Implementation of these are not important for Encryption.
      * Might've to relocate to another file as this processing is essential in Signature
      */
-    cur_node = AXIOM_NODE_GET_FIRST_CHILD(st_ref_node, env);
+    cur_node = axiom_node_get_first_element(st_ref_node, env);
     node_name = axiom_util_get_localname(cur_node, env);
     if(0 == AXIS2_STRCMP(OXS_NODE_REFERENCE, node_name)){
 

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c Mon Mar 12 03:35:03
2007
@@ -97,7 +97,7 @@
         return AXIS2_FAILURE;
     }
     
-    issuer_name_node =  AXIOM_NODE_GET_FIRST_CHILD(X509_issuer_serial_node, env);
+    issuer_name_node =  axiom_node_get_first_element(X509_issuer_serial_node, env);
     if(issuer_name_node){
         issuer_name = oxs_axiom_get_node_content(env, issuer_name_node); 
     }
@@ -155,7 +155,7 @@
         oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s.
Found", OXS_NODE_X509_DATA, node_name);
         return AXIS2_FAILURE;
     }
-    child_node = AXIOM_NODE_GET_FIRST_CHILD( X509_data_node, env);
+    child_node = axiom_node_get_first_element( X509_data_node, env);
     child_name = axiom_util_get_localname(child_node, env);
     
     /*Check wht's inside the <ds:X509Data>*/

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c Mon Mar 12 03:35:03 2007
@@ -350,7 +350,7 @@
     }
 
     /*First child is optional Transforms element*/
-    child_node = AXIOM_NODE_GET_FIRST_CHILD(ref_node, env);
+    child_node = axiom_node_get_first_element(ref_node, env);
     child_node_name = axiom_util_get_localname(child_node, env);
     if(0 == axis2_strcmp(child_node_name, OXS_NODE_TRANSFORMS)){
         /*Transforms found*/
@@ -360,7 +360,7 @@
 
         /*Create a list to hold transforms*/
         tr_list = axis2_array_list_create(env, 1);
-        tr_node = AXIOM_NODE_GET_FIRST_CHILD(child_node, env);
+        tr_node = axiom_node_get_first_element(child_node, env);
         /*Iterate thru all the <ds:Transform> nodes in <ds:Transforms>*/
         while(tr_node)
         {
@@ -461,7 +461,7 @@
     sign_part_list = axis2_array_list_create(env,5);
 
     /*Process signed info element*/
-    cur_node = AXIOM_NODE_GET_FIRST_CHILD(signed_info_node, env);
+    cur_node = axiom_node_get_first_element(signed_info_node, env);
     /*Iterate thru children of <SignedInfo>*/
     while(cur_node){
         axis2_char_t *localname =  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=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Mon Mar 12 03:35:03 2007
@@ -1203,7 +1203,7 @@
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] No encryption parts specified.
Using the body.");
             body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
             body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
-            body_child_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+            body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;
         }
@@ -1237,7 +1237,7 @@
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] Including the body the
body.");
             body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
             body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
-            body_child_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+            body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;
         }
@@ -1307,7 +1307,7 @@
 
             body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
             body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
-            body_child_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+            body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_sign_or_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;
         }
@@ -1345,7 +1345,7 @@
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_context] Including the body.");
             body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
             body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
-            body_child_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+            body_child_node = axiom_node_get_first_element(body_node, env);
             axis2_array_list_add(nodes_to_sign_or_encrypt, env, body_child_node);
             return AXIS2_SUCCESS;
         }

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c Mon Mar 12 03:35:03 2007
@@ -65,7 +65,7 @@
         AXIS2_LOG_INFO(env->log, "[rampart][rampart_encryption] No encryption parts specified.
Using the body as default");
         body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
         body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
-        body_child_node = AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
+        body_child_node = axiom_node_get_first_element(body_node, env);
         axis2_array_list_add(nodes_to_encrypt, env, body_child_node);
         return AXIS2_SUCCESS;
     }else if(0 == AXIS2_STRCMP(encryption_parts, "Header")){

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=517164&r1=517163&r2=517164
==============================================================================
--- 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 Mon Mar 12 03:35:03
2007
@@ -481,7 +481,7 @@
         return AXIS2_FAILURE;
     }
 
-    cur_node = AXIOM_NODE_GET_FIRST_CHILD(sign_info_node, env);
+    cur_node = axiom_node_get_first_element(sign_info_node, env);
     while(cur_node)
     {
         axis2_char_t *localname =  NULL;
@@ -569,7 +569,7 @@
 
     if(str_node)
     {
-        str_child_node = AXIOM_NODE_GET_FIRST_CHILD(str_node,env);
+        str_child_node = axiom_node_get_first_element(str_node,env);
         if(str_child_node)
         {
             str_child_name = axiom_util_get_localname(str_child_node, env);
@@ -629,7 +629,7 @@
         /*In such case policy support only Isssuer Serial scenario.*/
         if(axis2_strcmp(eki,RAMPART_STR_ISSUER_SERIAL)==0)
         {
-            key_info_child_node = AXIOM_NODE_GET_FIRST_CHILD(key_info_node,env);
+            key_info_child_node = axiom_node_get_first_element(key_info_node,env);
             if(key_info_child_node)
             {
                 axis2_char_t *key_info_child_name = NULL;

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_token_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_token_processor.c?view=diff&rev=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_token_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_token_processor.c Mon Mar 12 03:35:03
2007
@@ -43,7 +43,7 @@
     axiom_node_t *child_node = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    child_node = AXIOM_NODE_GET_FIRST_CHILD(st_ref_node, env);
+    child_node = axiom_node_get_first_element(st_ref_node, env);
     child_name = axiom_util_get_localname(child_node, env);
 
     if(0 == axis2_strcmp(child_name, OXS_NODE_REFERENCE)){

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=517164&r1=517163&r2=517164
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Mon Mar 12 03:35:03 2007
@@ -222,7 +222,7 @@
     }
 
     /*First child MUST be the Created element*/
-    created_node = AXIOM_NODE_GET_FIRST_CHILD(ts_node, env);
+    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)



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message