axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r524975 - in /webservices/axis2/trunk/c: axiom/src/attachments/ axiom/src/om/ include/ modules/core/clientapi/ modules/core/deployment/ modules/core/transport/http/common/ modules/core/transport/http/receiver/ modules/core/transport/http/se...
Date Mon, 02 Apr 2007 23:56:23 GMT
Author: samisa
Date: Mon Apr  2 16:56:22 2007
New Revision: 524975

URL: http://svn.apache.org/viewvc?view=rev&rev=524975
Log:
Removed macros and organized source files accordingly

Modified:
    webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
    webservices/axis2/trunk/c/axiom/src/om/om_output.c
    webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
    webservices/axis2/trunk/c/include/axis2_http_client.h
    webservices/axis2/trunk/c/include/axis2_http_response_writer.h
    webservices/axis2/trunk/c/include/axis2_http_simple_request.h
    webservices/axis2/trunk/c/include/axis2_http_status_line.h
    webservices/axis2/trunk/c/include/axis2_http_svr_thread.h
    webservices/axis2/trunk/c/include/axis2_op_client.h
    webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h
    webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
    webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
    webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h Mon Apr  2 16:56:22 2007
@@ -82,14 +82,6 @@
     AXIS2_EXTERN axiom_mime_output_t * AXIS2_CALL 
     axiom_mime_output_create (const axutil_env_t *env);
 
-#define AXIOM_MIME_OUTPUT_FREE(mime_output, env) axiom_mime_output_free (mime_output, env)
-
-#define AXIOM_MIME_OUTPUT_COMPLETE(mime_output, env, output_stream, output_stream_size, soap_body_buffer, binary_node_list, boundary, content_id, char_set_encoding, soap_content_type) \
-axiom_mime_output_complete(mime_output, env, output_stream, output_stream_size, soap_body_buffer, binary_node_list, boundary, content_id, char_set_encoding, soap_content_type)
-
-#define AXIOM_MIME_OUTPUT_GET_CONTENT_TYPE_FOR_MIME(mime_output, env, boundary, content_id, char_set_encoding, soap_content_type) \
-axiom_mime_output_get_content_type_for_mime(mime_output, env, boundary, content_id, char_set_encoding, soap_content_type)
-
 /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Mon Apr  2 16:56:22 2007
@@ -134,7 +134,7 @@
 
     if (om_output->mime_output)
     {
-        AXIOM_MIME_OUTPUT_FREE(om_output->mime_output, env);
+        axiom_mime_output_free(om_output->mime_output, env);
     }
 
     AXIS2_FREE(env->allocator, om_output);
@@ -583,7 +583,7 @@
         om_output->mime_output = axiom_mime_output_create(env);
         om_output->mime_boundry = axiom_output_get_mime_boundry(om_output, env);
         root_content_id = axiom_output_get_root_content_id(om_output, env);
