You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2007/01/24 06:44:16 UTC
svn commit: r499268 [1/2] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/parser/libxml2/ axiom/test/om/ include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engi...
Author: samisa
Date: Tue Jan 23 21:44:07 2007
New Revision: 499268
URL: http://svn.apache.org/viewvc?view=rev&rev=499268
Log:
Fixed loads of stuff.
1. Removeduse of qnames where it can be done with other more efficient means
2. Removed hash and replaced with array where it would be possible and more efficient to use arryas
3. Removed unwated buffer duplication in xml writer
4. Removed unwanted namespace declaration checking in libxml writer wrapper
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
webservices/axis2/trunk/c/axiom/src/om/om_node.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
webservices/axis2/trunk/c/axiom/test/om/test_om.c
webservices/axis2/trunk/c/include/axis2_addr_mod.h
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/include/axis2_const.h
webservices/axis2/trunk/c/include/axis2_disp.h
webservices/axis2/trunk/c/include/axis2_disp_checker.h
webservices/axis2/trunk/c/include/axis2_handler.h
webservices/axis2/trunk/c/include/axis2_handler_desc.h
webservices/axis2/trunk/c/include/axis2_http_simple_request.h
webservices/axis2/trunk/c/include/axis2_listener_manager.h
webservices/axis2/trunk/c/include/axis2_msg_ctx.h
webservices/axis2/trunk/c/include/axis2_options.h
webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/options.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
webservices/axis2/trunk/c/modules/core/engine/disp.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/handler.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
webservices/axis2/trunk/c/modules/mod_log/mod_log.h
webservices/axis2/trunk/c/samples/client/math/math_client.c
webservices/axis2/trunk/c/util/include/axis2_string.h
webservices/axis2/trunk/c/util/src/string.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h Tue Jan 23 21:44:07 2007
@@ -434,6 +434,10 @@
get_xml)(axiom_xml_writer_t *writer,
const axis2_env_t *env);
+ unsigned int(AXIS2_CALL *
+ get_xml_size)(axiom_xml_writer_t *writer,
+ const axis2_env_t *env);
+
int(AXIS2_CALL *
get_type)(axiom_xml_writer_t *writer,
const axis2_env_t *env);
@@ -579,6 +583,9 @@
#define AXIOM_XML_WRITER_GET_XML(writer, env) \
((writer)->ops->get_xml(writer, env))
+
+#define AXIOM_XML_WRITER_GET_XML_SIZE(writer, env) \
+ ((writer)->ops->get_xml_size(writer, env))
#define AXIOM_XML_WRITER_GET_TYPE(writer, env) \
((writer)->ops->get_type(writer, env))
Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Tue Jan 23 21:44:07 2007
@@ -708,7 +708,7 @@
status = AXIOM_NODE_SERIALIZE(om_node, env, om_output);
if (status == AXIS2_SUCCESS)
{
- xml = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+ xml = axis2_strdup((axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env), env);
}
AXIOM_OUTPUT_FREE(om_output, env);
return xml;
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Tue Jan 23 21:44:07 2007
@@ -277,6 +277,11 @@
axiom_xml_writer_t *writer,
const axis2_env_t *env);
+unsigned int AXIS2_CALL
+axis2_libxml2_writer_wrapper_get_xml_size(
+ axiom_xml_writer_t *writer,
+ const axis2_env_t *env);
+
int AXIS2_CALL
axis2_libxml2_writer_wrapper_get_type(
axiom_xml_writer_t *writer,
@@ -289,10 +294,10 @@
axis2_char_t *content);
/*********************** static functions ************************************/
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_pop_context(
axiom_xml_writer_t *writer,
- const axis2_env_t *env);
+ const axis2_env_t *env);*/
static axis2_status_t
axis2_libxml2_writer_wrapper_push(
@@ -320,11 +325,11 @@
const axis2_char_t *real_prefix,
const axis2_char_t *key);
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_push_context(
axiom_xml_writer_t *writer,
const axis2_env_t *env);
-
+*/
/*static axis2_char_t *
create_key_from_uri_prefix(
const axis2_env_t *env,
@@ -338,10 +343,11 @@
const axis2_char_t *prefix,
axis2_char_t *array);
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_set_default_lang_namespace(
axiom_xml_writer_t *writer,
const axis2_env_t *env);
+*/
static axis2_char_t*
axis2_libxml2_writer_wrapper_find_prefix(
@@ -418,7 +424,7 @@
return NULL;
}
- writer_impl->stack = axis2_stack_create(env);
+ /*writer_impl->stack = axis2_stack_create(env);
if (!(writer_impl->stack))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
@@ -426,9 +432,9 @@
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }*/
- axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env);
+ /*axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env);*/
writer_impl->writer.ops = (axiom_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator,
sizeof(axiom_xml_writer_ops_t));
@@ -532,7 +538,7 @@
return NULL;
}
- axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env);
+ /*axis2_libxml2_writer_wrapper_set_default_lang_namespace(&(writer_impl->writer), env);*/
writer_impl->writer.ops = (axiom_xml_writer_ops_t*)AXIS2_MALLOC(env->allocator,
sizeof(axiom_xml_writer_ops_t));
@@ -612,6 +618,8 @@
axis2_libxml2_writer_wrapper_write_encoded;
writer->ops->get_xml =
axis2_libxml2_writer_wrapper_get_xml;
+ writer->ops->get_xml_size =
+ axis2_libxml2_writer_wrapper_get_xml_size;
writer->ops->get_type =
axis2_libxml2_writer_wrapper_get_type;
writer->ops->write_raw =
@@ -679,7 +687,7 @@
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- axis2_libxml2_writer_wrapper_push_context(writer, env);
+ /*axis2_libxml2_writer_wrapper_push_context(writer, env);*/
writer_impl->in_start_element = AXIS2_TRUE;
status = xmlTextWriterStartElement(writer_impl->xml_writer, (xmlChar *)localname);
@@ -710,7 +718,7 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t declared = AXIS2_FALSE;
+ /*axis2_bool_t declared = AXIS2_FALSE;*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -718,17 +726,17 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- axis2_libxml2_writer_wrapper_push_context(writer, env);
- declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
+ /*axis2_libxml2_writer_wrapper_push_context(writer, env);*/
+ /*declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
if (declared == AXIS2_FALSE)
- {
+ {*/
/** this should be the case all the time */
- axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, NULL);
+ /* axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, NULL);
writer_impl->in_start_element = AXIS2_TRUE;
- }
+ }*/
status = xmlTextWriterStartElementNS(writer_impl->xml_writer
- , NULL, BAD_CAST localname, BAD_CAST namespace_uri);
+ , NULL, BAD_CAST localname, NULL);
if (status < 0)
{
@@ -749,8 +757,8 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t is_declared = AXIS2_FALSE;
- axis2_char_t key[1024];
+ /*axis2_bool_t is_declared = AXIS2_FALSE;*/
+ /*axis2_char_t key[1024];*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -759,20 +767,20 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- axis2_libxml2_writer_wrapper_push_context(writer, env);
+ /*axis2_libxml2_writer_wrapper_push_context(writer, env);*/
writer_impl->in_start_element = AXIS2_TRUE;
- create_key_from_uri_prefix(env, namespace_uri, prefix, key);
+ /*create_key_from_uri_prefix(env, namespace_uri, prefix, key);
- is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
+ is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);*/
- if (is_declared == AXIS2_TRUE)
- {
+ /*if (is_declared == AXIS2_TRUE)
+ {*/
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
BAD_CAST prefix,
BAD_CAST localname,
BAD_CAST NULL);
- }
+ /*}
else
{
axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, prefix);
@@ -783,7 +791,7 @@
BAD_CAST namespace_uri);
- }
+ }*/
if (status < 0)
{
AXIS2_ERROR_SET(env->error,
@@ -866,8 +874,8 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t is_declared = AXIS2_FALSE;
- axis2_char_t key[1024];
+ /*axis2_bool_t is_declared = AXIS2_FALSE;*/
+ /*axis2_char_t key[1024];*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE);
@@ -875,24 +883,24 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- create_key_from_uri_prefix(env, namespace_uri, prefix, key);
+ /*create_key_from_uri_prefix(env, namespace_uri, prefix, key);
is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
if (is_declared == AXIS2_TRUE)
- {
+ {*/
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
BAD_CAST prefix,
BAD_CAST localname,
BAD_CAST NULL);
- }
+ /*}
else
{
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
BAD_CAST prefix,
BAD_CAST localname,
BAD_CAST namespace_uri);
- }
+ }*/
if (status < 0)
{
AXIS2_ERROR_SET(env->error,
@@ -920,7 +928,7 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- axis2_libxml2_writer_wrapper_pop_context(writer, env);
+ /*axis2_libxml2_writer_wrapper_pop_context(writer, env);*/
writer_impl->in_start_element = AXIS2_FALSE;
@@ -992,7 +1000,7 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t exists = AXIS2_FALSE;
+ /*axis2_bool_t exists = AXIS2_FALSE;*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE);
@@ -1002,14 +1010,14 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- exists = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
+ /*exists = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
if (exists == AXIS2_TRUE)
- {
+ {*/
status = xmlTextWriterWriteAttributeNS(writer_impl->xml_writer,
NULL, BAD_CAST localname, BAD_CAST NULL,
BAD_CAST value);
- }
+ /*}
else
{
axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, NULL);
@@ -1017,7 +1025,7 @@
status = xmlTextWriterWriteAttributeNS(writer_impl->xml_writer,
NULL, BAD_CAST localname, BAD_CAST namespace_uri,
BAD_CAST value);
- }
+ }*/
if (status < 0)
{
AXIS2_ERROR_SET(env->error,
@@ -1039,8 +1047,8 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t is_declared = AXIS2_FALSE;
- axis2_char_t key[1024];
+ /*axis2_bool_t is_declared = AXIS2_FALSE;*/
+ /*axis2_char_t key[1024];*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -1052,16 +1060,16 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- create_key_from_uri_prefix(env, namespace_uri, prefix, key);
+ /*create_key_from_uri_prefix(env, namespace_uri, prefix, key);
is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
if (is_declared == AXIS2_TRUE)
- {
+ {*/
status = xmlTextWriterWriteAttributeNS(writer_impl->xml_writer,
BAD_CAST prefix , BAD_CAST localname,
BAD_CAST NULL , BAD_CAST value);
- }
+ /*}
else
{
axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, prefix);
@@ -1070,7 +1078,7 @@
BAD_CAST prefix , BAD_CAST localname,
BAD_CAST namespace_uri , BAD_CAST value);
- }
+ }*/
if (status < 0)
{
AXIS2_ERROR_SET(env->error,
@@ -1090,8 +1098,8 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- int is_declared = AXIS2_FALSE;
- axis2_char_t key[1024];
+ /*int is_declared = AXIS2_FALSE;*/
+ /*axis2_char_t key[1024];*/
char *xmlnsprefix = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1099,7 +1107,7 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- create_key_from_uri_prefix(env, namespace_uri, prefix, key);
+ /*create_key_from_uri_prefix(env, namespace_uri, prefix, key);
is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
@@ -1110,7 +1118,7 @@
}
else
{
- axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, prefix);
+ axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, prefix);*/
if (prefix && (AXIS2_STRCMP(prefix, "") != 0))
{
@@ -1128,7 +1136,7 @@
AXIS2_FREE(env->allocator, xmlnsprefix);
xmlnsprefix = NULL;
- }
+ /*}*/
if (status < 0)
{
AXIS2_ERROR_SET(env->error,
@@ -1150,20 +1158,20 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- axis2_bool_t is_declared = AXIS2_FALSE;
+ /*axis2_bool_t is_declared = AXIS2_FALSE;*/
axis2_char_t *xmlns = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE)
- is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
+ /*is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, namespace_uri);
if (is_declared == AXIS2_TRUE)
- {
+ {*/
/* namespace already declared , nothing to do */
- return AXIS2_SUCCESS;
+ /* return AXIS2_SUCCESS;
}
axis2_libxml2_writer_wrapper_push(writer, env, namespace_uri, NULL);
-
+*/
xmlns = AXIS2_MALLOC(env->allocator,
sizeof(axis2_char_t) * (strlen("xmlns") + 1));
sprintf(xmlns, "xmlns");
@@ -1493,10 +1501,10 @@
*/
if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
{
- axis2_char_t *output = NULL;
+ /*axis2_char_t *output = NULL;*/
int output_bytes = 0;
output_bytes = xmlTextWriterFlush(writer_impl->xml_writer);
- if (writer_impl->buffer)
+ /*if (writer_impl->buffer)
{
output = AXIS2_MALLOC(env->allocator,
sizeof(axis2_char_t) * (
@@ -1505,7 +1513,8 @@
output[writer_impl->buffer->size] = '\0';
}
- return (void*)output;
+ return (void*)output;*/
+ return writer_impl->buffer->content;
}
else if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_DOC)
{
@@ -1519,6 +1528,23 @@
return NULL;
}
+unsigned int AXIS2_CALL
+axis2_libxml2_writer_wrapper_get_xml_size(axiom_xml_writer_t *writer,
+ const axis2_env_t *env)
+{
+ axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
+ writer_impl = AXIS2_INTF_TO_IMPL(writer);
+
+ if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
+ {
+ return writer_impl->buffer->use;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
int AXIS2_CALL
axis2_libxml2_writer_wrapper_get_type(axiom_xml_writer_t *writer,
const axis2_env_t *env)
@@ -1529,7 +1555,7 @@
return writer_impl->writer_type;
}
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_pop_context(axiom_xml_writer_t *writer,
const axis2_env_t *env)
{
@@ -1559,7 +1585,7 @@
AXIS2_HASH_KEY_STRING);
if (val)
{
- /** this namespace uri and prefix should be removed*/
+ // this namespace uri and prefix should be removed
axis2_hash_set(writer_impl->uri_prefix_map, ele->key,
AXIS2_HASH_KEY_STRING, NULL);
}
@@ -1570,7 +1596,7 @@
AXIS2_ARRAY_LIST_FREE(ns_list, env);
ns_list = NULL;
return AXIS2_SUCCESS;
-}
+}*/
static axis2_status_t
axis2_libxml2_writer_wrapper_push(axiom_xml_writer_t *writer,
@@ -1718,7 +1744,7 @@
return up_element;
}
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_push_context(axiom_xml_writer_t *writer,
const axis2_env_t *env)
{
@@ -1736,7 +1762,8 @@
}
}
return AXIS2_FAILURE;
-}
+}*/
+
static void
create_key_from_uri_prefix(const axis2_env_t *env,
const axis2_char_t *uri,
@@ -1748,7 +1775,7 @@
sprintf(array, "%s%s%s", uri, "|", prefix);
}
-static axis2_status_t
+/*static axis2_status_t
axis2_libxml2_writer_wrapper_set_default_lang_namespace(
axiom_xml_writer_t *writer,
const axis2_env_t *env)
@@ -1772,7 +1799,7 @@
AXIS2_HASH_KEY_STRING, AXIS2_XMLNS_PREFIX);
}
return AXIS2_SUCCESS;
-}
+}*/
static axis2_char_t*
axis2_libxml2_writer_wrapper_find_prefix(
Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Tue Jan 23 21:44:07 2007
@@ -70,6 +70,9 @@
axiom_xml_reader_t *reader = NULL;
axiom_xml_writer_t *writer = NULL;
char *buffer = NULL;
+
+ printf("\nstart test_om_build\n");
+
f = fopen(filename, "r");
if (!f)
return -1;
@@ -182,7 +185,7 @@
AXIOM_STAX_BUILDER_FREE(builder, environment);
if (buffer)
AXIS2_FREE(environment->allocator, buffer);
- printf("\ndone\n");
+ printf("\nend test_om_build\n");
fclose(f);
return 0;
}
@@ -218,6 +221,8 @@
axiom_output_t *om_output = NULL;
axiom_xml_writer_t *writer = NULL;
axis2_char_t *output_buffer = NULL;
+
+ printf("\nstart test_om_serialize\n");
ns1 =
axiom_namespace_create(environment,
@@ -283,8 +288,8 @@
printf("%s", output_buffer);
AXIS2_FREE(environment->allocator, output_buffer);
}
- printf("\nDONE\n");
+ printf("\nend test_om_serialize\n");
return 0;
}
Modified: webservices/axis2/trunk/c/include/axis2_addr_mod.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_addr_mod.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_addr_mod.h (original)
+++ webservices/axis2/trunk/c/include/axis2_addr_mod.h Tue Jan 23 21:44:07 2007
@@ -32,11 +32,11 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axis2_addr_in_handler_create(const axis2_env_t *env,
- axis2_qname_t *qname);
+ axis2_string_t *name);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axis2_addr_out_handler_create(const axis2_env_t *env,
- axis2_qname_t *qname);
+ axis2_string_t *name);
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Tue Jan 23 21:44:07 2007
@@ -230,7 +230,7 @@
get_transport_in)(
const axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Adds a transport in description.
@@ -244,7 +244,8 @@
add_transport_in)(
axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_transport_in_desc_t *transport);
+ axis2_transport_in_desc_t *transport,
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Gets out transport corresponding to the given transport QName.
@@ -258,7 +259,7 @@
get_transport_out)(
const axis2_conf_t *conf,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Adds a transport out description.
@@ -272,7 +273,8 @@
add_transport_out)(
axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_transport_out_desc_t *transport);
+ axis2_transport_out_desc_t *transport,
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Gets all in transports.
@@ -281,7 +283,7 @@
* @return hash table containing all transport in descriptions.
* Returns a reference, not a cloned copy
*/
- axis2_hash_t *(AXIS2_CALL *
+ axis2_transport_in_desc_t **(AXIS2_CALL *
get_all_in_transports)(
const axis2_conf_t *conf,
const axis2_env_t *env);
@@ -293,7 +295,7 @@
* @return hash table containing all transport out descriptions.
* Returns a reference, not a cloned copy
*/
- axis2_hash_t *(AXIS2_CALL *
+ axis2_transport_out_desc_t **(AXIS2_CALL *
get_all_out_transports)(
const axis2_conf_t *conf,
const axis2_env_t *env);
@@ -788,8 +790,8 @@
/** Adds a transport in.
@sa axis2_conf_ops#add_transport_in */
-#define AXIS2_CONF_ADD_TRANSPORT_IN(conf, env, transport) \
- ((conf)->ops->add_transport_in(conf , env, transport))
+#define AXIS2_CONF_ADD_TRANSPORT_IN(conf, env, transport, trans_enum) \
+ ((conf)->ops->add_transport_in(conf , env, transport, trans_enum))
/** Gets transport out description with given QName.
@sa axis2_conf_ops#get_transport_out */
@@ -798,18 +800,8 @@
/** Adds a transport out.
@sa axis2_conf_ops#add_transport_out */
-#define AXIS2_CONF_ADD_TRANSPORT_OUT(conf, env, transport) \
- ((conf)->ops->add_transport_out(conf , env, transport))
-
-/** Gets all the in transports.
- @sa axis2_conf_ops#get_all_in_transports */
-#define AXIS2_CONF_GET_ALL_IN_TRANSPORTS(conf, env) \
- ((conf)->ops->get_all_in_transports(conf , env))
-
-/** Gets all the out transport.
- @sa axis2_conf_ops#get_all_out_transports */
-#define AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(conf, env) \
- ((conf)->ops->get_all_out_transports(conf , env))
+#define AXIS2_CONF_ADD_TRANSPORT_OUT(conf, env, transport, trans_enum) \
+ ((conf)->ops->add_transport_out(conf , env, transport, trans_enum))
/** Gets the named module.
@sa axis2_conf_ops#get_module */
@@ -961,6 +953,15 @@
#define AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(conf, env, mod_name, mod_ver)\
((conf)->ops->engage_module_with_version(conf, env, mod_name, mod_ver))
+/** Gets all the in transports.
+ @sa axis2_conf_ops#get_all_in_transports */
+#define AXIS2_CONF_GET_ALL_IN_TRANSPORTS(conf, env) \
+ ((conf)->ops->get_all_in_transports(conf , env))
+
+/** Gets all the out transports.
+ @sa axis2_conf_ops#get_all_out_transports */
+#define AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(conf, env) \
+ ((conf)->ops->get_all_out_transports(conf , env))
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Tue Jan 23 21:44:07 2007
@@ -108,22 +108,21 @@
#define AXIS2_SESSION_CONTEXT_PROPERTY "SessionContext"
/**
- * Field TRANSPORT_TCP
- */
-#define AXIS2_TRANSPORT_TCP "tcp"
-
-/**
- * Field TRANSPORT_HTTP
+ * TRANSPORT constants
*/
#define AXIS2_TRANSPORT_HTTP "http"
+#define AXIS2_TRANSPORT_SMTP "smtp"
+#define AXIS2_TRANSPORT_TCP "tcp"
+#define AXIS2_TRANSPORT_XMPP "xmpp"
-
-
-#define AXIS2_TRANSPORT_MAIL "mail"
-
-#define AXIS2_TRANSPORT_JMS "jms"
-
-#define AXIS2_TRANSPORT_LOCAL "local"
+typedef enum
+{
+ AXIS2_TRANSPORT_ENUM_HTTP = 0,
+ AXIS2_TRANSPORT_ENUM_SMTP,
+ AXIS2_TRANSPORT_ENUM_TCP,
+ AXIS2_TRANSPORT_ENUM_XMPP,
+ AXIS2_TRANSPORT_ENUM_MAX
+} AXIS2_TRANSPORT_ENUMS;
/**
* Field LISTSERVICES
Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Tue Jan 23 21:44:07 2007
@@ -36,7 +36,7 @@
*/
#include <axis2_defines.h>
-#include <axis2_qname.h>
+#include <axis2_string.h>
#include <axis2_handler.h>
#include <axis2_svc.h>
@@ -71,30 +71,30 @@
const axis2_env_t *env);
/**
- * Gets the qname of the dispatcher.
+ * Gets the name of the dispatcher.
* @param disp pointer to dispatcher
* @param env pointer to environment struct
- * @return pointer to qname. Returns a reference, not a
+ * @return pointer to name. Returns a reference, not a
* cloned copy
*/
- axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ axis2_string_t *(AXIS2_CALL *
+ get_name)(
const axis2_disp_t *disp,
const axis2_env_t *env);
/**
- * Sets the qname of the dispatcher.
+ * Sets the name of the dispatcher.
* @param disp pointer to dispatcher
* @param env pointer to environment struct
- * @param qname pointer to qname, dispatcher assumes ownership of the
- * qname struct
+ * @param name pointer to name, dispatcher assumes ownership of the
+ * name struct
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_qname)(
+ set_name)(
axis2_disp_t *disp,
const axis2_env_t *env,
- axis2_qname_t *qname);
+ axis2_string_t *name);
/**
* Frees dispatcher struct.
@@ -152,13 +152,13 @@
/**
* Creates a dispatcher struct instance.
* @param env pointer to environment struct
- * @param qname pointer to QName. QName is cloned by create method.
+ * @param name pointer to QName. QName is cloned by create method.
* @return pointer to newly created dispatcher
*/
AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
axis2_disp_create(
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const axis2_string_t *name);
/**
* Invokes the dispatcher.
@@ -221,14 +221,14 @@
((disp)->ops->get_base(disp, env))
/** Gets QName.
- @sa axis2_disp_ops#get_qname */
-#define AXIS2_DISP_GET_QNAME(disp, env) \
- ((disp)->ops->get_qname(disp, env))
+ @sa axis2_disp_ops#get_name */
+#define AXIS2_DISP_GET_NAME(disp, env) \
+ ((disp)->ops->get_name(disp, env))
/** Sets QName.
- @sa axis2_disp_ops#set_qname */
+ @sa axis2_disp_ops#set_name */
#define AXIS2_DISP_SET_QNAME(disp, env, name) \
- ((disp)->ops->set_qname(disp, env, name))
+ ((disp)->ops->set_name(disp, env, name))
/** Frees dispatcher.
@sa axis2_disp_ops#free */
Modified: webservices/axis2/trunk/c/include/axis2_disp_checker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp_checker.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp_checker.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp_checker.h Tue Jan 23 21:44:07 2007
@@ -30,7 +30,7 @@
*/
#include <axis2_defines.h>
-#include <axis2_qname.h>
+#include <axis2_string.h>
#include <axis2_handler.h>
#ifdef __cplusplus
@@ -68,8 +68,8 @@
* @return returns a pointer to the QName, returns a reference not a
* cloned copy
*/
- axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ axis2_string_t *(AXIS2_CALL *
+ get_name)(
const axis2_disp_checker_t *disp_checker,
const axis2_env_t *env);
@@ -77,14 +77,14 @@
* Sets QName.
* @param disp_checker pointer to dispatcher checker
* @param env pointer to environment struct
- * @param qname pointer to QName. A clone would be created within the method
+ * @param name pointer to QName. A clone would be created within the method
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_qname)(
+ set_name)(
axis2_disp_checker_t *disp_checker,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const axis2_string_t *name);
/**
* Frees dispatcher checker.
@@ -125,14 +125,14 @@
((disp_checker)->ops->get_base(disp_checker, env))
/** Gets QName.
- @sa axis2_disp_checker_ops#get_qname */
-#define AXIS2_DISP_CHECKER_GET_QNAME(disp_checker, env) \
- ((disp_checker)->ops->get_qname(disp_checker, env))
-
-/** Sets the qname.
- @sa axis2_disp_checker_ops#set_qname */
-#define AXIS2_DISP_CHECKER_SET_QNAME(disp_checker, env, name) \
- ((disp_checker)->ops->set_qname(disp_checker, env, name))
+ @sa axis2_disp_checker_ops#get_name */
+#define AXIS2_DISP_CHECKER_GET_NAME(disp_checker, env) \
+ ((disp_checker)->ops->get_name(disp_checker, env))
+
+/** Sets the name.
+ @sa axis2_disp_checker_ops#set_name */
+#define AXIS2_DISP_CHECKER_SET_NAME(disp_checker, env, name) \
+ ((disp_checker)->ops->set_name(disp_checker, env, name))
/** Frees dispatcher checker.
@sa axis2_disp_checker_ops#free */
Modified: webservices/axis2/trunk/c/include/axis2_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler.h Tue Jan 23 21:44:07 2007
@@ -109,8 +109,8 @@
* @param env pointer to environment struct
* @return pointer to QName of the handler
*/
- const axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ const axis2_string_t *(AXIS2_CALL *
+ get_name)(
const axis2_handler_t *handler,
const axis2_env_t *env);
@@ -157,7 +157,7 @@
typedef axis2_handler_t *(AXIS2_CALL *
AXIS2_HANDLER_CREATE_FUNC)(
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const axis2_string_t *name);
/**
* Creates handler struct instance.
@@ -178,7 +178,7 @@
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
axis2_ctx_handler_create(
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const axis2_string_t *qname);
/** Frees handler.
@sa axis2_handler_ops#free */
@@ -196,9 +196,9 @@
((handler)->ops->invoke(handler, env, msg_ctx))
/** Gets handler QName.
- @sa axis2_handler_ops#get_qname */
-#define AXIS2_HANDLER_GET_QNAME(handler, env) \
- ((handler)->ops->get_qname(handler, env))
+ @sa axis2_handler_ops#get_name */
+#define AXIS2_HANDLER_GET_NAME(handler, env) \
+ ((handler)->ops->get_name(handler, env))
/** Gets the named parameter.
@sa axis2_handler_ops#get_param */
Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Tue Jan 23 21:44:07 2007
@@ -62,8 +62,8 @@
* @param env pointer to environment struct
* @return pointer to QName, returns a reference, not a cloned copy
*/
- const axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ const axis2_string_t *(AXIS2_CALL *
+ get_name)(
const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env);
@@ -71,15 +71,15 @@
* Sets QName.
* @param handler_desc pointer to handler description
* @param env pointer to environment struct
- * @param qname pointer to QName, handler description creates a clone
+ * @param name pointer to string representing handler name
* of QName
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_qname)(
+ set_name)(
axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ axis2_string_t *name);
/**
* Gets phase rules.
@@ -267,14 +267,13 @@
/**
* Creates handler description struct instance.
* @param env pointer to env pointer to environment struct
- * @param qname pointer to QName of handler, can be NULL, create function
+ * @param name pointer to string representing handler name, can be NULL, create function
* clones this
* @return pointer to newly created handler description struct
*/
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
- axis2_handler_desc_create_with_qname(
- const axis2_env_t *env,
- const axis2_qname_t *qname);
+ axis2_handler_desc_create(const axis2_env_t *env,
+ axis2_string_t *name);
/** Gets handler associated with handler description.
@sa axis2_handler_desc_ops#get_handler */
@@ -297,14 +296,14 @@
((handler_desc)->ops->set_rules(handler_desc, env, rules))
/** Gets QName.
- @sa axis2_handler_desc_ops#get_qname */
-#define AXIS2_HANDLER_DESC_GET_QNAME(handler_desc, env) \
- ((handler_desc)->ops->get_qname(handler_desc, env))
+ @sa axis2_handler_desc_ops#get_name */
+#define AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env) \
+ ((handler_desc)->ops->get_name(handler_desc, env))
/** Sets QName.
- @sa axis2_handler_desc_ops#set_qname */
-#define AXIS2_HANDLER_DESC_SET_QNAME(handler_desc, env, name) \
- ((handler_desc)->ops->set_qname(handler_desc, env, name))
+ @sa axis2_handler_desc_ops#set_name */
+#define AXIS2_HANDLER_DESC_SET_NAME(handler_desc, env, name) \
+ ((handler_desc)->ops->set_name(handler_desc, env, name))
/** Gets parameter with given name.
@sa axis2_handler_desc_ops#get_param */
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=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_request.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_request.h Tue Jan 23 21:44:07 2007
@@ -188,7 +188,8 @@
set_body_string)(
axis2_http_simple_request_t *simple_request,
const axis2_env_t *env,
- axis2_char_t *str);
+ void *str,
+ unsigned int str_len);
/**
* @param simple_request pointer to simple request
@@ -302,9 +303,9 @@
/** Sets the body string.
@sa axis2_http_simple_request_ops#set_body_string */
-#define AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(simple_request, env, str)\
+#define AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(simple_request, env, str, str_len)\
((simple_request)->ops->set_body_string\
- (simple_request, env, str))
+ (simple_request, env, str, str_len))
/** Frees the http simple request.
@sa axis2_http_simple_request_ops#free */
Modified: webservices/axis2/trunk/c/include/axis2_listener_manager.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_listener_manager.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_listener_manager.h (original)
+++ webservices/axis2/trunk/c/include/axis2_listener_manager.h Tue Jan 23 21:44:07 2007
@@ -72,7 +72,7 @@
make_sure_started)(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport,
+ const AXIS2_TRANSPORT_ENUMS transport,
axis2_conf_ctx_t *conf_ctx);
/**
@@ -86,7 +86,7 @@
stop)(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport);
+ const AXIS2_TRANSPORT_ENUMS transport);
/**
* Gets reply to end point reference. The engine will direct the
* response for the message to this reply to address.
@@ -102,7 +102,7 @@
const axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
const axis2_char_t *svc_name,
- const axis2_char_t *transport);
+ const AXIS2_TRANSPORT_ENUMS transport);
/**
* Gets the configuration context that holds information on the transports
Modified: webservices/axis2/trunk/c/include/axis2_msg_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg_ctx.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_ctx.h Tue Jan 23 21:44:07 2007
@@ -905,7 +905,7 @@
* @param env pointer to environment struct
* @return pointer to QName of the paused handler
*/
- AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+ AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
axis2_msg_ctx_get_paused_handler_name(const axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/include/axis2_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_options.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_options.h (original)
+++ webservices/axis2/trunk/c/include/axis2_options.h Tue Jan 23 21:44:07 2007
@@ -127,7 +127,7 @@
* @param env pointer to environment struct
* @return pointer to transport in protocol string if set, else NULL
*/
- const axis2_char_t* (AXIS2_CALL *
+ AXIS2_TRANSPORT_ENUMS (AXIS2_CALL *
get_transport_in_protocol)(
const axis2_options_t *options,
const axis2_env_t *env);
@@ -207,7 +207,7 @@
* @param env pointer to environment struct
* @return pointer to transport out protocol string if set, else NULL
*/
- const axis2_char_t* (AXIS2_CALL *
+ AXIS2_TRANSPORT_ENUMS (AXIS2_CALL *
get_sender_transport_protocol)(
const axis2_options_t *options,
const axis2_env_t *env);
@@ -374,7 +374,7 @@
set_transport_in_protocol)(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *transport_in_protocol);
+ const AXIS2_TRANSPORT_ENUMS transport_in_protocol);
/**
* Sets message ID.
@@ -474,7 +474,7 @@
set_sender_transport)(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
axis2_conf_t *conf);
/**
@@ -521,8 +521,8 @@
set_transport_info)(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
- const axis2_char_t *receiver_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
+ const AXIS2_TRANSPORT_ENUMS receiver_transport,
const axis2_bool_t use_separate_listener);
/**
Modified: webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_in_desc.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_in_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_in_desc.h Tue Jan 23 21:44:07 2007
@@ -41,7 +41,6 @@
#include <axis2_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
-#include <axis2_qname.h>
#include <axis2_array_list.h>
/*#include <axis2_transport_receiver.h>*/
#include <axis2_phase_meta.h>
@@ -91,28 +90,28 @@
const axis2_env_t *env);
/**
- * Gets QName.
+ * Gets transport enum.
* @param transport_in pointer to transport in description struct
* @param env pointer to environment struct
- * @return pointer to QName
+ * @return transport enum
*/
- const axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ AXIS2_TRANSPORT_ENUMS (AXIS2_CALL *
+ get_enum)(
const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env);
/**
- * Sets QName.
+ * Sets transport enum.
* @param transport_in pointer to transport in description struct
* @param env pointer to environment struct
- * @param qname pointer to QName, this method creates a clone of QName
+ * @param trans_enum transport enum
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_qname)(
+ set_enum)(
struct axis2_transport_in_desc *transport_in,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Gets in flow. In flow represents the list of phases invoked
@@ -299,15 +298,15 @@
};
/**
- * Creates transport in description with given QName.
+ * Creates transport in description with given transport enum.
* @param env pointer to environment struct
- * @param qname pointer to QName
+ * @param trans_enum transport enum
* @return pointer to newly created phase holder
*/
AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
- axis2_transport_in_desc_create_with_qname (
+ axis2_transport_in_desc_create(
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Frees transport in description given as a void parameter.
@@ -326,15 +325,15 @@
#define AXIS2_TRANSPORT_IN_DESC_FREE(transport_in_desc, env) \
((transport_in_desc)->ops->free (transport_in_desc, env))
-/** Gets QName.
- @sa axis2_transport_in_desc_ops#get_qname */
-#define AXIS2_TRANSPORT_IN_DESC_GET_QNAME(transport_in_desc, env) \
- ((transport_in_desc)->ops->get_qname (transport_in_desc, env))
-
-/** Sets QName.
- @sa axis2_transport_in_desc_ops#set_qname */
-#define AXIS2_TRANSPORT_IN_DESC_SET_QNAME(transport_in_desc, env, qname) \
- ((transport_in_desc)->ops->set_qname (transport_in_desc, env, qname))
+/** Gets transport enum.
+ @sa axis2_transport_in_desc_ops#get_enum */
+#define AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env) \
+ ((transport_in_desc)->ops->get_enum (transport_in_desc, env))
+
+/** Sets transport enum.
+ @sa axis2_transport_in_desc_ops#set_enum */
+#define AXIS2_TRANSPORT_IN_DESC_SET_ENUM(transport_in_desc, env, trans_enum) \
+ ((transport_in_desc)->ops->set_enum (transport_in_desc, env, trans_enum))
/** Gets in flow.
@sa axis2_transport_in_desc_ops#get_in_flow */
Modified: webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_out_desc.h?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_out_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_out_desc.h Tue Jan 23 21:44:07 2007
@@ -40,7 +40,6 @@
#include <axis2_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
-#include <axis2_qname.h>
#include <axis2_array_list.h>
#include <axis2_phase_meta.h>
#include <axis2_phase.h>
@@ -90,28 +89,28 @@
const axis2_env_t *env);
/**
- * Gets QName.
+ * Gets transport enum.
* @param transport_out pointer to transport_out
* @param env pointer to environment struct
- * @return pointer to QName, returns a reference, not a cloned copy
+ * @return transport enum
*/
- const axis2_qname_t *(AXIS2_CALL *
- get_qname)(
+ AXIS2_TRANSPORT_ENUMS (AXIS2_CALL *
+ get_enum)(
const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env);
/**
- * Sets QName.
+ * Sets transport enum.
* @param transport_out pointer to transport_out
* @param env pointer to environment struct
- * @param qname pointer to QName, this method creates a clone of QName
+ * @param trans_enum transport enum
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
axis2_status_t (AXIS2_CALL *
- set_qname)(
+ set_enum)(
struct axis2_transport_out_desc *transport_out,
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Gets out flow. Out flow represents the list of phases invoked
@@ -297,16 +296,15 @@
};
/**
- * Creates transport out description with given QName.
+ * Creates transport out description with given transport enum.
* @param env pointer to environment struct
- * @param qname pointer to QName, newly created transport out description
- * creates a clone of this
+ * @param trans_enum pointer to transport enum
* @return pointer to newly created transport out
*/
AXIS2_EXTERN axis2_transport_out_desc_t * AXIS2_CALL
- axis2_transport_out_desc_create_with_qname (
+ axis2_transport_out_desc_create(
const axis2_env_t *env,
- const axis2_qname_t *qname);
+ const AXIS2_TRANSPORT_ENUMS trans_enum);
/**
* Frees transport out description given as a void pointer.
@@ -325,15 +323,15 @@
#define AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out_desc, env) \
((transport_out_desc)->ops->free (transport_out_desc, env))
-/** Gets QName.
- @sa axis2_transport_out_desc_ops#get_qname */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport_out_desc, env) \
- ((transport_out_desc)->ops->get_qname (transport_out_desc, env))
-
-/** Sets QName.
- @sa axis2_transport_out_desc_ops#set_qname */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_QNAME(transport_out_desc, env, qname) \
- ((transport_out_desc)->ops->set_qname (transport_out_desc, env, qname))
+/** Gets transport enum.
+ @sa axis2_transport_out_desc_ops#get_enum */
+#define AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env) \
+ ((transport_out_desc)->ops->get_enum (transport_out_desc, env))
+
+/** Sets transport enum.
+ @sa axis2_transport_out_desc_ops#set_enum */
+#define AXIS2_TRANSPORT_OUT_DESC_SET_ENUM(transport_out_desc, env, trans_enum) \
+ ((transport_out_desc)->ops->set_enum (transport_out_desc, env, trans_enum))
/** Gets out flow.
@sa axis2_transport_out_desc_ops#get_out_flow */
Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Tue Jan 23 21:44:07 2007
@@ -20,17 +20,6 @@
#include <axis2_hash.h>
#include <axis2_transport_receiver.h>
-typedef struct axis2_listener_manager_impl
-{
- /** context base struct */
- axis2_listener_manager_t listener_manager;
- /** hash map of listeners */
- axis2_hash_t *listener_map;
- /** configuration context */
- axis2_conf_ctx_t *conf_ctx;
-}
-axis2_listener_manager_impl_t;
-
/**
* keep information about the listener for a given transport
*/
@@ -43,6 +32,19 @@
}
axis2_transport_listener_state_t;
+
+typedef struct axis2_listener_manager_impl
+{
+ /** context base struct */
+ axis2_listener_manager_t listener_manager;
+ /** hash map of listeners */
+ axis2_transport_listener_state_t *listener_map[AXIS2_TRANSPORT_ENUM_MAX];
+ /** configuration context */
+ axis2_conf_ctx_t *conf_ctx;
+}
+axis2_listener_manager_impl_t;
+
+
typedef struct axis2_listener_manager_worker_func_args
{
const axis2_env_t *env;
@@ -64,21 +66,21 @@
axis2_listener_manager_make_sure_started(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport,
+ const AXIS2_TRANSPORT_ENUMS transport,
axis2_conf_ctx_t *conf_ctx);
axis2_status_t AXIS2_CALL
axis2_listener_manager_stop(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport);
+ const AXIS2_TRANSPORT_ENUMS transport);
axis2_endpoint_ref_t *AXIS2_CALL
axis2_listener_manager_get_reply_to_epr(
const axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
const axis2_char_t *svc_name,
- const axis2_char_t *transport);
+ const AXIS2_TRANSPORT_ENUMS transport);
axis2_status_t AXIS2_CALL
axis2_listener_manager_free(
@@ -95,6 +97,7 @@
const axis2_env_t *env)
{
axis2_listener_manager_impl_t *listener_manager_impl = NULL;
+ int i = 0;
AXIS2_ENV_CHECK(env, NULL);
@@ -108,14 +111,11 @@
}
listener_manager_impl->listener_manager.ops = NULL;
- listener_manager_impl->listener_map = NULL;
listener_manager_impl->conf_ctx = NULL;
-
- listener_manager_impl->listener_map = axis2_hash_make(env);
- if (!(listener_manager_impl->listener_map))
+
+ for (i = 0; i < AXIS2_TRANSPORT_ENUM_MAX; i++)
{
- axis2_listener_manager_free(&(listener_manager_impl->listener_manager), env);
- return NULL;
+ listener_manager_impl->listener_map[i] = NULL;
}
/* initialize ops */
@@ -147,7 +147,7 @@
axis2_listener_manager_make_sure_started(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport,
+ const AXIS2_TRANSPORT_ENUMS transport,
axis2_conf_ctx_t *conf_ctx)
{
axis2_listener_manager_impl_t *listener_manager_impl = NULL;
@@ -173,86 +173,77 @@
}
- tl_state = (axis2_transport_listener_state_t*)
- axis2_hash_get(listener_manager_impl->listener_map, transport, AXIS2_HASH_KEY_STRING);
+ tl_state = listener_manager_impl->listener_map[transport];
if (!tl_state)
{
/*means this transport not yet started, start the transport*/
axis2_transport_in_desc_t *transport_in = NULL;
- axis2_qname_t *qname = NULL;
axis2_conf_t *conf = NULL;
axis2_transport_receiver_t *listener = NULL;
- qname = axis2_qname_create(env, transport, NULL, NULL);
- if (qname)
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ if (conf)
{
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- if (conf)
+ transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env, transport);
+ if (transport_in)
{
- transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env, qname);
- if (transport_in)
+ listener = AXIS2_TRANSPORT_IN_DESC_GET_RECV(transport_in, env);
+ if (listener)
{
- listener = AXIS2_TRANSPORT_IN_DESC_GET_RECV(transport_in, env);
- if (listener)
+ axis2_thread_t *worker_thread = NULL;
+ axis2_listener_manager_worker_func_args_t *arg_list = NULL;
+ arg_list = AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_listener_manager_worker_func_args_t));
+ if (NULL == arg_list)
{
- axis2_thread_t *worker_thread = NULL;
- axis2_listener_manager_worker_func_args_t *arg_list = NULL;
- arg_list = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_listener_manager_worker_func_args_t));
- if (NULL == arg_list)
- {
- return AXIS2_FAILURE;
- }
- arg_list->env = env;
- arg_list->listner_manager = listener_manager_impl;
- arg_list->listener = listener;
+ return AXIS2_FAILURE;
+ }
+ arg_list->env = env;
+ arg_list->listner_manager = listener_manager_impl;
+ arg_list->listener = listener;
#ifdef AXIS2_SVR_MULTI_THREADED
- if (env->thread_pool)
+ if (env->thread_pool)
+ {
+ worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ axis2_listener_manager_worker_func, (void*)arg_list);
+ if (NULL == worker_thread)
{
- worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
- axis2_listener_manager_worker_func, (void*)arg_list);
- if (NULL == worker_thread)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
- "Invoke non blocking failed");
- }
- else
- {
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
- }
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
+ "Invoke non blocking failed");
}
else
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread pool not set in environment."
- " Cannot invoke call non blocking");
+ AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
}
+ }
+ else
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread pool not set in environment."
+ " Cannot invoke call non blocking");
+ }
#else
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Threading not enabled."
- " Cannot start separate listener");
- return AXIS2_FAILURE;
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Threading not enabled."
+ " Cannot start separate listener");
+ return AXIS2_FAILURE;
#endif
- tl_state = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_transport_listener_state_t));
+ tl_state = AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_transport_listener_state_t));
- if (!tl_state)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- }
- else
- {
- tl_state->listener = listener;
- tl_state->waiting_calls = 0;
- axis2_hash_set(listener_manager_impl->listener_map,
- transport, AXIS2_HASH_KEY_STRING, tl_state);
- }
+ if (!tl_state)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ }
+ else
+ {
+ tl_state->listener = listener;
+ tl_state->waiting_calls = 0;
+ listener_manager_impl->listener_map[transport] = tl_state;
}
}
}
}
-
- AXIS2_QNAME_FREE(qname, env);
}
if (tl_state)
@@ -268,7 +259,7 @@
axis2_listener_manager_stop(
axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
- const axis2_char_t *transport)
+ const AXIS2_TRANSPORT_ENUMS transport)
{
axis2_listener_manager_impl_t *listener_manager_impl = NULL;
axis2_transport_listener_state_t *tl_state = NULL;
@@ -278,8 +269,7 @@
listener_manager_impl = AXIS2_INTF_TO_IMPL(listener_manager);
- tl_state = (axis2_transport_listener_state_t*)
- axis2_hash_get(listener_manager_impl->listener_map, transport, AXIS2_HASH_KEY_STRING);
+ tl_state = listener_manager_impl->listener_map[transport];
if (tl_state)
{
@@ -290,8 +280,7 @@
if (status != AXIS2_SUCCESS)
return status;
- axis2_hash_set(listener_manager_impl->listener_map,
- transport, AXIS2_HASH_KEY_STRING, NULL);
+ listener_manager_impl->listener_map[transport] = NULL;
}
}
@@ -303,7 +292,7 @@
const axis2_listener_manager_t *listener_manager,
const axis2_env_t *env,
const axis2_char_t *svc_name,
- const axis2_char_t *transport)
+ const AXIS2_TRANSPORT_ENUMS transport)
{
axis2_listener_manager_impl_t *listener_manager_impl = NULL;
axis2_transport_listener_state_t *tl_state = NULL;
@@ -312,8 +301,7 @@
listener_manager_impl = AXIS2_INTF_TO_IMPL(listener_manager);
- tl_state = (axis2_transport_listener_state_t*)
- axis2_hash_get(listener_manager_impl->listener_map, transport, AXIS2_HASH_KEY_STRING);
+ tl_state = listener_manager_impl->listener_map[transport];
if (tl_state)
{
return AXIS2_TRANSPORT_RECEIVER_GET_REPLY_TO_EPR(tl_state->listener, env, svc_name);
@@ -327,6 +315,7 @@
const axis2_env_t *env)
{
axis2_listener_manager_impl_t *listener_manager_impl = NULL;
+ int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -338,21 +327,10 @@
listener_manager_impl->listener_manager.ops = NULL;
}
- if (listener_manager_impl->listener_map)
+ for (i = 0; i < AXIS2_TRANSPORT_ENUM_MAX; i++)
{
- axis2_hash_index_t *hi = NULL;
- const void *key = NULL;
- void *val = NULL;
- for (hi = axis2_hash_first(listener_manager_impl->listener_map, env); hi;
- hi = axis2_hash_next(env, hi))
- {
- axis2_hash_this(hi, &key, NULL, &val);
- if (val)
- AXIS2_FREE(env->allocator, val);
- }
-
- axis2_hash_free(listener_manager_impl->listener_map, env);
- listener_manager_impl->listener_map = NULL;
+ if (listener_manager_impl->listener_map[i])
+ AXIS2_FREE(env->allocator, listener_manager_impl->listener_map[i]);
}
AXIS2_FREE(env->allocator, listener_manager_impl);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Tue Jan 23 21:44:07 2007
@@ -344,12 +344,10 @@
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- axis2_qname_t *qname = NULL;
axis2_transport_out_desc_t *transport_out_desc = NULL;
-
- qname = axis2_qname_create(env, transport, NULL, NULL);
- if (!qname)
- return NULL;
+
+ AXIS2_TRANSPORT_ENUMS transport_enum =
+ (axis2_strcmp(transport, "http") == 0)?AXIS2_TRANSPORT_ENUM_HTTP:AXIS2_TRANSPORT_ENUM_MAX;
conf_ctx = AXIS2_SVC_CTX_GET_CONF_CTX(mep_client_impl->svc_ctx, env);
if (conf_ctx)
@@ -357,14 +355,12 @@
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
{
- transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, qname);
+ transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, transport_enum);
}
}
AXIS2_FREE(env->allocator, transport);
transport = NULL;
- AXIS2_QNAME_FREE(qname, env);
- qname = NULL;
return transport_out_desc;
}
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=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Tue Jan 23 21:44:07 2007
@@ -479,7 +479,7 @@
if (conf)
{
transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
- AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport_out, env));
+ AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out, env));
}
}
}
@@ -646,7 +646,7 @@
axis2_op_client_impl_t *op_client_impl = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_listener_manager_t *listener_manager = NULL;
- axis2_char_t *transport = NULL;
+ AXIS2_TRANSPORT_ENUMS transport = AXIS2_TRANSPORT_ENUM_HTTP;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Tue Jan 23 21:44:07 2007
@@ -48,11 +48,11 @@
axis2_transport_in_desc_t *transport_in;
- axis2_char_t *transport_in_protocol;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol;
/** for sending and receiving messages */
axis2_transport_out_desc_t *transport_out;
- axis2_char_t *sender_transport_protocol;
+ AXIS2_TRANSPORT_ENUMS sender_transport_protocol;
axis2_bool_t manage_session;
axis2_bool_t enable_mtom;
@@ -100,7 +100,7 @@
const axis2_options_t *options,
const axis2_env_t *env);
-const axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
axis2_options_get_transport_in_protocol(
const axis2_options_t *options,
const axis2_env_t *env);
@@ -136,7 +136,7 @@
const axis2_options_t *options,
const axis2_env_t *env);
-const axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
axis2_options_get_sender_transport_protocol(
const axis2_options_t *options,
const axis2_env_t *env);
@@ -213,7 +213,7 @@
axis2_options_set_transport_in_protocol(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *transport_in_protocol);
+ const AXIS2_TRANSPORT_ENUMS transport_in_protocol);
axis2_status_t AXIS2_CALL
@@ -259,7 +259,7 @@
axis2_options_set_sender_transport(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
axis2_conf_t *conf);
axis2_status_t AXIS2_CALL
@@ -278,8 +278,8 @@
axis2_options_set_transport_info(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
- const axis2_char_t *receiver_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
+ const AXIS2_TRANSPORT_ENUMS receiver_transport,
const axis2_bool_t use_separate_listener);
axis2_status_t AXIS2_CALL
@@ -531,7 +531,7 @@
return options_impl->transport_in;
}
-const axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
axis2_options_get_transport_in_protocol(const axis2_options_t *options,
const axis2_env_t *env)
{
@@ -540,7 +540,7 @@
options_impl = AXIS2_INTF_TO_IMPL(options);
- if (options_impl->transport_in_protocol == NULL && options_impl->parent)
+ if (options_impl->parent)
{
return axis2_options_get_transport_in_protocol(options_impl->parent, env);
}
@@ -666,7 +666,7 @@
return options_impl->transport_out;
}
-const axis2_char_t *AXIS2_CALL
+AXIS2_TRANSPORT_ENUMS AXIS2_CALL
axis2_options_get_sender_transport_protocol(
const axis2_options_t *options,
const axis2_env_t *env)
@@ -677,7 +677,7 @@
options_impl = AXIS2_INTF_TO_IMPL(options);
- if (options_impl->sender_transport_protocol == NULL && options_impl->parent)
+ if (options_impl->parent)
{
return axis2_options_get_sender_transport_protocol(options_impl->parent, env);
}
@@ -874,11 +874,11 @@
axis2_options_set_transport_in_protocol(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *transport_in_protocol)
+ const AXIS2_TRANSPORT_ENUMS transport_in_protocol)
{
axis2_options_impl_t *options_impl = NULL;
options_impl = AXIS2_INTF_TO_IMPL(options);
- options_impl->transport_in_protocol = (axis2_char_t *)transport_in_protocol;
+ options_impl->transport_in_protocol = transport_in_protocol;
return AXIS2_SUCCESS;
}
@@ -976,24 +976,15 @@
axis2_options_set_sender_transport(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
axis2_conf_t *conf)
{
axis2_options_impl_t *options_impl = NULL;
- axis2_qname_t *tmp = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
options_impl = AXIS2_INTF_TO_IMPL(options);
- tmp = axis2_qname_create(env, sender_transport, NULL, NULL);
- if (!tmp)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
-
- options_impl->transport_out = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, tmp);
- AXIS2_QNAME_FREE(tmp, env);
+ options_impl->transport_out = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, sender_transport);
if (!(options_impl->transport_out))
{
@@ -1046,8 +1037,8 @@
axis2_options_set_transport_info(
axis2_options_t *options,
const axis2_env_t *env,
- const axis2_char_t *sender_transport,
- const axis2_char_t *receiver_transport,
+ const AXIS2_TRANSPORT_ENUMS sender_transport,
+ const AXIS2_TRANSPORT_ENUMS receiver_transport,
const axis2_bool_t use_separate_listener)
{
axis2_options_impl_t *options_impl = NULL;
@@ -1059,7 +1050,7 @@
*/
if (!use_separate_listener)
{
- if (0 != strcmp(sender_transport, receiver_transport))
+ if (sender_transport != receiver_transport)
{
/*TODO:error*/
return AXIS2_FAILURE;
@@ -1072,7 +1063,7 @@
env, use_separate_listener);
}
axis2_options_set_transport_in_protocol(&(options_impl->options), env, receiver_transport);
- options_impl->sender_transport_protocol = (axis2_char_t *)sender_transport;
+ options_impl->sender_transport_protocol = sender_transport;
return AXIS2_SUCCESS;
}
@@ -1225,18 +1216,6 @@
options_impl->soap_version_uri = NULL;
}
- if (options_impl->transport_in_protocol)
- {
- AXIS2_FREE(env->allocator, options_impl->transport_in_protocol);
- options_impl->transport_in_protocol = NULL;
- }
-
- if (options_impl->sender_transport_protocol)
- {
- AXIS2_FREE(env->allocator, options_impl->sender_transport_protocol);
- options_impl->sender_transport_protocol = NULL;
- }
-
if (options_impl->msg_info_headers)
{
AXIS2_MSG_INFO_HEADERS_FREE(options_impl->msg_info_headers, env);
@@ -1268,9 +1247,9 @@
options_impl->receiver = NULL;
options_impl->transport_in = NULL;
- options_impl->transport_in_protocol = NULL;
+ options_impl->transport_in_protocol = AXIS2_TRANSPORT_ENUM_HTTP;
options_impl->transport_out = NULL;
- options_impl->sender_transport_protocol = NULL;
+ options_impl->sender_transport_protocol = AXIS2_TRANSPORT_ENUM_HTTP;
options_impl->manage_session = -1;
options_impl->soap_version = AXIOM_SOAP12;
options_impl->enable_mtom = AXIS2_FALSE;
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=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Jan 23 21:44:07 2007
@@ -963,7 +963,7 @@
axis2_svc_client_impl_t *svc_client_impl = NULL;
axis2_op_client_t *op_client = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
- const axis2_char_t *transport_in_protocol = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol;
axis2_bool_t qname_free_flag = AXIS2_FALSE;
svc_client_impl = AXIS2_INTF_TO_IMPL(svc_client);
@@ -1002,8 +1002,6 @@
transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
svc_client_impl->options, env);
- if (!transport_in_protocol)
- transport_in_protocol = AXIS2_TRANSPORT_HTTP;
AXIS2_LISTNER_MANAGER_MAKE_SURE_STARTED(svc_client_impl->listener_manager, env,
transport_in_protocol, svc_client_impl->conf_ctx);
@@ -1075,7 +1073,7 @@
const axis2_env_t *env)
{
axis2_svc_client_impl_t *svc_client_impl = NULL;
- const axis2_char_t *transport_in_protocol = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_in_protocol;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1083,8 +1081,6 @@
transport_in_protocol = AXIS2_OPTIONS_GET_TRANSPORT_IN_PROTOCOL(
svc_client_impl->options, env);
- if (!transport_in_protocol)
- transport_in_protocol = AXIS2_TRANSPORT_HTTP;
if (svc_client_impl->listener_manager)
{
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Tue Jan 23 21:44:07 2007
@@ -83,7 +83,7 @@
/** paused phase name */
axis2_char_t *paused_phase_name;
/** paused handler name */
- axis2_qname_t *paused_handler_name;
+ axis2_string_t *paused_handler_name;
/** SOAP action */
axis2_char_t *soap_action;
/** are we doing MTOM now? */
@@ -97,9 +97,9 @@
/** service group context id */
axis2_char_t *svc_grp_ctx_id;
/** qname of transport in */
- axis2_qname_t *transport_in_desc_qname;
+ AXIS2_TRANSPORT_ENUMS transport_in_desc_enum;
/** qname of transport out */
- axis2_qname_t *transport_out_desc_qname;
+ AXIS2_TRANSPORT_ENUMS transport_out_desc_enum;
/** service group id */
axis2_char_t *svc_grp_id;
/** service description qname */
@@ -194,8 +194,8 @@
msg_ctx->do_rest_through_post = AXIS2_FALSE;
msg_ctx->is_soap_11 = AXIS2_FALSE;
msg_ctx->svc_grp_ctx_id = NULL;
- msg_ctx->transport_in_desc_qname = NULL;
- msg_ctx->transport_out_desc_qname = NULL;
+ msg_ctx->transport_in_desc_enum = AXIS2_TRANSPORT_ENUM_MAX;
+ msg_ctx->transport_out_desc_enum = AXIS2_TRANSPORT_ENUM_MAX;
msg_ctx->svc_grp_id = NULL;
msg_ctx->svc_qname = NULL;
msg_ctx->op_qname = NULL;
@@ -222,11 +222,11 @@
msg_ctx->conf_ctx = conf_ctx;
if (msg_ctx->transport_in_desc)
- msg_ctx->transport_in_desc_qname =
- (axis2_qname_t *)AXIS2_TRANSPORT_IN_DESC_GET_QNAME(transport_in_desc, env);
+ msg_ctx->transport_in_desc_enum =
+ AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env);
if (msg_ctx->transport_out_desc)
- msg_ctx->transport_out_desc_qname =
- (axis2_qname_t *)AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport_out_desc, env);
+ msg_ctx->transport_out_desc_enum =
+ AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env);
msg_ctx->msg_info_headers = axis2_msg_info_headers_create(env, NULL, NULL);
if (!(msg_ctx->msg_info_headers))
@@ -360,17 +360,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
- if (msg_ctx->transport_in_desc_qname)
- {
- msg_ctx->transport_in_desc = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
- msg_ctx->transport_in_desc_qname);
- }
+ msg_ctx->transport_in_desc = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
+ msg_ctx->transport_in_desc_enum);
- if (msg_ctx->transport_out_desc_qname)
- {
- msg_ctx->transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf,
- env, msg_ctx->transport_out_desc_qname);
- }
+ msg_ctx->transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf,
+ env, msg_ctx->transport_out_desc_enum);
if (msg_ctx->svc_grp_id)
{
@@ -910,8 +904,8 @@
if (transport_in_desc)
{
msg_ctx->transport_in_desc = transport_in_desc;
- msg_ctx->transport_in_desc_qname =
- (axis2_qname_t *)AXIS2_TRANSPORT_IN_DESC_GET_QNAME(transport_in_desc, env);
+ msg_ctx->transport_in_desc_enum =
+ AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env);
}
return AXIS2_SUCCESS;
@@ -928,8 +922,8 @@
if (transport_out_desc)
{
msg_ctx->transport_out_desc = transport_out_desc;
- msg_ctx->transport_out_desc_qname =
- (axis2_qname_t *)AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport_out_desc, env);
+ msg_ctx->transport_out_desc_enum =
+ AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env);
}
return AXIS2_SUCCESS;
@@ -1372,7 +1366,7 @@
return AXIS2_CTX_SET_PROPERTY(msg_ctx->base, env, key, value, persistent);
}
-const axis2_qname_t *AXIS2_CALL
+const axis2_string_t *AXIS2_CALL
axis2_msg_ctx_get_paused_handler_name(
const axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env)
@@ -1853,7 +1847,7 @@
if (handler)
{
msg_ctx->paused_handler_name =
- (axis2_qname_t *)AXIS2_HANDLER_GET_QNAME(handler, env);
+ (axis2_string_t *)AXIS2_HANDLER_GET_NAME(handler, env);
}
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=499268&r1=499267&r2=499268
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Tue Jan 23 21:44:07 2007
@@ -723,7 +723,6 @@
axis2_char_t *dll_name = NULL;
axis2_char_t *class_name = NULL;
axiom_children_qname_iterator_t *itr = NULL;
- axis2_qname_t *qname = NULL;
axis2_qname_t *qparamst = NULL;
axis2_qname_t *qinflowst = NULL;
axis2_qname_t *qoutflowst = NULL;
@@ -746,11 +745,25 @@
axis2_char_t *temp_path = NULL;
axis2_char_t *temp_path2 = NULL;
axis2_char_t *temp_path3 = NULL;
+ AXIS2_TRANSPORT_ENUMS transport_enum;
name = AXIOM_ATTRIBUTE_GET_VALUE(trs_name, env);
- qname = axis2_qname_create(env, name, NULL, NULL);
- transport_out = axis2_transport_out_desc_create_with_qname(env, qname);
- AXIS2_QNAME_FREE(qname, env);
+ if (name)
+ {
+ if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
+ else
+ return AXIS2_FAILURE;
+
+ transport_out = axis2_transport_out_desc_create(env, transport_enum);
+ }
+
if (NULL == transport_out)
{
return AXIS2_FAILURE;
@@ -889,7 +902,7 @@
/* adding to axis config */
status = AXIS2_CONF_ADD_TRANSPORT_OUT(builder_impl->conf, env,
- transport_out);
+ transport_out, transport_enum);
if (AXIS2_SUCCESS != status)
{
AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
@@ -951,7 +964,6 @@
axis2_char_t *name = NULL;
axiom_attribute_t *trs_class_name = NULL;
axiom_children_qname_iterator_t *itr = NULL;
- axis2_qname_t *transport_in_desc_qname = NULL;
axis2_qname_t *class_qname = NULL;
axis2_qname_t *qparamst = NULL;
axis2_qname_t *qinflowst = NULL;
@@ -966,13 +978,25 @@
axiom_node_t *in_fault_flow_node = NULL;
axiom_element_t *out_fault_flow_element = NULL;
axiom_node_t *out_fault_flow_node = NULL;
-
+ AXIS2_TRANSPORT_ENUMS transport_enum;
name = AXIOM_ATTRIBUTE_GET_VALUE(trs_name, env);
- transport_in_desc_qname = axis2_qname_create(env, name, NULL, NULL);
- transport_in = axis2_transport_in_desc_create_with_qname(env,
- transport_in_desc_qname);
- AXIS2_QNAME_FREE(transport_in_desc_qname, env);
+ if (name)
+ {
+ if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
+ else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+ transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
+ else
+ return AXIS2_FAILURE;
+
+ transport_in = axis2_transport_in_desc_create(env,
+ transport_enum);
+ }
if (!transport_in)
{
return AXIS2_FAILURE;
@@ -1115,7 +1139,7 @@
/* adding to axis config */
status = AXIS2_CONF_ADD_TRANSPORT_IN(builder_impl->conf, env,
- transport_in);
+ transport_in, transport_enum);
if (AXIS2_SUCCESS != status)
{
AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org