Partial fix of AXIS2C-1440

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@958884 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 506 insertions, 506 deletions

diff --git a/src/core/transport/amqp/sender/axis2_amqp_sender.c b/src/core/transport/amqp/sender/axis2_amqp_sender.c
index aae5496..c50a3db 100644
--- a/src/core/transport/amqp/sender/axis2_amqp_sender.c
+++ b/src/core/transport/amqp/sender/axis2_amqp_sender.c
@@ -1,344 +1,344 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-#include <axiom_soap.h>

-#include <axis2_transport_in_desc.h>

-#include <axis2_amqp_defines.h>

-#include <axis2_amqp_util.h>

-#include <axis2_amqp_receiver.h>

-#include <axis2_amqp_sender.h>

-

-static const axis2_transport_sender_ops_t amqp_sender_ops =

-{

-    axis2_amqp_sender_init,

-    axis2_amqp_sender_invoke,

-    axis2_amqp_sender_clean_up,

-    axis2_amqp_sender_free

-};

-

-AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL

-axis2_amqp_sender_create(

-    const axutil_env_t* env)

-{

-    AXIS2_ENV_CHECK(env, NULL);

-

-    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;

-

-    sender_resource_pack = (axis2_amqp_sender_resource_pack_t*)AXIS2_MALLOC(env->allocator,

-        sizeof(axis2_amqp_sender_resource_pack_t));

-

-    if(!sender_resource_pack)

-    {

-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

-        return NULL;

-    }

-

-    sender_resource_pack->sender.ops = &amqp_sender_ops;

-    sender_resource_pack->conf_ctx = NULL;

-

-    return &(sender_resource_pack->sender);

-}

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL

-axis2_amqp_sender_init(

-    axis2_transport_sender_t* sender,

-    const axutil_env_t* env,

-    axis2_conf_ctx_t* conf_ctx,

-    axis2_transport_out_desc_t* out_desc)

-{

-    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;

-    axutil_property_t* property = NULL;

-    int* request_timeout = (int*)AXIS2_MALLOC(env->allocator, sizeof(int));

-    *request_timeout = AXIS2_QPID_NULL_CONF_INT;

-

-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

-

-    sender_resource_pack = AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(sender);

-    sender_resource_pack->conf_ctx = conf_ctx;

-

-    /* Set request timeout */

-    *request_timeout = axis2_amqp_util_get_out_desc_conf_value_int(out_desc, env,

-        AXIS2_AMQP_CONF_QPID_REQUEST_TIMEOUT);

-    if(*request_timeout == AXIS2_QPID_NULL_CONF_INT)

-    {

-        *request_timeout = AXIS2_QPID_DEFAULT_REQUEST_TIMEOUT;

-    }

-    property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0, 0,

-        (void*)request_timeout);

-    axis2_conf_ctx_set_property(sender_resource_pack->conf_ctx, env,

-        AXIS2_AMQP_CONF_CTX_PROPERTY_REQUEST_TIMEOUT, property);

-

-    return AXIS2_SUCCESS;

-}

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL

-axis2_amqp_sender_invoke(

-    axis2_transport_sender_t* sender,

-    const axutil_env_t* env,

-    axis2_msg_ctx_t* msg_ctx)

-{

-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

-    AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);

-

-    axiom_soap_envelope_t* request_soap_envelope = NULL;

-    axiom_xml_writer_t* xml_writer = NULL;

-    axiom_output_t* request_om_output = NULL;

-    axis2_char_t* request_content = NULL;

-    axis2_bool_t is_server = AXIS2_TRUE;

-    axis2_bool_t is_soap_11 = AXIS2_FALSE;

-    axutil_string_t* content_type = NULL;

-    const axis2_char_t* soap_action = NULL;

-    axis2_bool_t do_mtom = AXIS2_FALSE;

-    axis2_bool_t status = AXIS2_FAILURE;

-

-    request_soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);

-

-    xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,

-        AXIS2_XML_PARSER_TYPE_BUFFER);

-    if(!xml_writer)

-    {

-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Create XML Writer");

-        return AXIS2_FAILURE;

-    }

-

-    request_om_output = axiom_output_create(env, xml_writer);

-    if(!request_om_output)

-    {

-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Create OM Output");

-        axiom_xml_writer_free(xml_writer, env);

-        xml_writer = NULL;

-        return AXIS2_FAILURE;

-    }