-        AXIOM_MIME_OUTPUT_COMPLETE(om_output->mime_output,
+        axiom_mime_output_complete(om_output->mime_output,
             env, &byte_stream, &stream_size,
             buffer, om_output->binary_node_list, om_output->mime_boundry,
             om_output->root_content_id, om_output->char_set_encoding,

Modified: webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h Mon Apr  2 16:56:22 2007
@@ -102,30 +102,6 @@
     axis2_http_chunked_stream_create(const axutil_env_t *env,
         axutil_stream_t* stream);
 
-/** Read. */
-#define AXIS2_HTTP_CHUNKED_STREAM_READ(chunked_stream, env, buffer, count) \
-                        axis2_http_chunked_stream_read(chunked_stream, env, \
-                  buffer, count)
-
-/** Write. */
-#define AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env, buffer, count) \
-                  axis2_http_chunked_stream_write(chunked_stream, env, \
-                  buffer, count)
-
-/** Gets the current chunk size. */
-#define AXIS2_HTTP_CHUNKED_GET_CURRENT_CHUNK_SIZE(chunked_stream, env) \
-                        axis2_http_chunked_stream_get_current_chunk_size \
-                  (chunked_stream, env)
-
-/** Writes the last chunk. */
-#define AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env) \
-                  axis2_http_chunked_stream_write_last_chunk(chunked_stream\
-                  , env)
-
-/** Free. */
-#define AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env) \
-                        axis2_http_chunked_stream_free(chunked_stream, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_http_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_client.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_client.h Mon Apr  2 16:56:22 2007
@@ -205,71 +205,6 @@
     axis2_http_client_free_void_arg (void *client,
         const axutil_env_t *env);
 
-/** Send. */
-#define AXIS2_HTTP_CLIENT_SEND(client, env, request, ssl_passphrase) \
-                                axis2_http_client_send(client, env, request, \
-                                ssl_passphrase)
-
-/** Receive header. */
-#define AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, env) \
-                                axis2_http_client_recieve_header(client, env)
-
-/** Gets the response. */
-#define AXIS2_HTTP_CLIENT_GET_RESPONSE(client, env) \
-                                axis2_http_client_get_response(client, env)
-
-/** Sets the url. */
-#define AXIS2_HTTP_CLIENT_SET_URL(client, env, url) \
-                                axis2_http_client_set_url(client, env, url)
-
-/** Gets the url. */
-#define AXIS2_HTTP_CLIENT_GET_URL(client, env) \
-                                axis2_http_client_get_url(client, env)
-
-/** Sets the timeout. */
-#define AXIS2_HTTP_CLIENT_SET_TIMEOUT(client, env, timeout) \
-                                axis2_http_client_set_timeout(client, env,\
-                        timeout)
-
-/** Gets the timeout. */
-#define AXIS2_HTTP_CLIENT_GET_TIMEOUT(client, env) \
-                                axis2_http_client_get_url(client, env)
-
-/** Sets the proxy. */
-#define AXIS2_HTTP_CLIENT_SET_PROXY(client, env, proxy_host, proxy_port) \
-                                axis2_http_client_set_proxy(client, env,\
-                        proxy_host, proxy_port)
-
-/** Gets the proxy. */
-#define AXIS2_HTTP_CLIENT_GET_PROXY(client, env) \
-                                axis2_http_client_get_proxy(client, env)
-
-/** Set dump_input_msg true. */
-#define AXIS2_HTTP_CLIENT_SET_DUMP_INPUT_MSG(client, env, dump_input_msg) \
-        axis2_http_client_set_dump_input_msg(client, env, dump_input_msg)
-
-/** Sets the server certificate. */
-#define AXIS2_HTTP_CLIENT_SET_SERVER_CERT(client, env, server_cert) \
-                                axis2_http_client_set_server_cert(client, env,\
-                        server_cert)
-
-/** Gets the server certificate. */
-#define AXIS2_HTTP_CLIENT_GET_SERVER_CERT(client, env) \
-                                axis2_http_client_get_server_cert(client, env)
-
-/** Sets the client chain file containing the privat key and the public key. */
-#define AXIS2_HTTP_CLIENT_SET_KEY_FILE(client, env, key_file) \
-                                axis2_http_client_set_key_file(client, env,\
-                        key_file)
-
-/** Gets the client chain file containing the privat key and the public key. */
-#define AXIS2_HTTP_CLIENT_GET_KEY_FILE(client, env) \
-                                axis2_http_client_get_key_file(client, env)
-
-/** Frees the http client. */
-#define AXIS2_HTTP_CLIENT_FREE(client, env) \
-                                axis2_http_client_free(client, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_http_response_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_response_writer.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_response_writer.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_response_writer.h Mon Apr  2 16:56:22 2007
@@ -166,58 +166,6 @@
         axutil_stream_t *stream,
         const axis2_char_t *encoding);
 
-/** Get encoding.
-    @sa axis2_http_response_writer_ops#get_encoding */
-#define AXIS2_HTTP_RESPONSE_WRITER_GET_ENCODING(response_writer, env) \
-                    axis2_http_response_writer_get_encoding(response_writer, env)
-
-/** Close.
-    @sa axis2_http_response_writer_ops#close */
-#define AXIS2_HTTP_RESPONSE_WRITER_CLOSE(response_writer, env) \
-                    axis2_http_response_writer_close(response_writer, env)
-
-/** Flush.
-    @sa axis2_http_response_writer_ops#flush */
-#define AXIS2_HTTP_RESPONSE_WRITER_FLUSH(response_writer, env) \
-                    axis2_http_response_writer_flush(response_writer, env)
-
-/** Write char.
-    @sa axis2_http_response_writer_ops#write_char */
-#define AXIS2_HTTP_RESPONSE_WRITER_WRITE_CHAR(response_writer, env, c) \
-                    axis2_http_response_writer_write_char(response_writer, env, c)
-
-/** Write buf.
-    @sa axis2_http_response_writer_ops#write_buf */
-#define AXIS2_HTTP_RESPONSE_WRITER_WRITE_BUF(response_writer, env, buf, offset,\
-                    len) axis2_http_response_writer_write_buf(response_writer, \
-                    env, buf, offset, len)
-
-/** Print str.
-    @sa axis2_http_response_writer_ops#print_str */
-#define AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env, str) \
-                    axis2_http_response_writer_print_str(response_writer, env, str)
-
-/** Print int.
-    @sa axis2_http_response_writer_ops#print_int */
-#define AXIS2_HTTP_RESPONSE_WRITER_PRINT_INT(response_writer, env, i)\
-                    axis2_http_response_writer_print_int(response_writer, env)
-
-/** Println str.
-    @sa axis2_http_response_writer_ops#println_str */
-#define AXIS2_HTTP_RESPONSE_WRITER_PRINTLN_STR(response_writer, env, str) \
-                    axis2_http_response_writer_println_str(response_writer, env,\
-                    str)
-
-/** Println.
-    @sa axis2_http_response_writer_ops#println */
-#define AXIS2_HTTP_RESPONSE_WRITER_PRINTLN(response_writer, env) \
-                    axis2_http_response_writer_println(response_writer, env)
-
-/** Frees the http response writer.
-    @sa axis2_http_response_writer_ops#free */
-#define AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env)\
-                    axis2_http_response_writer_free(response_writer, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_http_simple_request.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_simple_request.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_request.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_request.h Mon Apr  2 16:56:22 2007
@@ -192,75 +192,6 @@
         axis2_ssize_t http_hdr_count,
         axutil_stream_t *content);
 
-/** Gets the request line. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request, env) \
-                            axis2_http_simple_request_get_request_line\
-                            (simple_request, env)
-
-/** Set request line. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_SET_REQUEST_LINE\
-                            (simple_request, env, request_line) \
-                            axis2_http_simple_request_set_request_line\
-                            (simple_request, env, request_line)
-
-/** Contains header. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_CONTAINS_HEADER(simple_request, env, name)\
-                            axis2_http_simple_request_contains_header\
-                            (simple_request, env, name)
-
-/** Get headers. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(simple_request, env)\
-                            axis2_http_simple_request_get_headers(simple_request, env)
-
-/** Gets the first header. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env, str) \
-                            axis2_http_simple_request_get_first_header\
-                            (simple_request, env, str)
-
-/** Remove headers. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_REMOVE_HEADERS(simple_request, env, str) \
-                            axis2_http_simple_request_remove_headers\
-                            (simple_request, env, str)
-
-/** Add header. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(simple_request, env, header) \
-                            axis2_http_simple_request_add_header\
-                            (simple_request, env, header)
-
-/** Gets the content type. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(simple_request, env)\
-                            axis2_http_simple_request_get_content_type\
-                            (simple_request, env)
-
-/** Gets the charset. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CHARSET(simple_request, env) \
-                            axis2_http_simple_request_get_charset\
-                            (simple_request, env)
-
-/** Gets the content length. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request, env)\
-                            axis2_http_simple_request_get_content_length\
-                            (simple_request, env)
-
-/** Gets the body. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env)\
-                            axis2_http_simple_request_get_body\
-                            (simple_request, env)
-
-/** Get body bytes. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY_BYTES(simple_request, env, buf)\
-                            axis2_http_simple_request_get_body_bytes\
-                            (simple_request, env, buf)
-
-/** Sets the body string. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(simple_request, env, str, str_len)\
-                            axis2_http_simple_request_set_body_string\
-                            (simple_request, env, str, str_len)
-
-/** Frees the http simple request. */
-#define AXIS2_HTTP_SIMPLE_REQUEST_FREE(simple_request, env) \
-                            axis2_http_simple_request_free(simple_request, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_http_status_line.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_status_line.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_status_line.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_status_line.h Mon Apr  2 16:56:22 2007
@@ -99,30 +99,6 @@
     axis2_http_status_line_create(const axutil_env_t *env,
         const axis2_char_t *str);
 
-/** Gets the status code. */
-#define AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env)\
-                    axis2_http_status_line_get_status_code (status_line, env)
-
-/** Gets the http version. */
-#define AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line, env)\
-                    axis2_http_status_line_get_http_version (status_line, env)
-
-/** Get reason phrase. */
-#define AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line, env)\
-                    axis2_http_status_line_get_reason_phrase (status_line, env)
-
-/** Starts with http. */
-#define AXIS2_HTTP_STATUS_LINE_STARTS_WITH_HTTP(status_line, env)\
-                    axis2_http_status_line_starts_with_http (status_line, env)
-
-/** To string. */
-#define AXIS2_HTTP_STATUS_LINE_TO_STRING(status_line, env)\
-                    axis2_http_status_line_to_string (status_line, env)
-
-/** Frees the http status line. */
-#define AXIS2_HTTP_STATUS_LINE_FREE(status_line, env)\
-                    axis2_http_status_line_free(status_line, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_http_svr_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_svr_thread.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_svr_thread.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_svr_thread.h Mon Apr  2 16:56:22 2007
@@ -103,38 +103,6 @@
         const axutil_env_t *env,
         int port);
 
-/** Run.
-    @sa axis2_http_svr_thread_ops#run */
-#define AXIS2_HTTP_SVR_THREAD_RUN(svr_thread, env) \
-                  axis2_http_svr_thread_run(svr_thread, env)
-
-/** Destroy.
-    @sa axis2_http_svr_thread_ops#destroy */
-#define AXIS2_HTTP_SVR_THREAD_DESTROY(svr_thread, env) \
-                        axis2_http_svr_thread_destroy(svr_thread, env)
-
-/** Gets the local port.
-    @sa axis2_http_svr_thread_ops#get_local_port */
-#define AXIS2_HTTP_SVR_THREAD_GET_LOCAL_PORT(svr_thread, env) \
-                        axis2_http_svr_thread_get_local_port(svr_thread,\
-                  env)
-
-/** Is running.
-    @sa axis2_http_svr_thread_ops#is_running */
-#define AXIS2_HTTP_SVR_THREAD_IS_RUNNING(svr_thread, env) \
-                        axis2_http_svr_thread_is_running(svr_thread, env)
-
-/** Set worker.
-    @sa axis2_http_svr_thread_ops#set_worker */
-#define AXIS2_HTTP_SVR_THREAD_SET_WORKER(svr_thread, env, worker) \
-                        axis2_http_svr_thread_set_worker(svr_thread, env,\
-                  worker)
-
-/** Frees the http_svr_thread.
-    @sa axis2_http_svr_thread_ops#free */
-#define AXIS2_HTTP_SVR_THREAD_FREE(svr_thread, env) \
-                axis2_http_svr_thread_free(svr_thread, env)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_op_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op_client.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op_client.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op_client.h Mon Apr  2 16:56:22 2007
@@ -395,58 +395,6 @@
     axis2_op_client_receive(const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx);
 
-/** Sets the options to be used by operation client. */
-#define AXIS2_OP_CLIENT_SET_OPTIONS(op_client, env, options) \
-      axis2_op_client_set_options(op_client, env, options)
-
-/** Gets the options used by operation client.  */
-#define AXIS2_OP_CLIENT_GET_OPTIONS(op_client, env) \
-      axis2_op_client_get_options(op_client, env)
-
-/** Adds a message context. */
-#define AXIS2_OP_CLIENT_ADD_MSG_CTX(op_client, env, msg_ctx) \
-      axis2_op_client_add_msg_ctx(op_client, env, msg_ctx)
-
-/** Adds out message context.  */
-#define AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(op_client, env, msg_ctx) \
-      axis2_op_client_add_out_msg_ctx(op_client, env, msg_ctx)
-
-/** Gets the message context corresponding to given label. */
-#define AXIS2_OP_CLIENT_GET_MSG_CTX(op_client, env, message_label) \
-      axis2_op_client_get_msg_ctx(op_client, env, message_label)
-
-/** Sets operation client callback. */
-#define AXIS2_OP_CLIENT_SET_CALLBACK(op_client, env, callback) \
-      axis2_op_client_set_callback(op_client, env, callback)
-
-/** gets operation callback. */
-#define AXIS2_OP_CLIENT_GET_CALLBACK(op_client, env) \
-      axis2_op_client_get_callback(op_client, env)
-
-/** Executes operation client. */
-#define AXIS2_OP_CLIENT_EXECUTE(op_client, env, block) \
-      axis2_op_client_execute(op_client, env, block)
-
-/** Resets operation client. */
-#define AXIS2_OP_CLIENT_RESET(op_client, env) \
-      axis2_op_client_reset(op_client, env)
-
-/** Completes operation client, closing open transports. */
-#define AXIS2_OP_CLIENT_COMPLETE(op_client, env, msg_ctx) \
-      axis2_op_client_complete(op_client, env, msg_ctx)
-
-/** Gets the operation context. */
-#define AXIS2_OP_CLIENT_GET_OPERATION_CONTEXT(op_client, env) \
-      axis2_op_client_get_operation_context(op_client, env)
-
-/** Frees the operation client. */
-#define AXIS2_OP_CLIENT_FREE(op_client, env) \
-      axis2_op_client_free(op_client, env)
-
-/** Sets the callback receiver. */
-#define AXIS2_OP_CLIENT_SET_CALLBACK_RECV(op_client, env, callback_recv) \
-      axis2_op_client_set_callback_recv(op_client, env, callback_recv)
-
 /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h (original)
+++ webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h Mon Apr  2 16:56:22 2007
@@ -172,71 +172,6 @@
         const axutil_env_t *env, 
         int sockfd);
 
-/** Close.
-    @sa axis2_simple_http_svr_conn_ops#close */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_CLOSE(svr_conn, env) \
-                    axis2_simple_http_svr_conn_close(svr_conn, env)
-
-/** Is open.
-    @sa axis2_simple_http_svr_conn_ops#is_open */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_IS_OPEN(svr_conn, env) \
-                    axis2_simple_http_svr_conn_is_open(svr_conn, env)
-
-/** Keep alive.
-    @sa axis2_simple_http_svr_conn_ops#set_keep_alive */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env, keep_alive)\
-                    axis2_simple_http_svr_conn_set_keep_alive(svr_conn, env, keep_alive)
-
-/** Is keep alive.
-    @sa axis2_simple_http_svr_conn_ops#is_keep_alive */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_IS_KEEP_ALIVE(svr_conn, env) \
-                    axis2_simple_http_svr_conn_is_keep_alive(svr_conn, env)
-
-/** Get stream.
-    @sa axis2_simple_http_svr_conn_ops#get_stream */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_GET_STREAM(svr_conn, env) \
-                    axis2_simple_http_svr_conn_get_stream(svr_conn, env)
-
-/** Set writer.
-    @sa axis2_simple_http_svr_conn_ops#set_writer */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_SET_WRITER(svr_conn, env, writer) \
-                    axis2_simple_http_svr_conn_set_writer(svr_conn, env, writer)
-
-/** Read request.
-    @sa axis2_simple_http_svr_conn_ops#read_request */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, env) \
-                    axis2_simple_http_svr_conn_read_request(svr_conn, env)
-
-/** Write response.
-    @sa axis2_simple_http_svr_conn_ops#write_response */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response) \
-                    axis2_simple_http_svr_conn_write_response(svr_conn, env, response)
-
-/** Set snd timeout.
-    @sa axis2_simple_http_svr_conn_ops#set_snd_timeout */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_SET_SND_TIMEOUT(svr_conn, env, timeout) \
-                    axis2_simple_http_svr_conn_set_snd_timeout(svr_conn, env, timeout)
-
-/** Set rcv timeout.
-    @sa axis2_simple_http_svr_conn_ops#set_rcv_timeout */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, env, timeout) \
-                    axis2_simple_http_svr_conn_set_rcv_timeout(svr_conn, env, timeout)
-
-/** Get svr ip.
-    @sa axis2_simple_http_svr_conn_ops#get_svr_ip */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_GET_SVR_IP(svr_conn, env) \
-                    axis2_simple_http_svr_conn_get_svr_ip(svr_conn, env)
-
-/** Get peer ip.
-    @sa axis2_simple_http_svr_conn_ops#get_peer_ip */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_GET_PEER_IP(svr_conn, env) \
-                    axis2_simple_http_svr_conn_get_peer_ip(svr_conn, env)
-
-/** Frees the sime http server connection.
-    @sa axis2_simple_http_svr_conn_ops#free */
-#define AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, env) \
-                    axis2_simple_http_svr_conn_free(svr_conn, env)
-
 /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Apr  2 16:56:22 2007
