axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r395146 - in /webservices/axis2/trunk/c: include/axis2_soap_envelope.h modules/core/engine/engine.c modules/mod_addr/addr_in_handler.c modules/xml/soap/soap_envelope.c
Date Wed, 19 Apr 2006 05:51:51 GMT
Author: nandika
Date: Tue Apr 18 22:51:50 2006
New Revision: 395146

URL: http://svn.apache.org/viewcvs?rev=395146&view=rev
Log:
compilation problems fixed on windows

Modified:
    webservices/axis2/trunk/c/include/axis2_soap_envelope.h
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c

Modified: webservices/axis2/trunk/c/include/axis2_soap_envelope.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_envelope.h?rev=395146&r1=395145&r2=395146&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap_envelope.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap_envelope.h Tue Apr 18 22:51:50 2006
@@ -151,9 +151,9 @@
 };
 
  /**
-  * creates a soap envelope struct with empty values 
-  * Indended to be uaed by soap_builder
   * @param env Environment. MUST NOT be NULL
+  * create a soap_envelope with the given namespace prefix and uri
+  * as the prefix and uri, The uri of ns should be valid soap uri
   */
 AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_soap_envelope_create(axis2_env_t **env, 

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=395146&r1=395145&r2=395146&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Apr 18 22:51:50 2006
@@ -24,6 +24,7 @@
 #include <axis2_transport_sender.h>
 #include <axis2_http_transport.h>
 #include <axis2_addr.h>
+#include <axis2_uuid_gen.h>
 
 /**
  * There is only one engine for the Server and the Client. the send() and receive()
@@ -467,7 +468,7 @@
         /* send the SOAP Fault*/
         axis2_conf_ctx_t *conf_ctx = NULL;
         axis2_transport_sender_t *transport_sender = NULL;
-
+        axis2_transport_out_desc_t *transport_out  = NULL;
         conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
         if (conf_ctx)
         {
@@ -482,7 +483,7 @@
             }
         }
         
-        axis2_transport_out_desc_t *transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
env);
+        transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
         
         if (transport_out)
             transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=395146&r1=395145&r2=395146&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Tue Apr 18 22:51:50 2006
@@ -739,15 +739,16 @@
     axis2_soap_envelope_t *envelope = NULL;
     axis2_array_list_t *sub_codes = NULL;
     int soap_version = AXIS2_SOAP12;
+    axis2_om_node_t* text_om_node = NULL;
+    axis2_om_element_t * text_om_ele = NULL;
+    axis2_om_namespace_t *ns1 = NULL;
 
     if (AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env))
     {
         soap_version = AXIS2_SOAP11;
     }
     
-    axis2_om_node_t* text_om_node = NULL;
-    axis2_om_element_t * text_om_ele = NULL;
-    axis2_om_namespace_t *ns1 = NULL;
+
     ns1 = axis2_om_namespace_create (env, addr_ns_str, "wsa");
     text_om_ele = axis2_om_element_create(env, NULL, "ProblemHeaderQName", ns1, &text_om_node);
     AXIS2_OM_ELEMENT_SET_TEXT(text_om_ele, env, header_name, text_om_node);

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=395146&r1=395145&r2=395146&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Tue Apr 18 22:51:50 2006
@@ -731,32 +731,22 @@
 {
     axis2_soap_envelope_t *soap_env = NULL;
     axis2_soap_body_t *soap_body = NULL;
-    axis2_om_namespace_t *om_ns = NULL;
     axis2_soap_envelope_impl_t *env_impl = NULL;
 	axis2_soap_fault_t *fault = NULL;
 	axis2_char_t *env_ns_uri = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
-	if (AXIS2_SOAP11 == soap_version)
-		env_ns_uri = AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI;
-	else if (AXIS2_SOAP12 == soap_version)
-		env_ns_uri = AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
-	else
+	if (AXIS2_SOAP11 != soap_version && AXIS2_SOAP12 != soap_version)
 	{
 		AXIS2_ERROR_SET((*env)->error,
 			AXIS2_ERROR_INVALID_SOAP_VERSION, AXIS2_FAILURE);
 		return NULL;
 	}
-	om_ns = axis2_om_namespace_create(env,
-		AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
-		AXIS2_SOAP_DEFAULT_NAMESPACE_PREFIX);
-	if(!om_ns)
-		return NULL;
+	
 	soap_env = axis2_soap_envelope_create_default_soap_envelope(env, soap_version);
 	if (!soap_env)
 	{
-		AXIS2_OM_NAMESPACE_FREE(om_ns, env);
-		return NULL;
+        return NULL;
 	}
 	env_impl = AXIS2_INTF_TO_IMPL(soap_env);
 



Mime
View raw message