-

-    is_soap_11 = axis2_msg_ctx_get_is_soap_11(msg_ctx, env);

-

-    /* Set SOAP version */

-    axiom_output_set_soap11(request_om_output, env, is_soap_11);

-

-    /* Content-Type */

-    if(AXIS2_TRUE == is_soap_11)

-    {

-        /* SOAP1.1 */

-        content_type = axutil_string_create(env, AXIS2_AMQP_HEADER_ACCEPT_TEXT_XML);

-    }

-    else

-    {

-        /* SOAP1.2 */

-        content_type = axutil_string_create(env, AXIS2_AMQP_HEADER_ACCEPT_APPL_SOAP);

-    }

-

-    /* SOAP action */

-    soap_action = axutil_string_get_buffer(axis2_msg_ctx_get_soap_action(msg_ctx, env), env);

-

-    if(!soap_action)

-        soap_action = "";

-

-    /* Handle MTOM */

-    do_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);

-

-    axiom_output_set_do_optimize(request_om_output, env, do_mtom);

-    axiom_soap_envelope_serialize(request_soap_envelope, env, request_om_output, AXIS2_FALSE);

-

-    if(do_mtom)

-    {

-        axis2_status_t mtom_status = AXIS2_FAILURE;

-        axutil_array_list_t* mime_parts = NULL;

-

-        mtom_status = axiom_output_flush(request_om_output, env);

-

-        if(mtom_status == AXIS2_SUCCESS)

-        {

-            mime_parts = axiom_output_get_mime_parts(request_om_output, env);

-            if(!mime_parts)

-            {

-                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,

-                    "Unable to create the mime part list from request_om_output");

-

-                return AXIS2_FAILURE;

-            }

-            else

-            {

-                axis2_msg_ctx_set_mime_parts(msg_ctx, env, mime_parts);

-            }

-        }

-

-        content_type = axutil_string_create(env, axiom_output_get_content_type(request_om_output,

-            env));

-    }

-

-    request_content = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);

-    if(!request_content)

-    {

-        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Serialize the SOAP Envelope");

-        return AXIS2_FAILURE;

-    }

-

-    is_server = axis2_amqp_util_msg_ctx_get_server_side(msg_ctx, env);

-

-    if(is_server)

-    {

-        status = axis2_qpid_send(request_content, env, axutil_string_get_buffer(content_type, env),

-            soap_action, msg_ctx);

-    }

-    else

-    {

-        if(AXIS2_TRUE == axis2_amqp_util_msg_ctx_get_use_separate_listener(msg_ctx, env)) /* Dual Channel */

-        {

-            status = axis2_qpid_send(request_content, env, axutil_string_get_buffer(content_type,

-                env), soap_action, msg_ctx);

-        }

-        else

-        {

-            axis2_op_t* op = NULL;

-            const axis2_char_t* mep = NULL;

-

-            op = axis2_msg_ctx_get_op(msg_ctx, env);

-

-            if(op)

-            {

-                mep = axis2_op_get_msg_exchange_pattern(op, env);

-            }

-

-            axis2_amqp_response_t* response = NULL;

-            response = axis2_qpid_send_receive(request_content, env, axutil_string_get_buffer(

-                content_type, env), soap_action, msg_ctx);

-

-            if(response)

-            {

-                /* Create in stream */

-                if(response->data)

-                {

-                    axutil_stream_t* in_stream = NULL;

-                    axutil_property_t* property = NULL;

-

-                    in_stream = axutil_stream_create_basic(env);

-                    axutil_stream_write(in_stream, env, response->data, response->length);

-

-                    property = axutil_property_create(env);

-                    axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);

-                    axutil_property_set_free_func(property, env, axutil_stream_free_void_arg);

-                    axutil_property_set_value(property, env, in_stream);

-

-                    axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property);

-                }

-

-                if(mep)

-                {

-                    if(0 == axutil_strcmp(mep, AXIS2_MEP_URI_OUT_IN)) /* Out-In */

-                    {

-                        axiom_soap_envelope_t* response_soap_envelope = NULL;

-

-                        response_soap_envelope = axis2_amqp_util_get_soap_envelope(response, env,

-                            msg_ctx);

-                        if(response_soap_envelope)

-                        {

-                            axis2_msg_ctx_set_response_soap_envelope(msg_ctx, env,

-                                response_soap_envelope);

-                        }

-                    }

-                }

-

-                status = AXIS2_SUCCESS;

-

-                axis2_msg_ctx_set_status_code(msg_ctx, env, status);

-

-                axis2_amqp_response_free(response, env);

-            }