@@ -530,9 +530,6 @@
     if(!conf_ctx)
         return AXIS2_FAILURE;
 
-    /*TODO:uncomment when implemented
-    listener_manager = AXIS2_CONF_CTX_GET_LISTENER_MANAGER(conf_ctx, env);
-    */
     if(!listener_manager)
         return AXIS2_FAILURE;
 

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Apr  2 16:56:22 2007
@@ -515,8 +515,8 @@
         return AXIS2_FAILURE;
     }
 
-    AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(svc_client->op_client, env, msg_ctx);
-    status = AXIS2_OP_CLIENT_EXECUTE(svc_client->op_client, env, AXIS2_TRUE);
+    axis2_op_client_add_out_msg_ctx(svc_client->op_client, env, msg_ctx);
+    status = axis2_op_client_execute(svc_client->op_client, env, AXIS2_TRUE);
     
     if (qname_free_flag)
     {
@@ -567,8 +567,8 @@
         return;
     }
 
-    AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(svc_client->op_client, env, msg_ctx);
-    AXIS2_OP_CLIENT_EXECUTE(op_client, env, AXIS2_FALSE);
+    axis2_op_client_add_out_msg_ctx(svc_client->op_client, env, msg_ctx);
+    axis2_op_client_execute(op_client, env, AXIS2_FALSE);
     
     if (qname_free_flag)
     {
@@ -654,7 +654,7 @@
             if (index-- >= 0)
             {
                 AXIS2_USLEEP(10000);
-                msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX(
+                msg_ctx = (axis2_msg_ctx_t *)axis2_op_client_get_msg_ctx(
                     svc_client->op_client, env,
                     AXIS2_WSDL_MESSAGE_LABEL_OUT);
                 if (msg_ctx)
@@ -695,7 +695,7 @@
         /* start of hack to get rid of memory leak */
         msg_ctx = axis2_msg_ctx_create(env,
             axis2_svc_ctx_get_conf_ctx(svc_client->svc_ctx, env), NULL, NULL);
-        AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client->op_client, env, msg_ctx);
+        axis2_op_client_add_msg_ctx(svc_client->op_client, env, msg_ctx);
 
          axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
         /* end of hack to get rid of memory leak */
@@ -729,9 +729,9 @@
             return NULL;
         }
 
-        AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client->op_client, env, msg_ctx);
-        AXIS2_OP_CLIENT_EXECUTE(svc_client->op_client, env, AXIS2_TRUE);
-        res_msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX(
+        axis2_op_client_add_msg_ctx(svc_client->op_client, env, msg_ctx);
+        axis2_op_client_execute(svc_client->op_client, env, AXIS2_TRUE);
+        res_msg_ctx = (axis2_msg_ctx_t *)axis2_op_client_get_msg_ctx(
             svc_client->op_client, env, AXIS2_WSDL_MESSAGE_LABEL_IN);
 
         if (res_msg_ctx)
@@ -740,7 +740,7 @@
         }
         else
         {
-            AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client->op_client, env, 
+            axis2_op_client_add_msg_ctx(svc_client->op_client, env, 
                 res_msg_ctx); /* set in msg_ctx to be NULL to reset */
         }
     }
