You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2009/06/03 11:46:30 UTC

svn commit: r781321 - in /webservices/axis2/trunk/c/src/core/transport/amqp: receiver/qpid_receiver/ receiver/qpid_receiver/request_processor/ sender/qpid_sender/ util/

Author: manjula
Date: Wed Jun  3 09:46:30 2009
New Revision: 781321

URL: http://svn.apache.org/viewvc?rev=781321&view=rev
Log:
Adding changes due to latest qpid trunk and axis2.

Modified:
    webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_listener.cpp
    webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c
    webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp
    webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_listener.cpp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_listener.cpp?rev=781321&r1=781320&r2=781321&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_listener.cpp (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/axis2_qpid_receiver_listener.cpp Wed Jun  3 09:46:30 2009
@@ -82,7 +82,7 @@
 	/* Copy AMQP headers */
 	/* Content-Type */
 	request_data->content_type = NULL;
-	std::string content_type_tmp = message.getHeaders().getString(AXIS2_AMQP_HEADER_CONTENT_TYPE);
+	std::string content_type_tmp = message.getHeaders().getAsString(AXIS2_AMQP_HEADER_CONTENT_TYPE);
 	if (!content_type_tmp.empty())
 	{
 		axis2_char_t* content_type = (axis2_char_t*)AXIS2_MALLOC(env->allocator,
@@ -94,7 +94,7 @@
 	
 	/* SOAPAction */
 	request_data->soap_action = NULL;
-	std::string soap_action_tmp = message.getHeaders().getString(AXIS2_AMQP_HEADER_SOAP_ACTION);
+	std::string soap_action_tmp = message.getHeaders().getAsString(AXIS2_AMQP_HEADER_SOAP_ACTION);
 	if (!soap_action_tmp.empty())
 	{
 		axis2_char_t* soap_action = (axis2_char_t*)AXIS2_MALLOC(env->allocator,

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c?rev=781321&r1=781320&r2=781321&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.c Wed Jun  3 09:46:30 2009
@@ -207,11 +207,11 @@
                 	callback_ctx->chunked_stream = NULL;
             	}
 
-                binary_data_map = 
+                /*binary_data_map = 
                     axiom_mime_parser_parse(mime_parser, env,
                                             axis2_amqp_util_on_data_request,
                                             (void*)callback_ctx,
-                                            mime_boundary);
+                                            mime_boundary);*/
                 if (!binary_data_map)
                 {
                     return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp?rev=781321&r1=781320&r2=781321&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.cpp Wed Jun  3 09:46:30 2009
@@ -87,7 +87,7 @@
 
 		reqMessage.setData(messageContent);
 	
-		async(session).messageTransfer(arg::content = reqMessage, arg::destination = AXIS2_AMQP_EXCHANGE_DIRECT);
+		session.messageTransfer(arg::content = reqMessage, arg::destination = AXIS2_AMQP_EXCHANGE_DIRECT);
 		
 		/* Create subscription manager */
 		SubscriptionManager subscriptionManager(session);
@@ -98,7 +98,7 @@
 		if (subscriptionManager.get(resMessage, replyToQueueName, reqTimeout))
 		{
 			responseContent = resMessage.getData();
-			responseContentType = resMessage.getHeaders().getString(AXIS2_AMQP_HEADER_CONTENT_TYPE);
+			responseContentType = resMessage.getHeaders().getAsString(AXIS2_AMQP_HEADER_CONTENT_TYPE);
 		
 			status = true;
 		}
@@ -155,7 +155,7 @@
 
 		message.setData(messageContent);
 
-		async(session).messageTransfer(arg::content = message, arg::destination = AXIS2_AMQP_EXCHANGE_DIRECT);
+		session.messageTransfer(arg::content = message, arg::destination = AXIS2_AMQP_EXCHANGE_DIRECT);
 
 		connection.close();
 

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c?rev=781321&r1=781320&r2=781321&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/util/axis2_amqp_util.c Wed Jun  3 09:46:30 2009
@@ -217,11 +217,11 @@
                 	callback_ctx->chunked_stream = NULL;
             	}
 
-                binary_data_map = 
+                /*binary_data_map = 
                     axiom_mime_parser_parse(mime_parser, env,
                                             axis2_amqp_util_on_data_request,
                                             (void*)callback_ctx,
-                                            mime_boundary);
+                                            mime_boundary);*/
 
                 if (!binary_data_map)
                 {