You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/05/25 08:09:17 UTC
svn commit: r541560 [2/3] - in /webservices/axis2/scratch/c/neethi/axis2c:
./ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/ ides/vc/axis2c/ ides/vc/axis2c/axis2_mod_addr/
ides/vc/axis2c/mod_savan/ include/ n...
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/soap_action_disp.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/engine/soap_action_disp.c Thu May 24 23:09:08 2007
@@ -85,7 +85,7 @@
const axutil_env_t *env)
{
AXIS2_LOG_DEBUG(env->log,
- AXIS2_LOG_SI, "Checking for service using SOAPAction is a TODO item");
+ AXIS2_LOG_SI, "Checking for service using SOAPAction is not implemented");
return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/phaseresolver/phase_resolver.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/phaseresolver/phase_resolver.c Thu May 24 23:09:08 2007
@@ -114,7 +114,7 @@
phase_resolver->axis2_config = axis2_config;
phase_resolver->svc = svc;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Service name is : %s",
axis2_svc_get_name(phase_resolver->svc, env));
return phase_resolver;
@@ -363,7 +363,6 @@
phase_name = axis2_phase_rule_get_name(phase_rule, env);
}
- /* TODO change this in proper way */
if (!phase_name || (0 == axutil_strcmp(phase_name, "")))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED,
@@ -951,7 +950,7 @@
axutil_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Operation name is : %s",
axutil_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
modules = axis2_op_get_all_modules(op_desc, env);
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_response_writer.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_response_writer.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_response_writer.c Thu May 24 23:09:08 2007
@@ -103,9 +103,6 @@
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- /*
- TODO if bufferring is added flush the buffer
- */
return AXIS2_FALSE;
}
@@ -153,9 +150,6 @@
{
return AXIS2_FAILURE;
}
- /*
- TODO handle offset
- */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_simple_request.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_simple_request.c Thu May 24 23:09:08 2007
@@ -405,9 +405,6 @@
tmp_buf = tmp_buf3;
}
- /*
- TODO :STREAM_READ => STREAM_READ_BYTES
- */
if (tmp_buf)
{
*buf = tmp_buf;
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_worker.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/http_worker.c Thu May 24 23:09:08 2007
@@ -393,7 +393,8 @@
{
axis2_msg_ctx_t *out_msg_ctx = NULL, *in_msg_ctx = NULL;
axis2_msg_ctx_t **msg_ctx_map = NULL;
-
+ axis2_char_t *msg_id = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
msg_ctx_map = axis2_op_ctx_get_msg_ctx_map(op_ctx, env);
out_msg_ctx = msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_OUT];
@@ -408,11 +409,25 @@
if (in_msg_ctx)
{
+ msg_id = axutil_strdup(env, axis2_msg_ctx_get_msg_id(in_msg_ctx, env));
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(in_msg_ctx, env);
+
axis2_msg_ctx_free(in_msg_ctx, env);
in_msg_ctx = NULL;
msg_ctx_map[AXIS2_WSDL_MESSAGE_LABEL_IN] = NULL;
}
+ if(!axis2_op_ctx_is_in_use(op_ctx, env))
+ {
+ axis2_op_ctx_destroy_mutex(op_ctx, env);
+ if (conf_ctx && msg_id)
+ {
+ axis2_conf_ctx_register_op_ctx(conf_ctx, env, msg_id, NULL);
+ AXIS2_FREE(env->allocator, msg_id);
+ }
+ axis2_op_ctx_free(op_ctx, env);
+ }
+
} /* Done freeing message contexts */
msg_ctx = NULL;
@@ -530,9 +545,6 @@
config = axis2_conf_ctx_get_conf(conf_ctx, env);
- /*
- TODO implement the method
- */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/simple_http_svr_conn.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/simple_http_svr_conn.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/common/simple_http_svr_conn.c Thu May 24 23:09:08 2007
@@ -166,7 +166,7 @@
AXIS2_ENV_CHECK(env, NULL);
memset(str_line, 0, 2048);
- while ((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, 2048)) > 0)
+ while ((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, 2048 - 1)) > 0)
{
axis2_char_t *start = tmp_buf;
axis2_char_t *end = NULL;
@@ -188,7 +188,7 @@
}
else
{
- read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048 - 1);
if (read > 0)
{
tmp_buf[read] = '\0';
@@ -227,7 +227,7 @@
end_of_line = AXIS2_FALSE;
while (AXIS2_FALSE == end_of_headers)
{
- while ((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, 2048)) > 0)
+ while ((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, 2048 - 1)) > 0)
{
axis2_char_t *start = tmp_buf;
axis2_char_t *end = NULL;
@@ -250,26 +250,16 @@
}
else
{
- read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048);
+ read = axutil_stream_read(svr_conn->stream, env, tmp_buf, 2048 - 1);
if (read > 0)
{
tmp_buf[read] = '\0';
strcat(str_line, tmp_buf);
}
}
+
}
-
- /*while ((read = axutil_stream_read(svr_conn->stream, env, tmp_buf,
- 1)) > 0)
- {
- tmp_buf[read] = '\0';
- strcat(str_line, tmp_buf);
- if (0 != strstr(str_line, AXIS2_HTTP_CRLF))
- {
- end_of_line = AXIS2_TRUE;
- break;
- }
- }*/
+
if (AXIS2_TRUE == end_of_line)
{
if (0 == axutil_strcmp(str_line, AXIS2_HTTP_CRLF))
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_receiver.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_receiver.c Thu May 24 23:09:08 2007
@@ -216,7 +216,7 @@
return AXIS2_FAILURE;
}
worker = axis2_http_worker_create(env, server_impl->conf_ctx);
- AXIS2_HTTP_WORKER_SET_SVR_PORT(worker, env, server_impl->port);
+ axis2_http_worker_set_svr_port(worker, env, server_impl->port);
if (! worker)
{
axis2_http_svr_thread_free(server_impl->svr_thread, env);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/receiver/http_svr_thread.c Thu May 24 23:09:08 2007
@@ -97,7 +97,7 @@
if (svr_thread->worker)
{
- AXIS2_HTTP_WORKER_FREE(svr_thread->worker, env);
+ axis2_http_worker_free(svr_thread->worker, env);
svr_thread->worker = NULL;
}
if (-1 != svr_thread->listen_socket)
@@ -181,7 +181,6 @@
axutil_network_handler_close_socket(env, svr_thread->listen_socket);
svr_thread->listen_socket = -1;
}
- /* TODO: stop all the child threads */
return AXIS2_SUCCESS;
}
@@ -254,7 +253,7 @@
axis2_http_socket_read_timeout);
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,
+ status = axis2_http_worker_process_request(tmp, thread_env, svr_conn,
request);
axis2_simple_http_svr_conn_free(svr_conn, thread_env);
if (request)
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_sender.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_sender.c Thu May 24 23:09:08 2007
@@ -60,6 +60,11 @@
is_safe_or_unreserve (
char c);
+static void
+axis2_http_sender_add_header_list (axis2_http_simple_request_t *request,
+ const axutil_env_t *env,
+ axutil_array_list_t *array_list);
+
#ifndef AXIS2_LIBCURL_ENABLED
static axis2_status_t
axis2_http_sender_configure_proxy(
@@ -172,6 +177,8 @@
axiom_node_t *body_node = NULL;
axiom_soap_body_t *soap_body = NULL;
axis2_bool_t is_soap = AXIS2_TRUE;
+ axutil_property_t *http_property = NULL;
+ axutil_array_list_t *array_list;
soap_body = axiom_soap_envelope_get_body(out, env);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -201,6 +208,7 @@
body_node = axiom_soap_body_get_base_node(soap_body, env);
if (! body_node)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "body_node is NULL");
return AXIS2_FAILURE;
}
data_out = axiom_node_get_first_element(body_node, env);
@@ -219,6 +227,7 @@
if (! url)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "url is NULL");
return AXIS2_FAILURE;
}
@@ -231,6 +240,7 @@
sender->client = axis2_http_client_create(env, url);
if (! sender->client)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sender->client is NULL");
return AXIS2_FAILURE;
}
@@ -334,6 +344,13 @@
axis2_http_sender_util_add_header (env, request, AXIS2_HTTP_HEADER_USER_AGENT, "Axis2/C");
+ http_property = axis2_msg_ctx_get_property (msg_ctx, env, AXIS2_TRANSPORT_HEADER_PROPERTY);
+ if (http_property)
+ {
+ array_list = (axutil_array_list_t *)axutil_property_get_value (http_property, env);
+ axis2_http_sender_add_header_list (request, env, array_list);
+ }
+
if (AXIS2_TRUE == axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
{
if ('\"' != *soap_action)
@@ -522,6 +539,7 @@
if (status_code < 0)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "status_code < 0");
return AXIS2_FAILURE;
}
response = axis2_http_client_get_response(sender->client, env);
@@ -548,6 +566,8 @@
if (axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
axutil_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "mep is AXIS2_MEP_URI_OUT_ONLY or AXIS2_MEP_URI_ROBUST_OUT_ONLY");
return AXIS2_FAILURE;
}
}
@@ -617,9 +637,6 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, response, AXIS2_FAILURE);
- /*
- * TODO MTOM support (MIME header)
- */
headers = axis2_http_simple_response_get_headers(response, env);
if (headers == NULL)
{
@@ -637,16 +654,6 @@
, env), AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
axis2_char_t *transfer_encoding = NULL;
-/* transfer_encoding = */
-/* axutil_strdup(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED, */
-/* env); */
-/* property = axutil_property_create(env); */
-/* axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST); */
-/* axutil_property_set_value(property, env, transfer_encoding); */
-/* axis2_msg_ctx_set_property(msg_ctx, env, */
-/* AXIS2_HTTP_HEADER_TRANSFER_ENCODING, */
-/* property); */
-/* response_chunked = AXIS2_TRUE; */
transfer_encoding =
axutil_strdup(env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED);
@@ -1184,4 +1191,20 @@
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);
+}
+
+static void
+axis2_http_sender_add_header_list (axis2_http_simple_request_t *request,
+ const axutil_env_t *env,
+ axutil_array_list_t *array_list)
+{
+ int ii = 0;
+ int kk = 0;
+ axis2_http_header_t *http_header = NULL;
+ ii = axutil_array_list_size (array_list, env);
+ for (; kk < ii; kk++)
+ {
+ http_header = (axis2_http_header_t *)axutil_array_list_get (array_list, env, kk);
+ axis2_http_simple_request_add_header (request, env, http_header);
+ }
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_transport_sender.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/http_transport_sender.c Thu May 24 23:09:08 2007
@@ -244,11 +244,13 @@
AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER);
if (! xml_writer)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Could not create xml_writer");
return AXIS2_FAILURE;
}
om_output = axiom_output_create(env, xml_writer);
if (! om_output)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Could not create om_output");
axiom_xml_writer_free(xml_writer, env);
xml_writer = NULL;
return AXIS2_FAILURE;
@@ -390,9 +392,6 @@
epr = NULL;
}
}
- /*
- * TODO handle errors
- */
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_stream.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_stream.c Thu May 24 23:09:08 2007
@@ -244,7 +244,6 @@
int ret = -1;
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
- /* TODO implement this */
return ret;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/sender/ssl/ssl_utils.c Thu May 24 23:09:08 2007
@@ -39,8 +39,7 @@
{
SSL_METHOD *meth = NULL;
SSL_CTX *ctx = NULL;
- axis2_char_t *ca_file = server_cert; /*TODO: remove ca_file*/
- /*axis2_char_t *key_file = NULL;*/
+ axis2_char_t *ca_file = server_cert;
AXIS2_ENV_CHECK(env, NULL);
@@ -67,7 +66,6 @@
/* Load our keys and certificates
* If we need client certificates it has to be done here
- * TODO
*/
if (key_file) /*can we check if the server needs client auth?*/
{
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_stream.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_stream.c Thu May 24 23:09:08 2007
@@ -156,7 +156,6 @@
int ret = -1;
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
- /* TODO implement this */
return ret;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/server/apache2/apache2_worker.c Thu May 24 23:09:08 2007
@@ -108,6 +108,7 @@
axis2_char_t *content_type = NULL;
axis2_http_out_transport_info_t *apache2_out_transport_info = NULL;
axis2_char_t *ctx_uuid = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
AXIS2_PARAM_CHECK(env->error, request, AXIS2_CRITICAL_FAILURE);
@@ -240,9 +241,11 @@
send_status = HTTP_INTERNAL_SERVER_ERROR;
}
}
+
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+
if (-1 == send_status)
{
- axis2_op_ctx_t *op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (axis2_op_ctx_get_response_written(op_ctx, env))
{
send_status = OK;
@@ -259,6 +262,10 @@
}
}
+ if (op_ctx)
+ {
+ axis2_op_ctx_destroy_mutex(op_ctx, env);
+ }
if (body_string)
{
ap_rwrite(body_string, body_string_len, request);
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/util/http_transport_utils.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/transport/http/util/http_transport_utils.c Thu May 24 23:09:08 2007
@@ -212,21 +212,21 @@
soap_action = (axis2_char_t*)axutil_string_get_buffer(soap_action_header, env);
soap_action_len = axutil_string_get_length(soap_action_header, env);
-
+
if (soap_action && (soap_action_len > 0))
{
/* remove leading and trailing " s */
if ('"' == soap_action[0])
{
- memmove(soap_action, soap_action + sizeof(axis2_char_t),
- soap_action_len + sizeof(axis2_char_t));
+ memmove(soap_action, soap_action + sizeof(char),
+ soap_action_len - 1 + sizeof(char));
}
- if ('"' == soap_action[soap_action_len -1])
+ if ('"' == soap_action[soap_action_len - 2])
{
- soap_action[soap_action_len -1] = '\0';
+ soap_action[soap_action_len - 2] = '\0';
}
}
-
+
headers = axis2_msg_ctx_get_transport_headers(msg_ctx, env);
if (headers)
{
@@ -420,7 +420,6 @@
if (rest_param && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
axutil_param_get_value(rest_param, env)))
{
- /* TODO we have to check for NULLs */
axiom_soap_body_t *def_body = NULL;
axiom_document_t *om_doc = NULL;
axiom_node_t *root_node = NULL;
@@ -579,9 +578,6 @@
axutil_stream_t *in_stream,
axis2_char_t *content_type)
{
- /*
- TODO implement when MTOM support is added
- */
return NULL;
}
@@ -590,9 +586,6 @@
const axutil_env_t *env,
axiom_element_t *om_element)
{
- /*
- TODO implement when MTOM support is added
- */
return AXIS2_FALSE;
}
@@ -601,28 +594,10 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- /*axutil_property_t *property = NULL;
- axutil_param_t *param = NULL;
- axis2_char_t *value = NULL;*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
return (axis2_msg_ctx_get_doing_mtom(msg_ctx, env));
-
- /*param = axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_ENABLE_MTOM);
- if (param)
- value = axutil_param_get_value(param, env);
-
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- AXIS2_ENABLE_MTOM);
- if (property)
- value = (axis2_char_t *)axutil_property_get_value(property, env);
-
- if (value)
- {
- return (axutil_strcmp(value, AXIS2_VALUE_TRUE) == 0);
- }
- return AXIS2_FALSE;*/
}
@@ -631,9 +606,6 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- /*
- TODO implement when REST support is added
- */
return AXIS2_FALSE;
}
@@ -643,9 +615,6 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- /*
- TODO implement when REST support is added
- */
return AXIS2_FALSE;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/addr_in_handler.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/addr_in_handler.c Thu May 24 23:09:08 2007
@@ -225,7 +225,6 @@
axis2_svc_grp_ctx_t *svc_ctx_grp_ctx = axis2_conf_ctx_get_svc_grp_ctx(conf_ctx, env, grp_id);
if (!svc_ctx_grp_ctx)
{
- /** TODO, set error */
return AXIS2_FAILURE;
}
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
@@ -236,7 +235,6 @@
}
axutil_qname_free(qname, env);
}
- /** TODO, set error */
return AXIS2_FAILURE;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/mod_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/mod_addr.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/mod_addr.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/modules/mod_addr/mod_addr.c Thu May 24 23:09:08 2007
@@ -68,9 +68,6 @@
{
if (module->handler_create_func_map)
{
- /* TODO
- * do the neccessary clean in hash map
- */
axutil_hash_free(module->handler_create_func_map, env);
module->handler_create_func_map = NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/test/core/clientapi/test_clientapi.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/test/core/clientapi/test_clientapi.c Thu May 24 23:09:08 2007
@@ -52,6 +52,13 @@
svc_client = axis2_svc_client_create(env, client_home);
+ if (!svc_client)
+ {
+ printf("axis2_test axis2_svc_client_create FAILURE\n");
+ printf("Client repository path not properly set. Please check AXIS2C_HOME setting\n");
+ return;
+ }
+
options = axis2_options_create(env);
axis2_options_set_to(options, env, endpoint_ref);
axis2_svc_client_set_options(svc_client, env, options);
Modified: webservices/axis2/scratch/c/neethi/axis2c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/test/core/transport/http/test_http_transport.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/test/core/transport/http/test_http_transport.c Thu May 24 23:09:08 2007
@@ -194,40 +194,40 @@
/* Add an ssl certificate variable */
/*setenv("AXIS2_SSL_CA_FILE", "cert.pem", 1);*/
header = axis2_http_header_create(env, "Host", axutil_url_get_server(url, env));
- AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
+ axis2_http_simple_request_add_header(request, env, header);
client = axis2_http_client_create(env, url);
/* if you weant to test the proxy uncomment following */
/*AXIS2_HTTP_CLIENT_SET_PROXY(client, env, "127.0.0.1", 8080);*/
- status = AXIS2_HTTP_CLIENT_SEND(client, env, request);
+ status = axis2_http_client_send(client, env, request, NULL);
if (status < 0)
{
printf("Test FAILED .........Can't send the request. Status :%d\n", status);
return;
}
- status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, env);
+ status = axis2_http_client_recieve_header(client, env);
if (status < 0)
{
printf("Test FAILED ......... Can't recieve. Status: %d\n", status);
return;
}
- response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, env);
+ response = axis2_http_client_get_response(client, env);
if (! response)
{
printf("Test Failed : NULL response");
return;
}
- printf("Content Type :%s\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
+ printf("Content Type :%s\n", axis2_http_simple_response_get_content_type(
response, env));
- printf("Content Length :%d\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(
+ printf("Content Length :%d\n", axis2_http_simple_response_get_content_length(
response, env));
printf("Status code :%d\n", status);
- body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env, &body_bytes);
+ body_bytes_len = axis2_http_simple_response_get_body_bytes(response, env, &body_bytes);
- AXIS2_HTTP_CLIENT_FREE(client, env);
- AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, env);
- AXIS2_STREAM_FREE(request_body, env);
+ axis2_http_client_free(client, env);
+ axis2_http_simple_request_free(request, env);
+ axutil_stream_free(request_body, env);
AXIS2_FREE(env->allocator, body_bytes);
printf("Finished https_client tests ..........\n\n");
#endif
Modified: webservices/axis2/scratch/c/neethi/axis2c/tools/tcpmon/src/tcpmon.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/tools/tcpmon/src/tcpmon.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/tools/tcpmon/src/tcpmon.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/tools/tcpmon/src/tcpmon.c Thu May 24 23:09:08 2007
@@ -26,13 +26,20 @@
#include <axutil_string.h>
#define SIZE 1024
+axis2_char_t *tcpmon_traffic_log = "tcpmon_traffic.log";
int on_new_entry(const axutil_env_t *env,
tcpmon_entry_t* entry,
int status);
+int on_new_entry_to_file(const axutil_env_t *env,
+ tcpmon_entry_t* entry,
+ int status);
int on_error_func(const axutil_env_t *env,
char* error_message);
+char *str_replace(char *str, const char *search, const char *replace);
+
+
int main(int argc, char** argv)
{
axutil_env_t* env = NULL;
@@ -60,8 +67,13 @@
if (!axutil_strcmp(argv[1], "-h"))
{
- printf("Usage : %s [OPTIONS] -lp LISTEN_PORT -tp TARGET_PORT -th [TARGET_HOST]\n", argv[0]);
- printf("use -h for help\n");
+ printf("Usage : %s [-lp LISTEN_PORT] [-tp TARGET_PORT] [-th TARGET_HOST] [-f LOG_FILE]\n", argv[0]);
+ fprintf(stdout, " Options :\n");
+ fprintf(stdout, "\t-lp LISTEN_PORT \t port number to listen on, default is 9090\n");
+ fprintf(stdout, "\t-tp TARGET_PORT \t port number to connect and re-direct messages, default is 8080\n");
+ fprintf(stdout, "\t-th TARGET_HOST \t target host to connect, default is localhost\n");
+ fprintf(stdout, "\t-f LOG_FILE \t file to write the messages to, default is %s\n", tcpmon_traffic_log);
+ fprintf(stdout, " Help :\n\t-h \t display this help screen.\n\n");
return 0;
}
@@ -74,7 +86,7 @@
if (listen_port == 0)
{
printf("INVALID value for listen port\n");
- printf("use -h for help\n");
+ printf("Use -h for help\n");
return 0;
}
@@ -86,7 +98,7 @@
if (target_port == 0)
{
printf("INVALID value for target port\n");
- printf("use -h for help\n");
+ printf("Use -h for help\n");
return 0;
}
}
@@ -105,12 +117,17 @@
ii++;
format_bit = 1;
}
+ else if (!strcmp ("-f", argv[ii]))
+ {
+ ii++;
+ tcpmon_traffic_log = argv[ii++];
+ }
else
- {
+ {
printf("INVALID value for tcpmon \n");
- printf("use -h for help\n");
+ printf("Use -h for help\n");
return 0;
- }
+ }
}
if (!(listen_port && target_port && target_host))
@@ -128,7 +145,9 @@
TCPMON_SESSION_SET_TARGET_PORT(session, env, target_port);
TCPMON_SESSION_SET_TARGET_HOST(session, env, target_host);
TCPMON_SESSION_ON_TRANS_FAULT(session, env, on_error_func);
- TCPMON_SESSION_ON_NEW_ENTRY(session, env, on_new_entry);
+
+ TCPMON_SESSION_ON_NEW_ENTRY(session, env, on_new_entry_to_file);
+
TCPMON_SESSION_SET_TEST_BIT (session, env, test_bit);
TCPMON_SESSION_SET_FORMAT_BIT(session, env, format_bit);
TCPMON_SESSION_START(session, env);
@@ -147,6 +166,105 @@
return 0;
}
+
+int on_new_entry_to_file(const axutil_env_t *env,
+ tcpmon_entry_t* entry,
+ int status)
+{
+ char* plain_buffer = NULL;
+ char* formated_buffer = NULL;
+ int format = 0;
+ FILE *file;
+ char *convert = NULL;
+
+ file = fopen(tcpmon_traffic_log, "a+");
+
+ if(NULL == file) {
+ printf("\ncould not create or open log-file\n");
+ return -1;
+ }
+
+ fprintf(file, "\n= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =\n");
+
+ format = TCPMON_ENTRY_GET_FORMAT_BIT(entry, env);
+
+ if (status == 0)
+ {
+ plain_buffer = TCPMON_ENTRY_SENT_DATA(entry, env);
+ if (plain_buffer) /* this can be possible as no xml present */
+ {
+ formated_buffer = tcpmon_util_format_as_xml
+ (env, plain_buffer, format);
+ }
+ else
+ {
+ formated_buffer = "";
+ }
+ /* 2 screen */
+ printf("%s\n", "SENDING DATA..");
+ printf("/* sending time = %s*/\n", TCPMON_ENTRY_SENT_TIME(entry, env));
+ printf("---------------------\n");
+
+ printf("%s\n\n%s\n\n", TCPMON_ENTRY_SENT_HEADERS(entry, env), formated_buffer);
+
+ /* 2 file */
+ fprintf(file, "%s\n", "SENDING DATA..");
+ fprintf(file, "/* sending time = %s*/\n", TCPMON_ENTRY_SENT_TIME(entry, env));
+ fprintf(file, "---------------------\n");
+
+ convert = TCPMON_ENTRY_SENT_HEADERS(entry, env);
+ convert = str_replace(convert, "; ", ";\n\t");
+ fprintf(file, "%s", convert);
+
+ convert = formated_buffer;
+ convert = str_replace(convert, "; ", ";\n\t");
+ convert = str_replace(convert, "><", ">\n<");
+ fprintf(file, "%s", convert);
+
+
+ }
+ if (status == 1)
+ {
+ plain_buffer = TCPMON_ENTRY_ARRIVED_DATA(entry, env);
+ if (plain_buffer) /* this can be possible as no xml present */
+ {
+ formated_buffer = tcpmon_util_format_as_xml
+ (env, plain_buffer, format);
+ }
+ else
+ {
+ formated_buffer = "";
+ }
+ /* 2 screen */
+ printf("%s\n", "RETRIEVING DATA..");
+ printf("/* retrieving time = %s*/\n", TCPMON_ENTRY_ARRIVED_TIME(entry, env));
+ printf("/* time throughput = %s*/\n", TCPMON_ENTRY_TIME_DIFF(entry, env));
+ printf("---------------------\n");
+
+ printf("%s\n\n%s\n\n", TCPMON_ENTRY_ARRIVED_HEADERS(entry, env), formated_buffer);
+
+ /* 2 file */
+ fprintf(file, "%s\n", "RETRIEVING DATA..");
+ fprintf(file, "/* retrieving time = %s*/\n", TCPMON_ENTRY_ARRIVED_TIME(entry, env));
+ fprintf(file, "/* time throughput = %s*/\n", TCPMON_ENTRY_TIME_DIFF(entry, env));
+ fprintf(file, "---------------------\n");
+
+ convert = TCPMON_ENTRY_ARRIVED_HEADERS(entry, env);
+ convert = str_replace(convert, "; ", ";\n\t");
+ fprintf(file, "%s", convert);
+
+ convert = formated_buffer;
+ convert = str_replace(convert, "; ", ";\n\t");
+ convert = str_replace(convert, "><", ">\n<");
+ fprintf(file, "%s", convert);
+ }
+
+ fclose(file);
+
+ return 0;
+}
+
+
int on_new_entry(const axutil_env_t *env,
tcpmon_entry_t* entry,
int status)
@@ -173,8 +291,7 @@
printf("/* sending time = %s*/\n", TCPMON_ENTRY_SENT_TIME(entry, env));
printf("---------------------\n");
- printf("%s\n\n%s\n\n", TCPMON_ENTRY_SENT_HEADERS(entry, env),
- formated_buffer);
+ printf("%s\n\n%s\n\n", TCPMON_ENTRY_SENT_HEADERS(entry, env), formated_buffer);
}
if (status == 1)
{
@@ -199,6 +316,8 @@
return 0;
}
+
+
int on_error_func(const axutil_env_t *env,
char* error_message)
{
@@ -207,6 +326,47 @@
}
+
+
+char *str_replace(char *str, const char *search, const char *replace) {
+ int size = strlen(str) * 2;
+ int addmem = size;
+ int diff = strlen(replace)-strlen(search);
+
+ char *str_return = (char *) malloc(size *sizeof(char));
+ char *str_tmp = (char *) malloc(size * sizeof(char));
+ char *str_relic;
+
+ if(str_return == NULL || str_tmp == NULL) {
+ free(str_return);
+ free(str_tmp);
+ return "function str_replace : gimme more memory";
+ }
+
+ strcpy(str_return, str);
+
+ while( (str_relic = strstr(str_return, search)) != NULL) {
+ if( strlen(str_return) + diff >= addmem) {
+ str_return = (char *) realloc(str_return, addmem+=size);
+ str_tmp = (char *) realloc(str_tmp, addmem);
+
+ if(str_return == NULL || str_tmp == NULL) {
+ free(str_return);
+ free(str_tmp);
+ return "function str_replace : gimme more memory";
+ }
+ }
+
+ strcpy(str_tmp, replace);
+ strcat(str_tmp, (str_relic+strlen(search)) );
+ *str_relic = '\0';
+
+ strcat(str_return, str_tmp);
+ }
+
+ free(str_tmp);
+ return(str_return);
+}
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/include/axutil_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/include/axutil_error.h?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/include/axutil_error.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/include/axutil_error.h Thu May 24 23:09:08 2007
@@ -112,7 +112,7 @@
*/
/* Invalid phase found in phase validation*/
AXI2_ERROR_INVALID_PHASE,
- /* axis2.xml cannot be not found*/
+ /* axis2.xml cannot be found */
AXIS2_ERROR_CONFIG_NOT_FOUND,
/* Data element of the OM Node is null */
AXIS2_ERROR_DATA_ELEMENT_IS_NULL,
@@ -557,8 +557,6 @@
*/
AXIS2_ERROR_LAST
};
- /* array to hold error messages */
- const axis2_char_t* axutil_error_messages[AXIS2_ERROR_LAST + 10000];
/**
* \brief Array to hold error messages
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/src/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/src/error.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/src/error.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/src/error.c Thu May 24 23:09:08 2007
@@ -70,7 +70,7 @@
axutil_error_messages[AXI2_ERROR_INVALID_PHASE] =
"Invalid phase found in phase validation*";
axutil_error_messages[AXIS2_ERROR_CONFIG_NOT_FOUND] =
- "axis2.xml cannot be not found";
+ "axis2.xml cannot be found";
axutil_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] =
"Data element of the OM Node is null";
axutil_error_messages[AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT] =
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/src/platforms/windows/thread_mutex_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/src/platforms/windows/thread_mutex_windows.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/src/platforms/windows/thread_mutex_windows.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/src/platforms/windows/thread_mutex_windows.c Thu May 24 23:09:08 2007
@@ -63,7 +63,7 @@
}
else
{
- /*TODO:support critical_section and nested_mutex*/
+ /* TODO :support critical_section and nested_mutex*/
}
return mutex;
@@ -94,7 +94,7 @@
if (mutex->type == thread_mutex_critical_section)
{
- /*TODO:implement trylock for critical section*/
+ /* TODO :implement trylock for critical section*/
}
else
{
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_log.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_log.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_log.c Thu May 24 23:09:08 2007
@@ -59,7 +59,7 @@
void test_axutil_log_write(const axutil_env_t *env)
{
- char msg[10];
+ char msg[32];
printf("\n####start of test_axutil_log_write\n\n");
strcpy(msg, "abcd test123");
printf("\n####end of test_axutil_log_write\n\n");
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_thread.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_thread.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_thread.c Thu May 24 23:09:08 2007
@@ -74,7 +74,7 @@
printf("x = %d \n", ++x);
axutil_thread_mutex_unlock(thread_lock);
- axutil_thread_exit(td, env->allocator);
+ /*axutil_thread_exit(td, env->allocator);*/
return (void*)1;
}
@@ -102,7 +102,6 @@
if (t2) printf("success - test_axutil_thread_create - axutil_thread_create \n");
else printf("failure - test_axutil_thread_create - axutil_thread_create \n");
-
rv = axutil_thread_join(t1);
if (AXIS2_SUCCESS == rv) printf("success - test_axutil_thread_create - axutil_thread_join \n");
@@ -118,7 +117,7 @@
void * AXIS2_CALL test_function2(axutil_thread_t *td, void *param)
{
printf("thread \n");
- axutil_thread_exit(td, env->allocator);
+ /*axutil_thread_exit(td, env->allocator);*/
return (void*)1;
}
@@ -166,7 +165,7 @@
* thread is already detached - should return AXIS2_FAILURE
* cannot join detached threads
*/
- rv = axutil_thread_join(t3);
+ /*rv = axutil_thread_join(t3);*/
if (AXIS2_FAILURE != rv)
{
printf("failure - test_axutil_thread_detach\n");
@@ -212,7 +211,7 @@
* thread is already detached - should return AXIS2_FAILURE
* cannot join detached threads
*/
- rv = axutil_thread_join(t4);
+ /*rv = axutil_thread_join(t4);*/
if (AXIS2_FAILURE != rv)
{
printf("failure - test_axutil_thread_detach2\n");
@@ -246,7 +245,7 @@
#if defined (WIN32)
Sleep(1000);/*to give time for detached threads to execute*/
#else
- sleep(1);
+ sleep(2);
#endif
axutil_thread_mutex_destroy(thread_lock);
Modified: webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_util.c?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_util.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/util/test/util/test_util.c Thu May 24 23:09:08 2007
@@ -114,7 +114,8 @@
axis2_char_t *filename = NULL;
axutil_allocator_t *allocator = axutil_allocator_init(NULL);
axutil_error_t *error = axutil_error_create(allocator);
- const axutil_env_t *env = axutil_env_create_with_error(allocator, error);
+ axutil_log_t *log = axutil_log_create(allocator, NULL, NULL);
+ const axutil_env_t *env = axutil_env_create_with_error_log(allocator, error, log);
axis2_char_t *pathname = axutil_strdup(env, "/tmp/test/");
@@ -262,10 +263,10 @@
test_array_list(env);
test_uuid_gen(env);
run_test_log();
+ run_test_string(env);
test_axutil_dir_handler_list_service_or_module_dirs();
axutil_allocator_t *allocator = env->allocator;
/* axutil_env_free(env);*/
axutil_allocator_free(allocator);
- run_test_string(env);
return 0;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/archived_news.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/archived_news.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/archived_news.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/archived_news.html Thu May 24 23:09:08 2007
@@ -4,7 +4,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
- <title>Apache Axis2/C Archived News</title>
+ <title>Archived News</title>
<meta name="generator" content="amaya 9.2.1, see http://www.w3.org/Amaya/"
/>
</head>
@@ -30,7 +30,7 @@
<li><a href="#M0.2">Milestone version 0.2 - 08th December 2005</a></li>
<li><a href="#M0.1">Milestone version 0.1 - 25th November 2005</a></li>
</ul>
-<a></a>
+<a id="0.96"></a>
<h3>22nd December 2006 Axis2/C Version 0.96 Released</h3>
<a href="download.cgi">Download 0.96</a>
@@ -96,7 +96,7 @@
<li>Fix further memory leaks</li>
<li>Create a comprehensive functional test framework</li>
</ol>
-<a></a>
+<a id="0.95"></a>
<h3>26th October 2006 Axis2/C Version 0.95 Released</h3>
<a href="download.cgi">Download 0.95</a>
@@ -158,7 +158,7 @@
<li>Fix further memory leaks</li>
<li>Create a comprehensive functional test framework</li>
</ol>
-<a></a>
+<a id="0.94"></a>
<h3>3rd October 2006 Axis2/C Version 0.94 Released</h3>
<a href="download.cgi">Download 0.94</a>
@@ -224,7 +224,7 @@
<li>Fix further memory leaks</li>
<li>Create a comprehensive functional test framework</li>
</ol>
-<a></a>
+<a id="0.93"></a>
<h3>31st August 2006 Axis2/C Version 0.93 Released</h3>
<a href="download.cgi">Download 0.93</a>
@@ -289,7 +289,7 @@
<li>Put in place a comprehensive functional test framework</li>
<li>WSDL2C tool</li>
</ol>
-<a></a>
+<a id="0.92"></a>
<h3>16th June 2006 Axis2/C Version 0.92 Released</h3>
<a href="download.cgi">Download 0.92</a>
@@ -363,7 +363,7 @@
<li>C2WSDL</li>
<li>WSDL2C</li>
</ol>
-<a></a>
+<a id="0.91"></a>
<h3>15th May 2006 Axis2/C Version 0.91 Released</h3>
@@ -433,7 +433,7 @@
<li>REST (REpresentational State Transfer) support (GET case)</li>
<li>Web Services policy support</li>
</ol>
-<a></a>
+<a id="0.90"></a>
<h3>31st March 2006 Axis2/C Version 0.90 Released</h3>
<a href="download.cgi">Download 0.90</a>
@@ -506,7 +506,7 @@
<li>Web Services policy support</li>
<li>Axis2 Web application (Web App)</li>
</ol>
-<a></a>
+<a id="M0.5"></a>
<h3>10th March 2006 Axis2/C Milestone 0.5 Released</h3>
<a href="download.cgi">Download M-0.5</a>
@@ -555,7 +555,7 @@
<li>Axis Data Binding - ADB (Framework and Schema Compiler)</li>
<li>REST (REpresentational State Transfer) Support</li>
</ol>
-<a></a>
+<a id="M0.4"></a>
<h3>17th February 2006 Axis2/C Milestone 0.4 Released</h3>
@@ -577,7 +577,7 @@
<p>5. Improved logging mechanism</p>
<p>6. Ability to build and run on Windows platform</p>
-<a></a>
+<a id="M0.3"></a>
<h3>02nd February 2006 Axis2/C Milestone 0.3 Released</h3>
@@ -590,7 +590,7 @@
<h4>Key Features</h4>
<p>1. Core engine in place with deployment, description, and context
-hiarachies and HTTP transport support.</p>
+hierarchies and HTTP transport support.</p>
<p>2. SOAP processing support</p>
@@ -599,7 +599,7 @@
<p>4. Client API implementation</p>
<p>5. Couple of working service and client samples</p>
-<a></a>
+<a id="M0.2"></a>
<h3>08th December 2005 Axis2/C Milestone 0.2 Released</h3>
@@ -617,7 +617,7 @@
<p>4. Some test cases for PHP binding</p>
<p>5. Many memory leak fixes</p>
-<a></a>
+<a id="M0.1"></a>
<h3>25th November 2005 Axis2/C Milestone 0.1 Released</h3>
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/coding_conventions.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/coding_conventions.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/coding_conventions.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/coding_conventions.html Thu May 24 23:09:08 2007
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="">
- <title>Axis2/C Coding Conventions</title>
+ <title>Coding Conventions</title>
</head>
<body>
@@ -47,7 +47,8 @@
<li>If it is a local variable or a member of a struct, there's no need to
prefix it with <code>axis2_</code></li>
e.g.</ul>
-<pre>int count = 0;<br>char *prefix = NULL;<br></pre>
+<pre>int count = 0;
+char *prefix = NULL;</pre>
<a name="1.2_Functions_"></a>
<h3>1.2 Functions</h3>
@@ -55,27 +56,34 @@
<li>Function names should always start with the prefix <code>axis2_</code>
except for members of a struct.</li>
e.g.</ul>
-<pre>axis2_om_node_t * axis2_om_node_create(axis2_environment_t *environment);</pre>
+<pre>axis2_engine_t * axis2_engine_create(axutil_env_t *environment);</pre>
<a name="1.3_Structures_and_user_defined_data"></a>
<h3>1.3 Structures and User Defined Data Types</h3>
<ul>
<li>Note the _t suffix in the type name.</li>
e.g.</ul>
-<pre>typedef struct axis2_om_namespace {<br> char *uri;<br> char *prefix;<br>} axis2_om_namespace_t;<br></pre>
+<pre>typedef struct axis2_endpoint_ref {
+ axis2_char_t *address;
+} axis2_endpoint_ref_t;</pre>
<a name="1.4_Macros"></a>
<h3>1.4 Macros</h3>
<ul>
<li>Macro names should be in all uppercase letters.</li>
e.g.</ul>
-<pre>#define AXIS2_H<br><br>#define AXIS2_ERROR_GET_MESSAGE(error) ((error)->ops->get_message(error))<br></pre>
+<pre>#define AXIS2_H
+#define AXIS2_ERROR_GET_MESSAGE(error) ((error)->ops->get_message(error))
+</pre>
<a name="1.5_Enumerations"></a>
<h3>1.5 Enumerations</h3>
<ul>
e.g.</ul>
-<pre>typedef enum axis2_status_codes {<br> AXIS2_FAILURE = 0,<br> AXIS2_SUCCESS<br>} axis2_status_codes_t;<br></pre>
+<pre>typedef enum axis2_status_codes {
+ AXIS2_FAILURE = 0,
+ AXIS2_SUCCESS
+} axis2_status_codes_t;</pre>
<a name="2_Indentation"></a>
<h2>2. Indentation and Formatting</h2>
@@ -119,18 +127,14 @@
formatting tool, but nevertheless should be followed.
<ul>
<li>Checking pointer validity:
- <pre> if (foo)
- </pre>
+ <pre> if (foo)</pre>
and NOT
- <pre> if (foo != NULL)
- </pre>
+ <pre> if (foo != NULL)</pre>
</li>
<li>Checking equality:
- <pre> if (foo == 7)
- </pre>
+ <pre> if (foo == 7)</pre>
and NOT
- <pre> if (7 == foo)
- </pre>
+ <pre> if (7 == foo)</pre>
</li>
</ul>
</ul>
@@ -147,7 +151,7 @@
<h2>4. Function Parameters and Return Value Conventions</h2>
<ul>
Each function should be passed a pointer to an instance of the
- <code>axis2_environment_t</code> struct as the first parameter. If the
+ <code>axutil_env_t</code> struct as the first parameter. If the
function is tightly bound to a struct, the second parameter is a pointer to
an instance of that struct.</ul>
<ul>
@@ -167,6 +171,9 @@
It is preferable to include header files in the following fashion:</ul>
<ul>
</ul>
-<pre><standard header files><br><other system headers><br>"local header files"<br></pre>
+<pre><standard header files>
+<other system headers>
+"local header files"</pre>
+
</body>
</html>
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/architecture_notes.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/architecture_notes.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/architecture_notes.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/architecture_notes.html Thu May 24 23:09:08 2007
@@ -7,7 +7,7 @@
<meta content="text/html; charset=iso-8859-1">
<meta content="text/html; charset=iso-8859-1">
<meta content="text/html; charset=iso-8859-1" http-equiv="content-type">
- <title>Apache Axis2/C Architecture Notes</title>
+ <title>Architecture Notes</title>
</head>
<body lang="en">
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/axis2c_manual.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/axis2c_manual.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/axis2c_manual.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/axis2c_manual.html Thu May 24 23:09:08 2007
@@ -1,6 +1,6 @@
<html>
<head>
- <title>Apache Axis2/C Manual</title>
+ <title>Manual</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
@@ -1169,43 +1169,40 @@
usually placed in the AXIS2C_INSTALL_DIR/logs folder.</li>
</ul>
-<h1><a name="IIS">12. Deploying with Microsoft IIS Server</a></h1>
+<a name="IIS"></a>
+<h1>12. Deploying with Microsoft IIS Server</h1>
<p>Use the Axis2/C VC project or makefile to buid the
component.</a></p>
-<p><a name="ssl_client">In this document I assume that the mod_axis2_IIS.dll
-is in the directory </a><a name="ssl_client1"
-id="ssl_client1"><code>c:\axis2c\lib\mod_axis2_IIS.dll</code> and axis2c_home
-is <code>c:\axis2c</code></a></p>
-
-<p><a name="ssl_client2" id="ssl_client2">Add the following key to the
-registery.</a></p>
-
-<p><a name="ssl_client">HKEY_LOCAL_MACHINE\SOFTWARE\Apache Axis2c\IIS ISAPI
-Redirector</a></p>
-
-<p><a name="ssl_client">Add a string value with the name axis2c_home and a
-value of c:\axis2c</a></p>
-
-<p><a name="ssl_client">Add a string value with the name log_file and a value
-of c:\axis2c\logs\axis2.log</a></p>
-
-<p><a name="ssl_client">Add a string value with the name log_level. The value
-can be either trace, error, info, critical, debug, or warning.</a></p>
-
-<p><a name="ssl_client">Using the IIS management console, add a new virtual
-directory to your IIS/PWS web site. </a><a name="ssl_client3"
-id="ssl_client3">The name of the virtual directory must be axis2. Its
-physical path should be the directory </a><a name="ssl_client4"
-id="ssl_client4">in which you placed mod_axis2_IIS.dll (in our example it is
-c:\axis2c\lib). When creating this new </a><a name="ssl_client5"
-id="ssl_client5">virtual directory, assign execute access to it.</a></p>
+<p>In this document I assume that the mod_axis2_IIS.dll
+is in the directory <code>c:\axis2c\lib\mod_axis2_IIS.dll</code> and axis2c_home
+is <code>c:\axis2c</code></p>
-<p><a name="ssl_client">By using the IIS management console, add
+<p>Add the following key to the
+registery.</p>
+
+<p>HKEY_LOCAL_MACHINE\SOFTWARE\Apache Axis2c\IIS ISAPI
+Redirector</p>
+
+<p>Add a string value with the name axis2c_home and a
+value of c:\axis2c</p>
+
+<p>Add a string value with the name log_file and a value
+of c:\axis2c\logs\axis2.log</p>
+
+<p>Add a string value with the name log_level. The value
+can be either trace, error, info, critical, debug, or warning.</p>
+
+<p>Using the IIS management console, add a new virtual
+directory to your IIS/PWS web site. The name of the virtual directory must be axis2. Its
+physical path should be the directory in which you placed mod_axis2_IIS.dll (in our example it is
+c:\axis2c\lib). When creating this new virtual directory, assign execute access to it.</p>
+
+<p>By using the IIS management console, add
mod_axis2_IIS.dll as a filter in your IIS/PWS web site and restart the IIS
-admin service.</a></p>
+admin service.</p>
-<p><a name="ssl_client"></a></p>
+<a name="ssl_client"></a>
<h1>13. Using SSL Client</h1>
<h2>Building and Configuring the Client</h2>
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/index.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/index.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/index.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/index.html Thu May 24 23:09:08 2007
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
- <title>Apache Axis2/C Documentation</title>
+ <title>Documentation</title>
<meta name="generator" content="amaya 9.2.1, see http://www.w3.org/Amaya/"
/>
</head>
Modified: webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/installationguide.html
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/installationguide.html?view=diff&rev=541560&r1=541559&r2=541560
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/installationguide.html (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/xdocs/docs/installationguide.html Thu May 24 23:09:08 2007
@@ -5,7 +5,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
- <title>Apache Axis2/C Installation Guide</title>
+ <title>Installation Guide</title>
</head>
<body>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org