-            else

-            {

-                if(mep)

-                {

-                    if(axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 || axutil_strcmp(mep,

-                        AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0) /* One-way */

-                    {

-                        status = AXIS2_SUCCESS;

-

-                        /* Set status code in msg_ctx */

-                        axis2_msg_ctx_set_status_code(msg_ctx, env, status);

-                    }

-                }

-            }

-        }

-    }

-

-    if(content_type)

-        axutil_string_free(content_type, env);

-

-    return status;

-}

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL

-axis2_amqp_sender_clean_up(

-    axis2_transport_sender_t* sender,

-    const axutil_env_t* env,

-    axis2_msg_ctx_t* msg_ctx)

-{

-    return AXIS2_SUCCESS;

-}

-

-AXIS2_EXTERN void AXIS2_CALL

-axis2_amqp_sender_free(

-    axis2_transport_sender_t* sender,

-    const axutil_env_t* env)

-{

-    AXIS2_ENV_CHECK(env, void);

-

-    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;

-    sender_resource_pack = AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(sender);

-

-    AXIS2_FREE(env->allocator, sender_resource_pack);

-}

-

-/* Library Exports */

-

-AXIS2_EXPORT int

-#ifndef AXIS2_STATIC_DEPLOY

-axis2_get_instance(

-#else

-    axis2_amqp_sender_get_instance(

-#endif

-    struct axis2_transport_sender** inst,

-    const axutil_env_t* env)

-{

-    int status = AXIS2_SUCCESS;

-

-    *inst = axis2_amqp_sender_create(env);

-    if(!(*inst))

-    {

-        status = AXIS2_FAILURE;

-    }

-

-    return status;

-}

-

-AXIS2_EXPORT int

-#ifndef AXIS2_STATIC_DEPLOY

-axis2_remove_instance(

-#else

-    axis2_amqp_sender_remove_instance(

-#endif

-    axis2_transport_sender_t* inst,

-    const axutil_env_t* env)

-{

-    if(inst)

-    {

-        axis2_transport_sender_free(inst, env);

-    }

-

-    return AXIS2_SUCCESS;

-}

-

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <axiom_soap.h>
+#include <axis2_transport_in_desc.h>
+#include <axis2_amqp_defines.h>
+#include <axis2_amqp_util.h>
+#include <axis2_amqp_receiver.h>
+#include <axis2_amqp_sender.h>
+
+static const axis2_transport_sender_ops_t amqp_sender_ops =
+{
+    axis2_amqp_sender_init,
+    axis2_amqp_sender_invoke,
+    axis2_amqp_sender_clean_up,
+    axis2_amqp_sender_free
+};
+
+AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL
+axis2_amqp_sender_create(
+    const axutil_env_t* env)
+{
+    AXIS2_ENV_CHECK(env, NULL);
+
+    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;
+
+    sender_resource_pack = (axis2_amqp_sender_resource_pack_t*)AXIS2_MALLOC(env->allocator,
+        sizeof(axis2_amqp_sender_resource_pack_t));
+
+    if(!sender_resource_pack)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    sender_resource_pack->sender.ops = &amqp_sender_ops;
+    sender_resource_pack->conf_ctx = NULL;
+
+    return &(sender_resource_pack->sender);
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_amqp_sender_init(
+    axis2_transport_sender_t* sender,
+    const axutil_env_t* env,
+    axis2_conf_ctx_t* conf_ctx,
+    axis2_transport_out_desc_t* out_desc)
+{
+    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;
+    axutil_property_t* property = NULL;
+    int* request_timeout = (int*)AXIS2_MALLOC(env->allocator, sizeof(int));
+    *request_timeout = AXIS2_QPID_NULL_CONF_INT;
+
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    sender_resource_pack = AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(sender);
+    sender_resource_pack->conf_ctx = conf_ctx;
+
+    /* Set request timeout */
+    *request_timeout = axis2_amqp_util_get_out_desc_conf_value_int(out_desc, env,
+        AXIS2_AMQP_CONF_QPID_REQUEST_TIMEOUT);
+    if(*request_timeout == AXIS2_QPID_NULL_CONF_INT)
+    {
+        *request_timeout = AXIS2_QPID_DEFAULT_REQUEST_TIMEOUT;
+    }
+    property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0, 0,
+        (void*)request_timeout);
+    axis2_conf_ctx_set_property(sender_resource_pack->conf_ctx, env,
+        AXIS2_AMQP_CONF_CTX_PROPERTY_REQUEST_TIMEOUT, property);
+
+    return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_amqp_sender_invoke(
+    axis2_transport_sender_t* sender,
+    const axutil_env_t* env,
+    axis2_msg_ctx_t* msg_ctx)
+{
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+
+    axiom_soap_envelope_t* request_soap_envelope = NULL;
+    axiom_xml_writer_t* xml_writer = NULL;
+    axiom_output_t* request_om_output = NULL;
+    axis2_char_t* request_content = NULL;
+    axis2_bool_t is_server = AXIS2_TRUE;
+    axis2_bool_t is_soap_11 = AXIS2_FALSE;
+    axutil_string_t* content_type = NULL;
+    const axis2_char_t* soap_action = NULL;
+    axis2_bool_t do_mtom = AXIS2_FALSE;
+    axis2_bool_t status = AXIS2_FAILURE;
+
+    request_soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+
+    xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
+        AXIS2_XML_PARSER_TYPE_BUFFER);
+    if(!xml_writer)
+    {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Create XML Writer");
+        return AXIS2_FAILURE;
+    }
+
+    request_om_output = axiom_output_create(env, xml_writer);
+    if(!request_om_output)
+    {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Create OM Output");
+        axiom_xml_writer_free(xml_writer, env);
+        xml_writer = NULL;
+        return AXIS2_FAILURE;
+    }
+
+    is_soap_11 = axis2_msg_ctx_get_is_soap_11(msg_ctx, env);
+
+    /* Set SOAP version */
+    axiom_output_set_soap11(request_om_output, env, is_soap_11);
+
+    /* Content-Type */
+    if(AXIS2_TRUE == is_soap_11)
+    {
+        /* SOAP1.1 */
+        content_type = axutil_string_create(env, AXIS2_AMQP_HEADER_ACCEPT_TEXT_XML);
+    }
+    else
+    {
+        /* SOAP1.2 */
+        content_type = axutil_string_create(env, AXIS2_AMQP_HEADER_ACCEPT_APPL_SOAP);
+    }
+
+    /* SOAP action */
+    soap_action = axutil_string_get_buffer(axis2_msg_ctx_get_soap_action(msg_ctx, env), env);
+
+    if(!soap_action)
+        soap_action = "";
+
+    /* Handle MTOM */
+    do_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);
+
+    axiom_output_set_do_optimize(request_om_output, env, do_mtom);
+    axiom_soap_envelope_serialize(request_soap_envelope, env, request_om_output, AXIS2_FALSE);
+
+    if(do_mtom)
+    {
+        axis2_status_t mtom_status = AXIS2_FAILURE;
+        axutil_array_list_t* mime_parts = NULL;
+
+        mtom_status = axiom_output_flush(request_om_output, env);
+
+        if(mtom_status == AXIS2_SUCCESS)
+        {
+            mime_parts = axiom_output_get_mime_parts(request_om_output, env);
+            if(!mime_parts)
+            {
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "Unable to create the mime part list from request_om_output");
+
+                return AXIS2_FAILURE;
+            }
+            else
+            {
+                axis2_msg_ctx_set_mime_parts(msg_ctx, env, mime_parts);
+            }
+        }
+
+        content_type = axutil_string_create(env, axiom_output_get_content_type(request_om_output,
+            env));
+    }
+
+    request_content = (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env);
+    if(!request_content)
+    {
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Failed to Serialize the SOAP Envelope");
+        return AXIS2_FAILURE;
+    }
+
+    is_server = axis2_amqp_util_msg_ctx_get_server_side(msg_ctx, env);
+
+    if(is_server)
+    {
+        status = axis2_qpid_send(request_content, env, axutil_string_get_buffer(content_type, env),
+            soap_action, msg_ctx);
+    }
+    else
+    {
+        if(AXIS2_TRUE == axis2_amqp_util_msg_ctx_get_use_separate_listener(msg_ctx, env)) /* Dual Channel */
+        {
+            status = axis2_qpid_send(request_content, env, axutil_string_get_buffer(content_type,
+                env), soap_action, msg_ctx);
+        }
+        else
+        {
+            axis2_op_t* op = NULL;
+            const axis2_char_t* mep = NULL;
+
+            op = axis2_msg_ctx_get_op(msg_ctx, env);
+
+            if(op)
+            {
+                mep = axis2_op_get_msg_exchange_pattern(op, env);
+            }
+
+            axis2_amqp_response_t* response = NULL;
+            response = axis2_qpid_send_receive(request_content, env, axutil_string_get_buffer(
+                content_type, env), soap_action, msg_ctx);
+
+            if(response)
+            {
+                /* Create in stream */
+                if(response->data)
+                {
+                    axutil_stream_t* in_stream = NULL;
+                    axutil_property_t* property = NULL;
+
+                    in_stream = axutil_stream_create_basic(env);
+                    axutil_stream_write(in_stream, env, response->data, response->length);
+
+                    property = axutil_property_create(env);
+                    axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+                    axutil_property_set_free_func(property, env, axutil_stream_free_void_arg);
+                    axutil_property_set_value(property, env, in_stream);
+
+                    axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property);
+                }
+
+                if(mep)
+                {
+                    if(0 == axutil_strcmp(mep, AXIS2_MEP_URI_OUT_IN)) /* Out-In */
+                    {
+                        axiom_soap_envelope_t* response_soap_envelope = NULL;
+
+                        response_soap_envelope = axis2_amqp_util_get_soap_envelope(response, env,
+                            msg_ctx);
+                        if(response_soap_envelope)
+                        {
+                            axis2_msg_ctx_set_response_soap_envelope(msg_ctx, env,
+                                response_soap_envelope);
+                        }
+                    }
+                }
+
+                status = AXIS2_SUCCESS;
+
+                axis2_msg_ctx_set_status_code(msg_ctx, env, status);
+
+                axis2_amqp_response_free(response, env);
+            }
+            else
+            {
+                if(mep)
+                {
+                    if(axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 || axutil_strcmp(mep,
+                        AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0) /* One-way */
+                    {
+                        status = AXIS2_SUCCESS;
+
+                        /* Set status code in msg_ctx */
+                        axis2_msg_ctx_set_status_code(msg_ctx, env, status);
+                    }
+                }
+            }
+        }
+    }
+
+    if(content_type)
+        axutil_string_free(content_type, env);
+
+    return status;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_amqp_sender_clean_up(
+    axis2_transport_sender_t* sender,
+    const axutil_env_t* env,
+    axis2_msg_ctx_t* msg_ctx)
+{
+    return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN void AXIS2_CALL
+axis2_amqp_sender_free(
+    axis2_transport_sender_t* sender,
+    const axutil_env_t* env)
+{
+    AXIS2_ENV_CHECK(env, void);
+
+    axis2_amqp_sender_resource_pack_t* sender_resource_pack = NULL;
+    sender_resource_pack = AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(sender);
+
+    AXIS2_FREE(env->allocator, sender_resource_pack);
+}
+
+/* Library Exports */
+
+AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
+axis2_get_instance(
+#else
+    axis2_amqp_sender_get_instance(
+#endif
+    struct axis2_transport_sender** inst,
+    const axutil_env_t* env)
+{
+    int status = AXIS2_SUCCESS;
+
+    *inst = axis2_amqp_sender_create(env);
+    if(!(*inst))
+    {
+        status = AXIS2_FAILURE;
+    }
+
+    return status;
+}
+
+AXIS2_EXPORT int
+#ifndef AXIS2_STATIC_DEPLOY
+axis2_remove_instance(
+#else
+    axis2_amqp_sender_remove_instance(
+#endif
+    axis2_transport_sender_t* inst,
+    const axutil_env_t* env)
+{
+    if(inst)
+    {
+        axis2_transport_sender_free(inst, env);
+    }
+
+    return AXIS2_SUCCESS;
+}
+
diff --git a/src/core/transport/amqp/sender/axis2_amqp_sender.h b/src/core/transport/amqp/sender/axis2_amqp_sender.h
index b523347..2aa3055 100644
--- a/src/core/transport/amqp/sender/axis2_amqp_sender.h
+++ b/src/core/transport/amqp/sender/axis2_amqp_sender.h
@@ -1,63 +1,63 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-#ifndef AXIS2_AMQP_SENDER_H

-#define AXIS2_AMQP_SENDER_H

-

-#include <axutil_env.h>

-#include <axis2_conf_ctx.h>

-#include <axis2_transport_sender.h>

-#include <axis2_qpid_sender_interface.h>

-

-typedef struct axis2_amqp_sender_resource_pack

-{

-	axis2_transport_sender_t sender;

-	axis2_conf_ctx_t* conf_ctx;

-}

-axis2_amqp_sender_resource_pack_t;

-

-#define AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(amqp_sender) \

-	((axis2_amqp_sender_resource_pack_t*)(amqp_sender))

-

-AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL

-axis2_amqp_sender_create(const axutil_env_t* env);

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL 

-axis2_amqp_sender_init(

-	axis2_transport_sender_t* sender,

-	const axutil_env_t* env,

-	axis2_conf_ctx_t* conf_ctx,

-	axis2_transport_out_desc_t* out_desc);

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL 

-axis2_amqp_sender_invoke(

-	axis2_transport_sender_t* sender,

-	const axutil_env_t* env,

-	axis2_msg_ctx_t* msg_ctx);

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL 

-axis2_amqp_sender_clean_up(

-	axis2_transport_sender_t* sender,

-	const axutil_env_t* env,

-	axis2_msg_ctx_t* msg_ctx);

-

-AXIS2_EXTERN void AXIS2_CALL 

-axis2_amqp_sender_free(

-	axis2_transport_sender_t* sender,

-	const axutil_env_t* env);

-

-#endif

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_AMQP_SENDER_H
+#define AXIS2_AMQP_SENDER_H
+
+#include <axutil_env.h>
+#include <axis2_conf_ctx.h>
+#include <axis2_transport_sender.h>
+#include <axis2_qpid_sender_interface.h>
+
+typedef struct axis2_amqp_sender_resource_pack
+{
+	axis2_transport_sender_t sender;
+	axis2_conf_ctx_t* conf_ctx;
+}
+axis2_amqp_sender_resource_pack_t;
+
+#define AXIS2_AMQP_SENDER_TO_RESOURCE_PACK(amqp_sender) \
+	((axis2_amqp_sender_resource_pack_t*)(amqp_sender))
+
+AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL
+axis2_amqp_sender_create(const axutil_env_t* env);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
+axis2_amqp_sender_init(
+	axis2_transport_sender_t* sender,
+	const axutil_env_t* env,
+	axis2_conf_ctx_t* conf_ctx,
+	axis2_transport_out_desc_t* out_desc);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
+axis2_amqp_sender_invoke(
+	axis2_transport_sender_t* sender,
+	const axutil_env_t* env,
+	axis2_msg_ctx_t* msg_ctx);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL 
+axis2_amqp_sender_clean_up(
+	axis2_transport_sender_t* sender,
+	const axutil_env_t* env,
+	axis2_msg_ctx_t* msg_ctx);
+
+AXIS2_EXTERN void AXIS2_CALL 
+axis2_amqp_sender_free(
+	axis2_transport_sender_t* sender,
+	const axutil_env_t* env);
+
+#endif
diff --git a/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h b/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h
index 8c94cfa..e797c71 100644
--- a/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h
+++ b/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender.h
@@ -1,49 +1,49 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *      tcp://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-#ifndef AXIS2_QPID_SENDER_H

-#define AXIS2_QPID_SENDER_H

-

-#include <axis2_util.h>

-#include <sstream>

-#include <string>

-

-using std::string;

-

-class Axis2QpidSender

-{

-	public:

-		Axis2QpidSender(string qpidBrokerIP, int qpidBrokerPort, const axutil_env_t* env);

-		~Axis2QpidSender(void);

-

-		bool SendReceive(string messageContent, string toQueueName, bool isSOAP11, 

-				string contentType, string soapAction, axutil_array_list_t* mime_parts, int timeout);

-		bool Send(string messageContent, string toQueueName, string replyToQueueName, bool isSOAP11, 

-				string contentType, string soapAction, axutil_array_list_t* mime_parts);

-		

-		string 		 responseContent;

-		string		 responseContentType;

-

-	private:

-		void GetMimeBody(axutil_array_list_t* mime_parts, string& mimeBody);

-

-		string		  		 qpidBrokerIP;

-		int			  		 qpidBrokerPort;

-		const axutil_env_t*  env;

-};

-

-#endif

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      tcp://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AXIS2_QPID_SENDER_H
+#define AXIS2_QPID_SENDER_H
+
+#include <axis2_util.h>
+#include <sstream>
+#include <string>
+
+using std::string;
+
+class Axis2QpidSender
+{
+	public:
+		Axis2QpidSender(string qpidBrokerIP, int qpidBrokerPort, const axutil_env_t* env);
+		~Axis2QpidSender(void);
+
+		bool SendReceive(string messageContent, string toQueueName, bool isSOAP11, 
+				string contentType, string soapAction, axutil_array_list_t* mime_parts, int timeout);
+		bool Send(string messageContent, string toQueueName, string replyToQueueName, bool isSOAP11, 
+				string contentType, string soapAction, axutil_array_list_t* mime_parts);
+		
+		string 		 responseContent;
+		string		 responseContentType;
+
+	private:
+		void GetMimeBody(axutil_array_list_t* mime_parts, string& mimeBody);
+
+		string		  		 qpidBrokerIP;
+		int			  		 qpidBrokerPort;
+		const axutil_env_t*  env;
+};
+
+#endif
diff --git a/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h b/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h
index 94e232f..5e7a368 100644
--- a/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h
+++ b/src/core/transport/amqp/sender/qpid_sender/axis2_qpid_sender_interface.h
@@ -1,50 +1,50 @@
-/*

-* Licensed to the Apache Software Foundation (ASF) under one or more

-* contributor license agreements.  See the NOTICE file distributed with

-* this work for additional information regarding copyright ownership.

-* The ASF licenses this file to You under the Apache License, Version 2.0

-* (the "License"); you may not use this file except in compliance with

-* the License.  You may obtain a copy of the License at

-*

-*      http://www.apache.org/licenses/LICENSE-2.0

-*

-* Unless required by applicable law or agreed to in writing, software

-* distributed under the License is distributed on an "AS IS" BASIS,

-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-* See the License for the specific language governing permissions and

-* limitations under the License.

-*/

-

-#ifndef AXIS2_QPID_SENDER_INTERFACE_H

-#define AXIS2_QPID_SENDER_INTERFACE_H

-

-#include <axis2_util.h>

-#include <axis2_conf_init.h>

-#include <axis2_amqp_util.h>

-

-#ifdef __cplusplus

-extern "C"

-{

-#endif

-

-AXIS2_EXTERN axis2_amqp_response_t* AXIS2_CALL

-axis2_qpid_send_receive(

-	const axis2_char_t* request_content,

-	const axutil_env_t* env,

-	const axis2_char_t* content_type,

-	const axis2_char_t* soap_action,

-	axis2_msg_ctx_t* msg_ctx);

-

-AXIS2_EXTERN axis2_status_t AXIS2_CALL

-axis2_qpid_send(

-	const axis2_char_t* request_content,

-	const axutil_env_t* env,

-	const axis2_char_t* content_type,

-	const axis2_char_t* soap_action,

-	axis2_msg_ctx_t* msg_ctx);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements.  See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#ifndef AXIS2_QPID_SENDER_INTERFACE_H
+#define AXIS2_QPID_SENDER_INTERFACE_H
+
+#include <axis2_util.h>
+#include <axis2_conf_init.h>
+#include <axis2_amqp_util.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+AXIS2_EXTERN axis2_amqp_response_t* AXIS2_CALL
+axis2_qpid_send_receive(
+	const axis2_char_t* request_content,
+	const axutil_env_t* env,
+	const axis2_char_t* content_type,
+	const axis2_char_t* soap_action,
+	axis2_msg_ctx_t* msg_ctx);
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_qpid_send(
+	const axis2_char_t* request_content,
+	const axutil_env_t* env,
+	const axis2_char_t* content_type,
+	const axis2_char_t* soap_action,
+	axis2_msg_ctx_t* msg_ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif