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/12 10:45:49 UTC
svn commit: r506392 - in /webservices/axis2/scratch/c/dinesh/486/c: include/
modules/core/clientapi/ modules/core/deployment/
modules/core/transport/http/ modules/core/transport/http/receiver/
modules/core/transport/http/sender/ modules/core/transport/...
Author: dinesh
Date: Mon Feb 12 01:45:46 2007
New Revision: 506392
URL: http://svn.apache.org/viewvc?view=rev&rev=506392
Log:
axis2c-486: working on axis2c transport refactoring, moving sender releated files to sender and receiver releated files to receiver
Modified:
webservices/axis2/scratch/c/dinesh/486/c/include/axis2_const.h
webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/mep_client.c
webservices/axis2/scratch/c/dinesh/486/c/modules/core/deployment/conf_builder.c
webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/server/apache2/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/modules/mod_addr/Makefile.am
webservices/axis2/scratch/c/dinesh/486/c/util/src/env.c
Modified: webservices/axis2/scratch/c/dinesh/486/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/include/axis2_const.h?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/include/axis2_const.h (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/include/axis2_const.h Mon Feb 12 01:45:46 2007
@@ -114,13 +114,14 @@
#define AXIS2_TRANSPORT_SMTP "smtp"
#define AXIS2_TRANSPORT_TCP "tcp"
#define AXIS2_TRANSPORT_XMPP "xmpp"
-
+#define AXIS2_TRANSPORT_HTTPS "https"
typedef enum
{
AXIS2_TRANSPORT_ENUM_HTTP = 0,
AXIS2_TRANSPORT_ENUM_SMTP,
AXIS2_TRANSPORT_ENUM_TCP,
AXIS2_TRANSPORT_ENUM_XMPP,
+ AXIS2_TRANSPORT_ENUM_HTTPS,
AXIS2_TRANSPORT_ENUM_MAX
} AXIS2_TRANSPORT_ENUMS;
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/Makefile.am Mon Feb 12 01:45:46 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/scratch/c/dinesh/486/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/mep_client.c?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/clientapi/mep_client.c Mon Feb 12 01:45:46 2007
@@ -345,9 +345,15 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
axis2_transport_out_desc_t *transport_out_desc = NULL;
-
- AXIS2_TRANSPORT_ENUMS transport_enum =
- (axis2_strcmp(transport, "http") == 0)?AXIS2_TRANSPORT_ENUM_HTTP:AXIS2_TRANSPORT_ENUM_MAX;
+ AXIS2_TRANSPORT_ENUMS transport_enum;
+ if (!axis2_strcmp(transport, "http"))
+ {
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
+ }
+ else if (!axis2_strcmp (transport, "https"))
+ {
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
+ }
conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
if (conf_ctx)
@@ -655,7 +661,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,
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/deployment/conf_builder.c?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/deployment/conf_builder.c Mon Feb 12 01:45:46 2007
@@ -758,6 +758,8 @@
transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
else
return AXIS2_FAILURE;
@@ -991,6 +993,8 @@
transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
else
return AXIS2_FAILURE;
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/Makefile.am Mon Feb 12 01:45:46 2007
@@ -1,15 +1,8 @@
-SUBDIRS =
+NSUBDIRS =
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
+libaxis2_http_la_SOURCES = http_transport_utils.c\
+ http_chunked_stream.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/core/engine \
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/receiver/Makefile.am Mon Feb 12 01:45:46 2007
@@ -3,7 +3,9 @@
libaxis2_http_receiver_la_SOURCES = simple_http_svr_conn.c\
- http_response_writer.c\
+ http_response_writer.c\
+ http_out_transport_info.c\
+ http_worker.c\
http_svr_thread.c\
http_server.c
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/Makefile.am Mon Feb 12 01:45:46 2007
@@ -2,6 +2,11 @@
lib_LTLIBRARIES = libaxis2_http_sender.la
libaxis2_http_sender_la_SOURCES = http_transport_sender.c\
soap_over_http_sender.c\
+ http_simple_request.c\
+ http_simple_response.c\
+ http_request_line.c\
+ http_status_line.c\
+ http_header.c\
rest_sender.c\
http_client.c
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/sender/http_client.c Mon Feb 12 01:45:46 2007
@@ -553,7 +553,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/scratch/c/dinesh/486/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/server/apache2/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/core/transport/http/server/apache2/Makefile.am Mon Feb 12 01:45:46 2007
@@ -8,15 +8,12 @@
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 \
+ $(top_builddir)/util/src/libaxis2_util.la \
+ $(top_builddir)/modules/core/transport/http/libaxis2_http.la\
+ ../../../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
-laxis2_engine \
-lpthread \
- -laxis2_http_sender \
- -laxis2_http_receiver \
-L$(top_builddir)$(GUTHTHILA_LIBS) \
$(PARSER_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/scratch/c/dinesh/486/c/modules/mod_addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/modules/mod_addr/Makefile.am?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/modules/mod_addr/Makefile.am Mon Feb 12 01:45:46 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/scratch/c/dinesh/486/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/486/c/util/src/env.c?view=diff&rev=506392&r1=506391&r2=506392
==============================================================================
--- webservices/axis2/scratch/c/dinesh/486/c/util/src/env.c (original)
+++ webservices/axis2/scratch/c/dinesh/486/c/util/src/env.c Mon Feb 12 01:45:46 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