@@ -818,8 +818,8 @@
         return;
     }
 
-    AXIS2_OP_CLIENT_SET_CALLBACK(svc_client->op_client, env, callback);
-    AXIS2_OP_CLIENT_ADD_OUT_MSG_CTX(svc_client->op_client, env, msg_ctx);
+    axis2_op_client_set_callback(svc_client->op_client, env, callback);
+    axis2_op_client_add_out_msg_ctx(svc_client->op_client, env, msg_ctx);
 
     if (axis2_options_get_use_separate_listener(svc_client->options, env))
     {
@@ -836,11 +836,11 @@
         op = axis2_svc_get_op_with_qname(svc_client->svc, env, op_qname);
         axis2_op_set_msg_recv(op, env,
             AXIS2_CALLBACK_RECV_GET_BASE(svc_client->callback_recv, env));
-        AXIS2_OP_CLIENT_SET_CALLBACK_RECV(svc_client->op_client, env,
+        axis2_op_client_set_callback_recv(svc_client->op_client, env,
             svc_client->callback_recv);
     }
 
-    AXIS2_OP_CLIENT_EXECUTE(svc_client->op_client, env, AXIS2_FALSE);
+    axis2_op_client_execute(svc_client->op_client, env, AXIS2_FALSE);
     
     if (qname_free_flag)
     {
@@ -892,8 +892,8 @@
     if (svc_client->override_options)
     {
         axis2_options_set_parent(svc_client->override_options, env,
-            AXIS2_OP_CLIENT_GET_OPTIONS(svc_client->op_client, env));
-        AXIS2_OP_CLIENT_SET_OPTIONS(svc_client->op_client, env,
+            axis2_op_client_get_options(svc_client->op_client, env));
+        axis2_op_client_set_options(svc_client->op_client, env,
             svc_client->override_options);
     }
 
@@ -1148,7 +1148,7 @@
 
     if (svc_client->op_client)
     {
-        AXIS2_OP_CLIENT_FREE(svc_client->op_client, env);
+        axis2_op_client_free(svc_client->op_client, env);
     }
 
     if (svc_client->options)
@@ -1280,8 +1280,6 @@
     axis2_char_t *proxy_host,
     axis2_char_t *proxy_port)
 {
-    AXIS2_PARAM_CHECK(env->error, proxy_host, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, proxy_port, AXIS2_FAILURE);
     axis2_transport_out_desc_t *trans_desc = NULL;
     axis2_conf_t *conf = NULL;
     axutil_param_container_t *param_container;
@@ -1289,6 +1287,9 @@
     axis2_char_t *proxy = AXIS2_HTTP_PROXY_API;
     axutil_hash_t *attribute;
 
+    AXIS2_PARAM_CHECK(env->error, proxy_host, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, proxy_port, AXIS2_FAILURE);
+    
     if (svc_client->conf)
     {
         conf = svc_client->conf;

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Apr  2 16:56:22 2007
@@ -1233,12 +1233,6 @@
                 case AXIS2_SVC:
                     arch_reader = axis2_arch_reader_create(env);
 
-                    /* TODO
-                     * AXIS2_ARCH_READER_PROCESS_WSDLS(arch_reader, env, dep_engine->curr_file);
-                     * absolute_path = AXIS2_ARCH_FILE_DATA_GET_ABSOLUTE_PATH(
-                     *          dep_engine->curr_file, env);
-                     * svc = axis2_arch_reader_create_svc(arch_reader, env, absolute_path);
-                     */
                     svc_grp = axis2_svc_grp_create_with_conf(env,
                         dep_engine->conf);
                     file_name = axis2_arch_file_data_get_name(dep_engine->

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Mon Apr  2 16:56:22 2007
@@ -386,7 +386,7 @@
         *buf[0] = '\0';
         return 0;
     }
-    length = AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request, env);
+    length = axis2_http_simple_request_get_content_length(simple_request, env);
     if (length > 0)
     {
         *buf = (char*)AXIS2_MALLOC(env->allocator, length + 1);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c Mon Apr  2 16:56:22 2007
@@ -101,7 +101,7 @@
 
     if (simple_response->status_line)
     {
-        AXIS2_HTTP_STATUS_LINE_FREE(simple_response->status_line, env);
+        axis2_http_status_line_free(simple_response->status_line, env);
     }
     if (simple_response->header_group)
     {
@@ -149,7 +149,7 @@
             AXIS2_HTTP_CRLF);
     if (simple_response->status_line)
     {
-        AXIS2_HTTP_STATUS_LINE_FREE(simple_response->status_line, env);
+        axis2_http_status_line_free(simple_response->status_line, env);
         simple_response->status_line = NULL;
     }
     simple_response->status_line = axis2_http_status_line_create(env,
@@ -173,7 +173,7 @@
     {
         return NULL;
     }
-    return AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(simple_response->status_line, env);
+    return axis2_http_status_line_get_reason_phrase(simple_response->status_line, env);
 }
 
 
@@ -186,7 +186,7 @@
     {
         return -1;
     }
-    return AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(simple_response->status_line, env);
+    return axis2_http_status_line_get_status_code(simple_response->status_line, env);
 }
 
 
@@ -199,7 +199,7 @@
     {
         return NULL;
     }
-    return AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(simple_response->status_line, env);
+    return axis2_http_status_line_get_http_version(simple_response->status_line, env);
 }
 
 
@@ -213,7 +213,7 @@
     {
         return NULL;
     }
-    return AXIS2_HTTP_STATUS_LINE_TO_STRING(simple_response->status_line, env);
+    return axis2_http_status_line_to_string(simple_response->status_line, env);
 }
 
 axutil_array_list_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Mon Apr  2 16:56:22 2007
