You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/02/15 13:06:22 UTC
svn commit: r507909 - in /webservices/axis2/trunk/c: ./ include/
modules/core/ modules/core/clientapi/ modules/core/context/
modules/core/engine/ modules/core/transport/http/
modules/core/transport/http/common/ modules/core/transport/http/receiver/
mod...
Author: dinesh
Date: Thu Feb 15 04:06:19 2007
New Revision: 507909
URL: http://svn.apache.org/viewvc?view=rev&rev=507909
Log:
axis2c-486: transport refactoring, phase 1.branch merged
Added:
webservices/axis2/trunk/c/modules/core/transport/http/common/
- copied from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/
webservices/axis2/trunk/c/modules/core/transport/http/common/Makefile.am
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/common/Makefile.in
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/Makefile.in
webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/util/
- copied from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/util/
webservices/axis2/trunk/c/modules/core/transport/http/util/Makefile.am
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/util/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/util/Makefile.in
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/util/Makefile.in
webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/util/http_chunked_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
- copied unchanged from r507860, webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/util/http_transport_utils.c
Removed:
webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
Modified:
webservices/axis2/trunk/c/ (props changed)
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_disp.h
webservices/axis2/trunk/c/include/axis2_http_server.h
webservices/axis2/trunk/c/include/axis2_msg_ctx.h
webservices/axis2/trunk/c/modules/core/Makefile.am
webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/engine/Makefile.am
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
webservices/axis2/trunk/c/util/src/env.c
Propchange: webservices/axis2/trunk/c/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 15 04:06:19 2007
@@ -1 +1 @@
-/webservices/axis2/scratch/c/dinesh/486/c:1-503988
+/webservices/axis2/scratch/c/dinesh/486/c:1-507904
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Feb 15 04:06:19 2007
@@ -328,6 +328,8 @@
modules/core/addr/Makefile \
modules/core/phaseresolver/Makefile \
modules/core/transport/http/Makefile \
+ modules/core/transport/http/common/Makefile \
+ modules/core/transport/http/util/Makefile \
modules/core/transport/http/sender/Makefile \
modules/core/transport/http/sender/ssl/Makefile \
modules/core/transport/http/receiver/Makefile \
Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Thu Feb 15 04:06:19 2007
@@ -190,7 +190,7 @@
* @return pointer to the newly created dispatcher with find_svc and find_op
* methods implemented based on request URI processing.
*/
- axis2_disp_t *AXIS2_CALL
+ AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
axis2_req_uri_disp_create(
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/include/axis2_http_server.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_server.h?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_server.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_server.h Thu Feb 15 04:06:19 2007
@@ -40,8 +40,7 @@
{
#endif
- int axis2_http_socket_read_timeout = 0;
-
+ int axis2_http_socket_read_timeout;
AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL
axis2_http_server_create (
Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Thu Feb 15 04:06:19 2007
@@ -234,6 +234,11 @@
axis2_msg_ctx_get_soap_envelope(const axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env);
+
+ AXIS2_EXTERN struct axiom_soap_envelope *AXIS2_CALL
+ axis2_msg_ctx_get_response_soap_envelope(const axis2_msg_ctx_t *msg_ctx,
+ const axis2_env_t *env);
+
/**
* Gets fault SOAP envelope.
* @param msg_ctx message context
@@ -390,6 +395,12 @@
const axis2_env_t *env,
struct axiom_soap_envelope *soap_envelope);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_msg_ctx_set_response_soap_envelope(axis2_msg_ctx_t *msg_ctx,
+ const axis2_env_t *env,
+ struct axiom_soap_envelope *soap_envelope);
+
+
/**
* Sets fault SOAP envelope.
* @param msg_ctx message context
@@ -1429,6 +1440,9 @@
#define AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env) \
axis2_msg_ctx_get_soap_envelope(msg_ctx, env)
+#define AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE(msg_ctx, env) \
+ axis2_msg_ctx_get_response_soap_envelope(msg_ctx, env)
+
/** Gets fault SOAP envelope. */
#define AXIS2_MSG_CTX_GET_FAULT_SOAP_ENVELOPE(msg_ctx, env) \
axis2_msg_ctx_get_fault_soap_envelope(msg_ctx, env)
@@ -1481,6 +1495,10 @@
/** Sets SOAP envelope. */
#define AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \
axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope)
+
+#define AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \
+ axis2_msg_ctx_set_response_soap_envelope(msg_ctx, env, soap_envelope)
+
/** Sats fault SOAP envelope. */
#define AXIS2_MSG_CTX_SET_FAULT_SOAP_ENVELOPE(msg_ctx, env, soap_envelope) \
Modified: webservices/axis2/trunk/c/modules/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/Makefile.am Thu Feb 15 04:06:19 2007
@@ -1 +1 @@
-SUBDIRS = addr context description phaseresolver receivers util clientapi deployment transport/http engine transport/http/receiver transport/http/sender transport/http/server transport/http/server/simple_axis2_server
+SUBDIRS = addr context description phaseresolver receivers util clientapi deployment engine transport/http transport/http/receiver transport/http/sender transport/http/server transport/http/common transport/http/util transport/http/server/simple_axis2_server
Modified: webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/Makefile.am Thu Feb 15 04:06:19 2007
@@ -3,11 +3,11 @@
callback.c \
listener_manager.c \
callback_recv.c \
- mep_client.c \
+ mep_client.c \
stub.c \
- options.c \
- op_client.c \
- svc_client.c
+ options.c \
+ op_client.c \
+ svc_client.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/core/engine \
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Thu Feb 15 04:06:19 2007
@@ -356,7 +356,6 @@
transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
}
-
conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
if (conf_ctx)
{
@@ -663,7 +662,7 @@
if (!response)
return NULL;
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, AXIS2_FALSE);
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,AXIS2_TRANSPORT_IN, AXIS2_FALSE);
if (property)
{
AXIS2_MSG_CTX_SET_PROPERTY(response, env, AXIS2_TRANSPORT_IN, property,
@@ -683,11 +682,8 @@
/* If request is REST we assume the response is REST, so set the variable*/
AXIS2_MSG_CTX_SET_DOING_REST(response, env, AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env));
- soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
- AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI : AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
-
- response_envelope = axis2_http_transport_utils_create_soap_msg(env,
- msg_ctx, soap_ns_uri);
+ /* set response envelope */
+ response_envelope = AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env);
if (response_envelope)
{
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(response, env, response_envelope);
@@ -779,11 +775,7 @@
/* If request is REST we assume the response is REST, so set the variable*/
AXIS2_MSG_CTX_SET_DOING_REST(response, env, AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env));
- soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
- AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI : AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
-
- response_envelope = axis2_http_transport_utils_create_soap_msg(env,
- msg_ctx, soap_ns_uri);
+ response_envelope = AXIS2_MSG_CTX_GET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env);
if (response_envelope)
{
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(response, env, response_envelope);
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu Feb 15 04:06:19 2007
@@ -61,6 +61,8 @@
/** SOAP envelope */
axiom_soap_envelope_t *soap_envelope;
+ /** Response SOAP envelope */
+ axiom_soap_envelope_t *response_soap_envelope;
/** SOAP Fault envelope */
axiom_soap_envelope_t *fault_soap_envelope;
/** response written? */
@@ -331,7 +333,7 @@
if (msg_ctx->soap_envelope)
{
- AXIOM_SOAP_ENVELOPE_FREE(msg_ctx->soap_envelope, env);
+/* AXIOM_SOAP_ENVELOPE_FREE(msg_ctx->soap_envelope, env); */
msg_ctx->soap_envelope = NULL;
}
@@ -448,6 +450,15 @@
}
axiom_soap_envelope_t *AXIS2_CALL
+axis2_msg_ctx_get_response_soap_envelope(
+ const axis2_msg_ctx_t *msg_ctx,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+ return msg_ctx->response_soap_envelope;
+}
+
+axiom_soap_envelope_t *AXIS2_CALL
axis2_msg_ctx_get_fault_soap_envelope(
const axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env)
@@ -628,6 +639,28 @@
msg_ctx->soap_envelope = NULL;
}
+ return AXIS2_SUCCESS;
+}
+
+
+axis2_status_t AXIS2_CALL
+axis2_msg_ctx_set_response_soap_envelope(
+ struct axis2_msg_ctx *msg_ctx,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_envelope)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ if (soap_envelope)
+ {
+ int soap_v = AXIOM_SOAP12;
+ soap_v = AXIOM_SOAP_ENVELOPE_GET_SOAP_VERSION(soap_envelope, env);
+ msg_ctx->response_soap_envelope = soap_envelope;
+ }
+ else
+ {
+ msg_ctx->response_soap_envelope = NULL;
+ }
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/Makefile.am Thu Feb 15 04:06:19 2007
@@ -22,7 +22,6 @@
$(top_builddir)/modules/core/clientapi/libaxis2_clientapi.la \
$(top_builddir)/modules/core/phaseresolver/libaxis2_phaseresolver.la \
$(top_builddir)/modules/core/util/libaxis2_core_utils.la \
- $(top_builddir)/modules/core/transport/http/libaxis2_http.la \
$(top_builddir)/util/src/libaxis2_util.la \
$(top_builddir)/axiom/src/om/libaxis2_axiom.la
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Thu Feb 15 04:06:19 2007
@@ -45,7 +45,7 @@
axis2_svc_t *svc);
-axis2_disp_t *AXIS2_CALL
+AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
axis2_req_uri_disp_create(
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am Thu Feb 15 04:06:19 2007
@@ -1,17 +1 @@
-SUBDIRS =
-noinst_LTLIBRARIES = libaxis2_http.la
-
-libaxis2_http_la_SOURCES = http_worker.c \
- http_transport_utils.c\
- http_simple_request.c\
- http_simple_response.c\
- http_request_line.c\
- http_status_line.c\
- http_header.c\
- http_out_transport_info.c\
- http_chunked_stream.c
-
-INCLUDES = -I$(top_builddir)/include \
- -I$(top_builddir)/modules/core/engine \
- -I$(top_builddir)/util/include \
- -I$(top_builddir)/axiom/include
+SUBDIRS = util common sender receiver server
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/Makefile.am Thu Feb 15 04:06:19 2007
@@ -1,11 +1,13 @@
lib_LTLIBRARIES = libaxis2_http_receiver.la
-libaxis2_http_receiver_la_LIBADD= $(top_builddir)/util/src/libaxis2_util.la
+libaxis2_http_receiver_la_LIBADD=$(top_builddir)/util/src/libaxis2_util.la\
+ $(top_builddir)/modules/core/transport/http/common/libaxis2_http_common.la
-libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
- http_response_writer.c\
- http_svr_thread.c\
- http_server.c
+libaxis2_http_receiver_la_SOURCES = http_response_writer.c\
+ simple_http_svr_conn.c\
+ http_receiver.c\
+ http_svr_thread.c
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/core/transport\
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Thu Feb 15 04:06:19 2007
@@ -17,6 +17,7 @@
#include <platforms/axis2_platform_auto_sense.h>
#include <axis2_http_svr_thread.h>
+#include <axis2_http_server.h>
#include <axis2_http_transport.h>
#include <axis2_string.h>
#include <axis2_network_handler.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/Makefile.am Thu Feb 15 04:06:19 2007
@@ -5,9 +5,9 @@
rest_sender.c\
http_client.c
-libaxis2_http_sender_la_LIBADD = $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/util/src/libaxis2_util.la
+libaxis2_http_sender_la_LIBADD = $(top_builddir)/modules/core/transport/http/common/libaxis2_http_common.la\
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la\
+ $(top_builddir)/util/src/libaxis2_util.la
if AXIS2_SSL_ENABLED
libaxis2_http_sender_la_SOURCES += ssl/ssl_stream.c\
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Thu Feb 15 04:06:19 2007
@@ -576,7 +576,7 @@
AXIS2_ERROR_RESPONSE_SERVER_SHUTDOWN,
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Response error, Server Shutdown");
- return -1;
+ return 0;
}
status_line = axis2_http_status_line_create(env, str_status_line);
if (NULL == status_line)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Thu Feb 15 04:06:19 2007
@@ -339,6 +339,7 @@
/* AXIOM_OUTPUT_SET_DO_OPTIMIZE(om_output, env,
* AXIS2_MSG_CTX_GET_IS_DOING_MTOM(msg_ctx, env);
*/
+
if (AXIS2_TRUE == AXIS2_MSG_CTX_GET_DOING_REST(msg_ctx, env))
{
axiom_node_t *body_node = NULL;
@@ -424,6 +425,8 @@
}
}
+
+
AXIOM_OUTPUT_FREE(om_output, env);
om_output = NULL;
xml_writer = NULL;
@@ -571,6 +574,9 @@
const axis2_char_t *url = NULL;
axis2_soap_over_http_sender_t *sender = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ const axis2_char_t *soap_ns_uri = NULL;
+ axiom_soap_envelope_t *response_envelope = NULL;
+ axis2_op_t *op = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -638,12 +644,34 @@
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
status = AXIS2_SOAP_OVER_HTTP_SENDER_SEND(sender, env, msg_ctx, out, url
, soap_action);
- /*
+
+ /*
* TODO check for errors
*/
AXIS2_SOAP_OVER_HTTP_SENDER_FREE(sender, env);
sender = NULL;
}
+
+ op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ if (op)
+ {
+ /* handle one way case */
+ const axis2_char_t *mep = AXIS2_OP_GET_MSG_EXCHANGE_PATTERN(op, env);
+ if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+ {
+ return status;
+ }
+ else
+ {
+ soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
+ AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI : AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
+ response_envelope = axis2_http_transport_utils_create_soap_msg(env,
+ msg_ctx, soap_ns_uri);
+ AXIS2_MSG_CTX_SET_RESPONSE_SOAP_ENVELOPE (msg_ctx, env, response_envelope);
+ }
+ }
+
return status;
}
@@ -677,3 +705,6 @@
}
return status;
}
+
+
+
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am Thu Feb 15 04:06:19 2007
@@ -4,19 +4,16 @@
apache2_stream.c\
apache2_out_transport_info.c\
apache2_worker.c
+
AM_CFLAGS = -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE
libmod_axis2_la_LIBADD = $(LDFLAGS) \
- -L$(top_builddir)/modules/core/engine \
- -L$(top_builddir)/modules/core/transport/http/sender \
- -L$(top_builddir)/modules/core/transport/http/receiver \
$(top_builddir)/axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/util/src/libaxis2_util.la \
- ../../../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- -laxis2_engine \
+ $(top_builddir)/modules/core/engine/libaxis2_engine.la\
+ $(top_builddir)/util/src/libaxis2_util.la \
+ $(top_builddir)/modules/core/transport/http/util/libaxis2_http_util.la\
+ $(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la\
-lpthread \
- -laxis2_http_sender \
- -laxis2_http_receiver \
-L$(top_builddir)$(GUTHTHILA_LIBS) \
$(PARSER_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am Thu Feb 15 04:06:19 2007
@@ -5,18 +5,19 @@
axis2_http_server_SOURCES = http_server_main.c
axis2_http_server_LDADD = $(LDFLAGS) \
- -L$(top_builddir)/modules/core/engine \
- -L$(top_builddir)/modules/core/transport/http/sender \
- -L$(top_builddir)/modules/core/transport/http/receiver \
- $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/util/src/libaxis2_util.la \
- ../../../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- -laxis2_engine \
- -lpthread \
- -laxis2_http_sender \
- -laxis2_http_receiver \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/modules/core/transport/http/util/libaxis2_http_util.la \
+ $(top_builddir)/modules/core/transport/http/common/libaxis2_http_common.la \
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/util/src/libaxis2_util.la \
+ $(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
+ $(top_builddir)/modules/core/description/libaxis2_description.la \
+ $(top_builddir)/modules/core/deployment/libaxis2_deployment.la \
+ $(top_builddir)/modules/core/context/libaxis2_context.la \
+ $(top_builddir)/modules/core/clientapi/libaxis2_clientapi.la \
+ $(top_builddir)/modules/core/engine/libaxis2_engine.la \
+ $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
+ $(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
+ -lpthread
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/core/description\
Modified: webservices/axis2/trunk/c/modules/mod_addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/Makefile.am?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/Makefile.am Thu Feb 15 04:06:19 2007
@@ -16,11 +16,9 @@
mod_addr.c
libaxis2_la_LIBADD = $(top_builddir)/modules/core/engine/libaxis2_engine.la \
- $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/axiom/src/parser/${WRAPPER_DIR}/libaxis2_parser.la \
- $(top_builddir)/util/src/libaxis2_util.la \
- $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
- $(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la
+ $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
+ $(top_builddir)/axiom/src/parser/${WRAPPER_DIR}/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=507909&r1=507908&r2=507909
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Thu Feb 15 04:06:19 2007
@@ -251,3 +251,8 @@
return AXIS2_SUCCESS;
}
+
+
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org