axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r372779 - in /webservices/axis2/trunk/c: include/axis2_soap_fault.h modules/xml/soap/soap_builder.c modules/xml/soap/soap_fault.c test/xml/soap/test_soap.c
Date Fri, 27 Jan 2006 08:06:45 GMT
Author: nandika
Date: Fri Jan 27 00:06:36 2006
New Revision: 372779

URL: http://svn.apache.org/viewcvs?rev=372779&view=rev
Log:
loging added

Modified:
    webservices/axis2/trunk/c/include/axis2_soap_fault.h
    webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
    webservices/axis2/trunk/c/test/xml/soap/test_soap.c

Modified: webservices/axis2/trunk/c/include/axis2_soap_fault.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_fault.h?rev=372779&r1=372778&r2=372779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_fault.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_fault.h Fri Jan 27 00:06:36 2006
@@ -179,7 +179,7 @@
     */
 AXIS2_DECLARE(axis2_soap_fault_t *)
 axis2_soap_fault_create(axis2_env_t **env);
-
+    
 AXIS2_DECLARE(axis2_soap_fault_t *)
 axis2_soap_fault_create_with_parent(axis2_env_t **env,
                                     struct axis2_soap_body *parent);

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c?rev=372779&r1=372778&r2=372779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c Fri Jan 27 00:06:36 2006
@@ -116,7 +116,7 @@
                                  int is_soap_element);
 
 static axis2_status_t
-identify_soap_version(axis2_soap_builder_t *builder,
+axis2_soap_builder_identify_soap_version(axis2_soap_builder_t *builder,
                       axis2_env_t **env,
                       axis2_char_t* soap_version_uri_from_transport);
                       
@@ -219,7 +219,13 @@
     builder_impl->soap_builder.ops->process_namespace_data =
             axis2_soap_builder_process_namespace_data;
     
-    status = identify_soap_version(&(builder_impl->soap_builder), env, soap_version);
+    status = axis2_soap_builder_identify_soap_version(&(builder_impl->soap_builder),
env, soap_version);
+    if(status == AXIS2_FAILURE)
+    {
+        axis2_soap_builder_free(&(builder_impl->soap_builder), env);
+        return NULL;
+    }
+    status = axis2_soap_builder_parse_headers(&(builder_impl->soap_builder), env);
     if(status == AXIS2_FAILURE)
     {
         axis2_soap_builder_free(&(builder_impl->soap_builder), env);
@@ -592,9 +598,8 @@
                 (AXIS2_STRCMP(ns_uri, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) != 0) &&
                 (AXIS2_STRCMP(ns_uri, AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) != 0))
         {
-            printf("AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI");
-            
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI, AXIS2_FAILURE);
               
+            AXIS2_LOG_WRITE((*env)->log,"AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI", AXIS2_LOG_DEBUG);
             return AXIS2_FAILURE;
         }
     }    
@@ -602,7 +607,7 @@
 }
 
 static axis2_status_t 
-identify_soap_version(axis2_soap_builder_t *builder,
+axis2_soap_builder_identify_soap_version(axis2_soap_builder_t *builder,
                       axis2_env_t **env,
                       axis2_char_t* soap_version_uri_from_transport)
 {
@@ -636,13 +641,23 @@
        if(soap_version_uri_from_transport && AXIS2_STRCMP(soap_version_uri_from_transport,
ns_uri) != 0)
         {
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP,
AXIS2_FAILURE);
+            AXIS2_LOG_WRITE((*env)->log , "AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP",
+                AXIS2_LOG_ERROR);            
             return AXIS2_FAILURE;
         }            
         if(AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
+        {
             builder_impl->soap_version = AXIS2_SOAP11;        
+            AXIS2_LOG_WRITE((*env)->log,"Identified soap version is soap11", AXIS2_LOG_DEBUG);
+        }
         else if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, ns_uri) == 0)
+        {
             builder_impl->soap_version = AXIS2_SOAP12;          
+            AXIS2_LOG_WRITE((*env)->log,"identified soap version is soap12", AXIS2_LOG_DEBUG);
+            
+        }
         AXIS2_SOAP_ENVELOPE_SET_SOAP_VERSION(builder_impl->soap_envelope, env, builder_impl->soap_version);
       
+       
         return AXIS2_SUCCESS;
     }
     return AXIS2_FAILURE;

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=372779&r1=372778&r2=372779&view=diff
==============================================================================
    (empty)

Modified: webservices/axis2/trunk/c/test/xml/soap/test_soap.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/soap/test_soap.c?rev=372779&r1=372778&r2=372779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/test/xml/soap/test_soap.c Fri Jan 27 00:06:36 2006
@@ -129,7 +129,6 @@
         return AXIS2_FAILURE;
     }
     AXIS2_SOAP_BODY_BUILD(soap_body, env);
-  */  
 
     while(!(AXIS2_OM_NODE_GET_BUILD_STATUS(om_node, env)) && !(AXIS2_OM_STAX_BUILDER_IS_COMPLETE(om_builder,
env)))
     {
@@ -137,6 +136,7 @@
         if(status == AXIS2_FAILURE)
                printf("failure %s" ,AXIS2_ERROR_GET_MESSAGE((*env)->error));
     }
+*/    
     xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE);
     
     om_output = axis2_om_output_create( env, xml_writer);  
@@ -227,6 +227,7 @@
     }
     allocator = axis2_allocator_init (NULL);
     log = axis2_log_create(allocator, NULL);
+    log->level = AXIS2_LOG_DEBUG;
     error = axis2_error_create(allocator);
     env = axis2_env_create_with_error_log(allocator, error,  log);
     



Mime
View raw message