@@ -141,10 +141,10 @@
         return AXIS2_FALSE;
     }
 
-    content_length = AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request
+    content_length = axis2_http_simple_request_get_content_length(simple_request
             , env);
     http_version = axis2_http_request_line_get_http_version
-            (AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE
+            (axis2_http_simple_request_get_request_line
                     (simple_request, env), env);
     if (! http_version)
     {
@@ -156,7 +156,7 @@
             http_version);
 
     response = axis2_http_simple_response_create_default(env);
-    encoding_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
+    encoding_header = axis2_http_simple_request_get_first_header(simple_request,
             env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
     if (encoding_header)
     {
@@ -168,12 +168,12 @@
                     AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
     {
         if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
-                    AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+                    axis2_http_simple_request_get_request_line(
                         simple_request, env), env), AXIS2_HTTP_HEADER_POST))
         {
             axis2_http_simple_response_set_status_line(response, env,
                     http_version, 411, "Length Required");
-            status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
+            status = axis2_simple_http_svr_conn_write_response(svr_conn, env,
                     response);
             axis2_http_simple_response_free(response, env);
             response = NULL;
@@ -181,7 +181,7 @@
         }
 
     }
-    request_body = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env);
+    request_body = axis2_http_simple_request_get_body(simple_request, env);
 
     out_desc =  axis2_conf_get_transport_out( axis2_conf_ctx_get_conf
             (http_worker->conf_ctx, env), env,
@@ -199,8 +199,8 @@
                 response);
     }
 
-    svr_ip = AXIS2_SIMPLE_HTTP_SVR_CONN_GET_SVR_IP(svr_conn, env);
-    peer_ip = AXIS2_SIMPLE_HTTP_SVR_CONN_GET_PEER_IP(svr_conn, env);
+    svr_ip = axis2_simple_http_svr_conn_get_svr_ip(svr_conn, env);
+    peer_ip = axis2_simple_http_svr_conn_get_peer_ip(svr_conn, env);
 
     if (peer_ip)
     {
@@ -210,7 +210,7 @@
     }
 
     path =   axis2_http_request_line_get_uri(
-	AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+	axis2_http_simple_request_get_request_line(
 	    simple_request, env), env);
 
     request_url = axutil_url_create(env, "http", svr_ip,
@@ -235,28 +235,28 @@
     http_out_transport_info = axis2_http_out_transport_info_create(env, response);
     axis2_msg_ctx_set_http_out_transport_info(msg_ctx, env, http_out_transport_info);
 
-    if (AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env,
+    if (axis2_http_simple_request_get_first_header(simple_request, env,
             AXIS2_HTTP_HEADER_SOAP_ACTION))
     {
         soap_action = axis2_http_header_get_value(
-                    AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(
+                    axis2_http_simple_request_get_first_header(
                         simple_request, env, AXIS2_HTTP_HEADER_SOAP_ACTION),
                     env);
         soap_action_str = axutil_string_create(env, soap_action);
     }
     if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
-                AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+                axis2_http_simple_request_get_request_line(
                     simple_request, env), env), AXIS2_HTTP_HEADER_GET))
     {
         processed = axis2_http_transport_utils_process_http_get_request
                 (env, msg_ctx, request_body, out_stream,
-                        AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
+                        axis2_http_simple_request_get_content_type(
                             simple_request, env) , soap_action_str,
                         axutil_url_to_external_form(request_url, env),
                         conf_ctx,
                         axis2_http_transport_utils_get_request_params(env,
                                 axis2_http_request_line_get_uri(
-                                    AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+                                    axis2_http_simple_request_get_request_line(
                                         simple_request, env), env)));
         if (AXIS2_FALSE == processed)
         {
@@ -287,18 +287,18 @@
                 }
                 axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
                     simple_request, response, 0);
-                AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
+                axis2_simple_http_svr_conn_write_response(svr_conn, env, response);
                 axis2_http_simple_response_free(response, env);
                 return AXIS2_TRUE;
         }
     }
     else if (0 == axis2_strcasecmp(axis2_http_request_line_get_method(
-                AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+                axis2_http_simple_request_get_request_line(
                     simple_request, env), env), AXIS2_HTTP_HEADER_POST))
     {
         status = axis2_http_transport_utils_process_http_post_request
                 (env, msg_ctx, request_body, out_stream,
-                        AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
+                        axis2_http_simple_request_get_content_type(
                             simple_request, env) , content_length, soap_action_str,
                         url_external_form);
         if (status == AXIS2_FAILURE)
@@ -323,7 +323,7 @@
                     http_error_property, env);
 
             fault_ctx =  axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
-            req_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request
+            req_line = axis2_http_simple_request_get_request_line(simple_request
                 , env);
             if (req_line)
             {
@@ -353,16 +353,16 @@
                 axis2_engine_send_fault(engine, env, fault_ctx);
 
             axis2_http_simple_response_set_status_line(response, env,
-                    AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(tmp_stat_line, env),
-                    AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(tmp_stat_line, env) ,
-                    AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(tmp_stat_line, env));
+                    axis2_http_status_line_get_http_version(tmp_stat_line, env),
+                    axis2_http_status_line_get_status_code(tmp_stat_line, env) ,
+                    axis2_http_status_line_get_reason_phrase(tmp_stat_line, env));
             axis2_http_simple_response_set_body_stream(response, env,
                     out_stream);
             axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
                     simple_request, response, axutil_stream_get_len(
                         out_stream, env));
 
-            status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
+            status = axis2_simple_http_svr_conn_write_response(svr_conn, env,
                     response);
             return status;
 
@@ -385,7 +385,7 @@
             simple_request, response, axutil_stream_get_len(
                 out_stream, env));
 
-    status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
+    status = axis2_simple_http_svr_conn_write_response(svr_conn, env, response);
     AXIS2_FREE(env->allocator, url_external_form);
     url_external_form = NULL;
     op_ctx =  axis2_msg_ctx_get_op_ctx(msg_ctx, env);
@@ -440,7 +440,7 @@
     if (AXIS2_FALSE == axis2_http_simple_response_contains_header
             (simple_response, env, AXIS2_HTTP_HEADER_CONNECTION))
     {
-        conn_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
+        conn_header = axis2_http_simple_request_get_first_header(simple_request,
                 env, AXIS2_HTTP_HEADER_CONNECTION);
         if (conn_header)
         {
@@ -452,7 +452,7 @@
                         AXIS2_HTTP_HEADER_CONNECTION_KEEPALIVE);
                 axis2_http_simple_response_set_header(simple_response, env,
                         header);
-                AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
+                axis2_simple_http_svr_conn_set_keep_alive(svr_conn, env,
                         AXIS2_TRUE);
             }
             if (0 == axis2_strcasecmp(axis2_http_header_get_value(conn_header,
@@ -463,7 +463,7 @@
                         AXIS2_HTTP_HEADER_CONNECTION_CLOSE);
                 axis2_http_simple_response_set_header(simple_response, env,
                         header);
-                AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
+                axis2_simple_http_svr_conn_set_keep_alive(svr_conn, env,
                         AXIS2_FALSE);
             }
         }
@@ -474,16 +474,16 @@
                         axis2_http_simple_response_get_http_version(
                             simple_response, env), AXIS2_HTTP_HEADER_PROTOCOL_11))
             {
-                AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
+                axis2_simple_http_svr_conn_set_keep_alive(svr_conn, env,
                         AXIS2_TRUE);
             }
             else
             {
-                AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
+                axis2_simple_http_svr_conn_set_keep_alive(svr_conn, env,
                         AXIS2_FALSE);
             }
         }
-        if (AXIS2_FALSE == AXIS2_HTTP_SIMPLE_REQUEST_CONTAINS_HEADER(
+        if (AXIS2_FALSE == axis2_http_simple_request_contains_header(
                     simple_request, env,
                     AXIS2_HTTP_HEADER_TRANSFER_ENCODING))
         {
@@ -549,7 +549,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, request, AXIS2_FAILURE);
 
-    header_list = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
+    header_list = axis2_http_simple_request_get_headers(request, env);
     if (!header_list)
     {
         return NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/simple_http_svr_conn.c Mon Apr  2 16:56:22 2007
@@ -283,7 +283,7 @@
                 memset(str_line, 0, 2048);
                 if (tmp_header)
                 {
-                    AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env,
+                    axis2_http_simple_request_add_header(request, env,
                             tmp_header);
                 }
             }
@@ -357,11 +357,11 @@
         AXIS2_ERROR_SET(env->error,
                 AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
                 AXIS2_FAILURE);
-        AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
+        axis2_http_response_writer_free(response_writer, env);
         response_writer = NULL;
         return AXIS2_FAILURE;
     }
-    AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env, status_line);
+    axis2_http_response_writer_print_str(response_writer, env, status_line);
     headers = axis2_http_simple_response_get_headers(response, env);
 
     if (headers)
@@ -376,13 +376,13 @@
                 axis2_char_t *header_ext_form =
                     axis2_http_header_to_external_form(
                         (axis2_http_header_t*)header, env);
-                AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env,
+                axis2_http_response_writer_print_str(response_writer, env,
                         header_ext_form);
                 AXIS2_FREE(env->allocator, header_ext_form);
             }
         }
     }
-    AXIS2_HTTP_RESPONSE_WRITER_PRINTLN(response_writer, env);
+    axis2_http_response_writer_println(response_writer, env);
 
     response_stream = axis2_http_simple_response_get_body(response, env);
     if (response_stream)
@@ -395,18 +395,18 @@
 
     if (body_size <= 0)
     {
-        AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
+        axis2_http_response_writer_free(response_writer, env);
         return AXIS2_SUCCESS;
     }
     if (AXIS2_FALSE == chuked_encoding)
     {
         axis2_status_t write_stat = AXIS2_FAILURE;
         if (AXIS2_FALSE == binary_content)
-            write_stat = AXIS2_HTTP_RESPONSE_WRITER_PRINTLN_STR(response_writer,
+            write_stat = axis2_http_response_writer_println_str(response_writer,
                     env, response_body);
         else
         {
-            write_stat = AXIS2_HTTP_RESPONSE_WRITER_WRITE_BUF(response_writer,
+            write_stat = axis2_http_response_writer_write_buf(response_writer,
                     env, response_body, 0, body_size);
         }
 
@@ -414,7 +414,7 @@
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_RESPONSE,
                     AXIS2_FAILURE);
-            AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
+            axis2_http_response_writer_free(response_writer, env);
             return AXIS2_FAILURE;
         }
     }
@@ -426,14 +426,14 @@
                 svr_conn->stream);
         while (left > 0)
         {
-            left -= AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env,
+            left -= axis2_http_chunked_stream_write(chunked_stream, env,
                     response_body, body_size);
         }
-        AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env);
-        AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env);
+        axis2_http_chunked_stream_write_last_chunk(chunked_stream, env);
+        axis2_http_chunked_stream_free(chunked_stream, env);
     }
     /*AXIS2_FREE(env->allocator, response_body);*/
-    AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
+    axis2_http_response_writer_free(response_writer, env);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Mon Apr  2 16:56:22 2007
@@ -148,8 +148,8 @@
     server_impl = AXIS2_INTF_TO_IMPL(server);
     if (server_impl->svr_thread)
     {
-        AXIS2_HTTP_SVR_THREAD_DESTROY(server_impl->svr_thread, env);
-        AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
+        axis2_http_svr_thread_destroy(server_impl->svr_thread, env);
+        axis2_http_svr_thread_free(server_impl->svr_thread, env);
         server_impl->svr_thread = NULL;
     }
 
@@ -219,12 +219,12 @@
     AXIS2_HTTP_WORKER_SET_SVR_PORT(worker, env, server_impl->port);
     if (! worker)
     {
-        AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
+        axis2_http_svr_thread_free(server_impl->svr_thread, env);
         return AXIS2_FAILURE;
     }
     AXIS2_LOG_INFO(env->log, "Starting HTTP server thread");
-    AXIS2_HTTP_SVR_THREAD_SET_WORKER(server_impl->svr_thread, env, worker);
-    AXIS2_HTTP_SVR_THREAD_RUN(server_impl->svr_thread, env);
+    axis2_http_svr_thread_set_worker(server_impl->svr_thread, env, worker);
+    axis2_http_svr_thread_run(server_impl->svr_thread, env);
     return AXIS2_SUCCESS;
 }
 
@@ -239,7 +239,7 @@
     AXIS2_LOG_INFO(env->log, "Terminating HTTP server thread");
     if (AXIS2_INTF_TO_IMPL(server)->svr_thread)
     {
-        AXIS2_HTTP_SVR_THREAD_DESTROY(AXIS2_INTF_TO_IMPL(server)->svr_thread,
+        axis2_http_svr_thread_destroy(AXIS2_INTF_TO_IMPL(server)->svr_thread,
                 env);
     }
     AXIS2_LOG_INFO(env->log, "Successfully terminated  HTTP server"
@@ -297,7 +297,7 @@
     }
     else
     {
-        return AXIS2_HTTP_SVR_THREAD_IS_RUNNING(server_impl->svr_thread, env);
+        return axis2_http_svr_thread_is_running(server_impl->svr_thread, env);
     }
     return AXIS2_FALSE;
 }

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=524975&r1=524974&r2=524975
==============================================================================
--- 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 Mon Apr  2 16:56:22 2007
@@ -250,15 +250,15 @@
     thread_env = axis2_init_thread_env(env);
     socket = arg_list->socket;
     svr_conn = axis2_simple_http_svr_conn_create(thread_env, socket);
-    AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, thread_env,
+    axis2_simple_http_svr_conn_set_rcv_timeout(svr_conn, thread_env,
             axis2_http_socket_read_timeout);
-    request = AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, thread_env);
+    request = axis2_simple_http_svr_conn_read_request(svr_conn, thread_env);
     tmp = arg_list->worker;
     status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, thread_env, svr_conn,
             request);
-    AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, thread_env);
+    axis2_simple_http_svr_conn_free(svr_conn, thread_env);
     if (request)
-        AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, thread_env);
+        axis2_http_simple_request_free(request, thread_env);
     AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
     millisecs = t2.millitm - t1.millitm;
     secs = difftime(t2.time, t1.time);

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=524975&r1=524974&r2=524975
==============================================================================
--- 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 Mon Apr  2 16:56:22 2007
@@ -143,7 +143,7 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    body_size = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY_BYTES(request, env,
+    body_size = axis2_http_simple_request_get_body_bytes(request, env,
             &str_body);
 
     if(client->dump_input_msg == AXIS2_TRUE)
@@ -206,8 +206,8 @@
         }
         client->data_stream = axutil_stream_create_ssl(env,
                 client->sockfd, 
-                AXIS2_HTTP_CLIENT_GET_SERVER_CERT(client, env),
-                AXIS2_HTTP_CLIENT_GET_KEY_FILE(client, env),
+                axis2_http_client_get_server_cert(client, env),
+                axis2_http_client_get_key_file(client, env),
                 ssl_pp);
 #else
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_TRANSPORT_PROTOCOL,
@@ -227,7 +227,7 @@
         return AXIS2_FAILURE;
     }
 
-    headers = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
+    headers = axis2_http_simple_request_get_headers(request, env);
     if (headers)
     {
         int header_count = axutil_array_list_size(headers, env);
@@ -264,7 +264,7 @@
     if (AXIS2_FALSE == client->proxy_enabled)
     {
         str_request_line = axis2_http_request_line_to_string(
-                    AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env)
+                    axis2_http_simple_request_get_request_line(request, env)
                     , env);
     }
     else
@@ -275,7 +275,7 @@
         axis2_char_t *host_port_str = NULL;
         axis2_char_t *server = axutil_url_get_server(client->url, env);
         axis2_http_request_line_t *request_line =
-            AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env);
+            axis2_http_simple_request_get_request_line(request, env);
         axis2_char_t *path = axis2_http_request_line_get_uri(request_line, env);
 
 
@@ -340,7 +340,7 @@
             }
             while (written < body_size)
             {
-                written = AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env,
+                written = axis2_http_chunked_stream_write(chunked_stream, env,
                         str_body, body_size);
                 if (-1 == written)
                 {
@@ -350,9 +350,9 @@
             }
             if (AXIS2_SUCCESS == status)
             {
-                AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env);
+                axis2_http_chunked_stream_write_last_chunk(chunked_stream, env);
             }
-            AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env);
+            axis2_http_chunked_stream_free(chunked_stream, env);
         }
     }
 
@@ -432,16 +432,16 @@
             continue;
 
         }
-        http_status = AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env);
+        http_status = axis2_http_status_line_get_status_code(status_line, env);
     }
     while (AXIS2_HTTP_RESPONSE_OK_CODE_VAL > http_status);
 
     client->response = axis2_http_simple_response_create_default(env);
     axis2_http_simple_response_set_status_line(client->response, env,
-            AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line,
-                    env), AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(
+            axis2_http_status_line_get_http_version(status_line,
+                    env), axis2_http_status_line_get_status_code(
                 status_line, env),
-            AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line,
+            axis2_http_status_line_get_reason_phrase(status_line,
                     env));
 
     /* now read the headers */
@@ -484,8 +484,8 @@
             client->data_stream);
     if (status_line)
     {
-        status_code = AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env);
-        AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
+        status_code = axis2_http_status_line_get_status_code(status_line, env);
+        axis2_http_status_line_free(status_line, env);
         status_line = NULL;
     }
     if (AXIS2_FALSE == axis2_http_simple_response_contains_header(
@@ -666,7 +666,7 @@
                 AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    if (200 != AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env))
+    if (200 != axis2_http_status_line_get_status_code(status_line, env))
     {
         return AXIS2_FAILURE;
     }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Apr  2 16:56:22 2007
@@ -222,7 +222,7 @@
 
     if (sender->client)
     {
-        AXIS2_HTTP_CLIENT_FREE(sender->client, env);
+        axis2_http_client_free(sender->client, env);
         sender->client = NULL;
     }
 
@@ -279,7 +279,7 @@
 				axis2_char_t *dump_true = axutil_property_get_value(dump_property, env);
 				if(0 == axis2_strcmp(dump_true, AXIS2_VALUE_TRUE))
 				{
-					AXIS2_HTTP_CLIENT_SET_DUMP_INPUT_MSG(sender->client, env, AXIS2_TRUE);
+					axis2_http_client_set_dump_input_msg(sender->client, env, AXIS2_TRUE);
 				}
 			}
 
@@ -477,7 +477,7 @@
 
     if (doing_mtom)
     {
-        axutil_stream_t *stream = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(request, env);
+        axutil_stream_t *stream = axis2_http_simple_request_get_body(request, env);
         if (stream)
         {
             axutil_stream_write(stream, env, output_stream, output_stream_size);
@@ -485,7 +485,7 @@
     }
     else
     {
-        AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(request, env, buffer, buffer_size);
+        axis2_http_simple_request_set_body_string(request, env, buffer, buffer_size);
     }
 
 	axis2_http_sender_configure_server_cert(sender, env, msg_ctx);
@@ -493,7 +493,7 @@
     axis2_http_sender_configure_key_file(sender, env, msg_ctx);
 
     axis2_http_sender_get_timeout_values(sender, env, msg_ctx);
-    AXIS2_HTTP_CLIENT_SET_TIMEOUT(sender->client, env,
+    axis2_http_client_set_timeout(sender->client, env,
 								  sender->so_timeout);
     
     ssl_pp_param =  axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
@@ -503,24 +503,24 @@
         ssl_pp = axutil_param_get_value(ssl_pp_param, env);
     }
 
-    status_code = AXIS2_HTTP_CLIENT_SEND(sender->client, env, request, ssl_pp);
+    status_code = axis2_http_client_send(sender->client, env, request, ssl_pp);
 
     /*AXIS2_FREE(env->allocator, buffer);
 	  buffer = NULL;*/
 
-    AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, env);
+    axis2_http_simple_request_free(request, env);
     request = NULL;
     
     AXIS2_FREE(env->allocator, output_stream);
     output_stream = NULL;
 
-    status_code = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(sender->client, env);
+    status_code = axis2_http_client_recieve_header(sender->client, env);
 
     if (status_code < 0)
     {
         return AXIS2_FAILURE;
     }
-    response = AXIS2_HTTP_CLIENT_GET_RESPONSE(sender->client, env);
+    response = axis2_http_client_get_response(sender->client, env);
     if (AXIS2_HTTP_RESPONSE_OK_CODE_VAL == status_code ||
 		AXIS2_HTTP_RESPONSE_ACK_CODE_VAL == status_code)
     {
@@ -912,7 +912,7 @@
     }
     if (proxy_port && proxy_host)
     {
-        AXIS2_HTTP_CLIENT_SET_PROXY(sender->client, env, proxy_host,
+        axis2_http_client_set_proxy(sender->client, env, proxy_host,
                                     AXIS2_ATOI(proxy_port));
     }
     return AXIS2_SUCCESS;
@@ -952,7 +952,7 @@
     
     if(server_cert)
     {
-        status = AXIS2_HTTP_CLIENT_SET_SERVER_CERT(sender->client, 
+        status = axis2_http_client_set_server_cert(sender->client, 
 												   env, server_cert);
     }
 
@@ -993,7 +993,7 @@
 
     if (key_file)
     {
-		status = AXIS2_HTTP_CLIENT_SET_KEY_FILE(sender->client, 
+		status = axis2_http_client_set_key_file(sender->client, 
 												env, key_file);
     }
 

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=524975&r1=524974&r2=524975
==============================================================================
--- 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 Mon Apr  2 16:56:22 2007
@@ -582,7 +582,7 @@
     /* Free the client */
 /*     if (client) */
 /*     { */
-/*         AXIS2_HTTP_CLIENT_FREE(client, env); */
+/*         axis2_http_client_free(client, env); */
 /*         client = NULL; */
 /*     } */
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c Mon Apr  2 16:56:22 2007
@@ -20,6 +20,6 @@
 {
 	axis2_http_header_t *http_header;
     http_header = axis2_http_header_create(env, header_name, header_value);
-    AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, http_header);
+    axis2_http_simple_request_add_header(request, env, http_header);
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=524975&r1=524974&r2=524975
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Apr  2 16:56:22 2007
@@ -553,12 +553,7 @@
         return AXIS2_FALSE;
     }
     op =  axis2_msg_ctx_get_op(msg_ctx, env);
-    /*if (op)
-    {
-        axis2_msg_t *msg = NULL;
-        msg = axis2_op_get_msg(op, env, AXIS2_MSG_IN);
-        schema_element = AXIS2_MSG_GET_SCHEMA_ELEMENT(msg, env);
-    }*/
+
     soap_envelope = axis2_http_transport_utils_handle_media_type_url_encoded(
                 env, msg_ctx, request_params, AXIS2_HTTP_HEADER_GET);
     if (! soap_envelope)
@@ -1068,7 +1063,7 @@
     }
     if (cb_ctx->chunked_stream)
     {
-        len = AXIS2_HTTP_CHUNKED_STREAM_READ(cb_ctx->chunked_stream, env,
+        len = axis2_http_chunked_stream_read(cb_ctx->chunked_stream, env,
                 buffer, size);
         buffer[len] = '\0';
         return len;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message