axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r372084 - in /webservices/axis2/trunk/c/modules/xml/soap: soap11_builder_helper.c soap_envelope.c soap_fault.c soap_fault_code.c soap_fault_detail.c
Date Wed, 25 Jan 2006 03:07:53 GMT
Author: nandika
Date: Tue Jan 24 19:07:44 2006
New Revision: 372084

URL: http://svn.apache.org/viewcvs?rev=372084&view=rev
Log:
serialize function added 

Modified:
    webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c?rev=372084&r1=372083&r2=372084&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c Tue Jan 24 19:07:44
2006
@@ -251,9 +251,8 @@
         {
             axis2_soap_fault_detail_t *fault_detail = NULL;
             fault_detail = axis2_soap_fault_detail_create(env);
-            printf("\n\n fault detail create\n\n");
             AXIS2_OM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIS2_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME);
-            AXIS2_SOAP_FAULT_SET_BASE_NODE(soap_fault, env, om_element_node);
+            AXIS2_SOAP_FAULT_DETAIL_SET_BASE_NODE(fault_detail, env, om_element_node);
             AXIS2_SOAP_FAULT_SET_DETAIL(soap_fault, env, fault_detail);
             AXIS2_SOAP_FAULT_SET_SOAP_VERSION(soap_fault, env, AXIS2_SOAP11);
         }

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=372084&r1=372083&r2=372084&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Tue Jan 24 19:07:44 2006
@@ -619,8 +619,8 @@
                         axis2_om_element_t *fault_detail_om_ele = NULL;
                         
                         fault_detail_om_node = AXIS2_SOAP_FAULT_DETAIL_GET_BASE_NODE(fault_detail,
env);
-                    //    fault_detail_om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(fault_detail_om_node,
env);
-                      //  AXIS2_OM_ELEMENT_SET_LOCALNAME(fault_detail_om_ele, env, AXIS2_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME);
+                        fault_detail_om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(fault_detail_om_node,
env);
+                        AXIS2_OM_ELEMENT_SET_LOCALNAME(fault_detail_om_ele, env, AXIS2_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME);
                     }
                 }  
             }

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c?rev=372084&r1=372083&r2=372084&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c Tue Jan 24 19:07:44 2006
@@ -367,9 +367,25 @@
     axis2_om_node_t *code_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_code_t* code = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
+    if(fault_impl->fcode)
+    {
+        return fault_impl->fcode;
+    } 
+    else if(fault_impl->soap_builder)
+    {
+        while(!(fault_impl->fcode) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_impl->soap_builder, env);
+            if(status == AXIS2_FAILURE)
+                break;
+        }            
+    }
+    
+    
+    /*
     this_node = fault_impl->om_ele_node;
     
     if(!(fault_impl->fcode))
@@ -382,6 +398,7 @@
         AXIS2_SOAP_FAULT_CODE_SET_BASE_NODE(code , env, code_node);
         fault_impl->fcode = code;
     }
+    */
     return fault_impl->fcode; 
 }
                                     
@@ -428,11 +445,24 @@
     axis2_om_node_t *reason_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_reason_t* reason = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     this_node = fault_impl->om_ele_node;
-    
+    if(fault_impl->freason)
+    {
+        return fault_impl->freason;
+    } 
+    else if(fault_impl->soap_builder)
+    {
+        while(!(fault_impl->freason) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_impl->soap_builder, env);
+            if(status == AXIS2_FAILURE)
+                break;
+        }            
+    }
+    /*
     if(!(fault_impl->freason))
     {
         reason_node = axis2_soap_utils_get_child_with_name(env, 
@@ -443,6 +473,7 @@
         AXIS2_SOAP_FAULT_REASON_SET_BASE_NODE(reason , env, reason_node);
         fault_impl->freason = reason;
     }
+    */
     return fault_impl->freason; 
 }
                                         
@@ -489,9 +520,25 @@
     axis2_om_node_t *node_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_node_t* node = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
+    
+    if(fault_impl->fnode)
+    {
+        return fault_impl->fnode;
+    } 
+    else if(fault_impl->soap_builder)
+    {
+        while(!(fault_impl->fnode) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_impl->soap_builder, env);
+            if(status == AXIS2_FAILURE)
+                break;
+        }            
+    }
+    /*
+    
     this_node = fault_impl->om_ele_node;
     
     if(!(fault_impl->fnode))
@@ -504,6 +551,7 @@
         AXIS2_SOAP_FAULT_NODE_SET_BASE_NODE(node , env, node_node);
         fault_impl->fnode = node;
     }
+    */
     return fault_impl->fnode; 
 
 }
@@ -551,15 +599,24 @@
     axis2_om_node_t *role_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_role_t* role = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
-    this_node = fault_impl->om_ele_node;
     if(fault_impl->frole)
     {
         return fault_impl->frole;
+    } 
+    else if(fault_impl->soap_builder)
+    {
+        while(!(fault_impl->frole) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_impl->soap_builder, env);
+            if(status == AXIS2_FAILURE)
+                break;
+        }            
     }
     /*
+    this_node = fault_impl->om_ele_node;
     if(!(fault_impl->frole))
     {
         role_node = axis2_soap_utils_get_child_with_name(env, 
@@ -618,9 +675,23 @@
     axis2_om_node_t *detail_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_detail_t* detail = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
+    if(fault_impl->fdetail)
+    {
+        return fault_impl->fdetail;
+    } 
+    else if(fault_impl->soap_builder)
+    {
+        while(!(fault_impl->fdetail) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_impl->soap_builder, env);
+            if(status == AXIS2_FAILURE)
+                break;
+        }            
+    }
+ 
     /*
     this_node = fault_impl->om_ele_node;
     

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c?rev=372084&r1=372083&r2=372084&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c Tue Jan 24 19:07:44 2006
@@ -306,16 +306,29 @@
     axis2_om_node_t *subcode_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_sub_code_t* subcode = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
-    this_node = fault_code_impl->om_ele_node;
-   
+    
     if(fault_code_impl->subcode)
     {
         return fault_code_impl->subcode;
     }
+    else if(fault_code_impl->builder)
+    {
+        while(!(fault_code_impl->subcode) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_code_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_code_impl->builder, env);
+            if(status == AXIS2_FAILURE)
+            {
+                break;
+            }
+        }
+    }
     
+   /*
+    this_node = fault_code_impl->om_ele_node;
+   
     if(!(fault_code_impl->subcode))
     {
         subcode_node = axis2_soap_utils_get_child_with_name(env, 
@@ -326,6 +339,7 @@
         AXIS2_SOAP_FAULT_SUB_CODE_SET_BASE_NODE(subcode , env, subcode_node);
         fault_code_impl->subcode = subcode;
     }
+    */
     return fault_code_impl->subcode;
 
 }
@@ -338,9 +352,26 @@
     axis2_om_node_t *value_node = NULL;
     axis2_om_node_t *this_node = NULL;
     axis2_soap_fault_value_t* fault_value = NULL;
-    
+    int status = AXIS2_SUCCESS;
     AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
+    
+    if(fault_code_impl->value)
+    {
+        return fault_code_impl->value;
+    }
+    else if(fault_code_impl->builder)
+    {
+        while(!(fault_code_impl->value) && !(AXIS2_OM_NODE_GET_BUILD_STATUS(fault_code_impl->om_ele_node,
env)))
+        {
+            status = AXIS2_SOAP_BUILDER_NEXT(fault_code_impl->builder, env);
+            if(status == AXIS2_FAILURE)
+            {
+                break;
+            }
+        }
+    }
+    /*
     this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_code, env);
     
     
@@ -355,6 +386,7 @@
         AXIS2_SOAP_FAULT_VALUE_SET_SOAP_VERSION(fault_value, env, AXIS2_SOAP11);
         fault_code_impl->value = fault_value;
     }
+    */
     return fault_code_impl->value;    
 
 }

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c?rev=372084&r1=372083&r2=372084&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c Tue Jan 24 19:07:44 2006
@@ -253,8 +253,6 @@
    }
    fault_detail_impl->om_ele_node = node;
    fault_detail_impl->om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node,
env);
-   printf("\n\n ___ %s ____\n\n", AXIS2_OM_ELEMENT_GET_LOCALNAME( fault_detail_impl->om_ele,
env));
-            
    return AXIS2_SUCCESS;
 }
 



Mime
View raw message