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 pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [7/17] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/
guththila/samples/ guththila/src/ include/ modu...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_transport_sender.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_endpoint_ref.h>
#include <axis2_addr.h>
#include <axiom_xml_writer.h>
@@ -157,7 +157,7 @@
axis2_msg_ctx_t *msg_ctx)
{
const axis2_char_t *char_set_enc = NULL;
- axis2_string_t *char_set_enc_str = NULL;
+ axutil_string_t *char_set_enc_str = NULL;
axis2_endpoint_ref_t *epr = NULL;
axis2_char_t *transport_url = NULL;
axiom_xml_writer_t *xml_writer = NULL;
@@ -165,7 +165,7 @@
axis2_char_t *buffer = NULL;
axiom_soap_envelope_t *soap_data_out = NULL;
axis2_bool_t do_mtom;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
axiom_node_t *data_out = NULL;
axis2_byte_t *output_stream = NULL;
int buffer_size = 0;
@@ -177,13 +177,13 @@
AXIS2_CHARACTER_SET_ENCODING);
if (property)
{
- char_set_enc = axis2_property_get_value(property, env);
+ char_set_enc = axutil_property_get_value(property, env);
property = NULL;
}*/
char_set_enc_str = axis2_msg_ctx_get_charset_encoding(msg_ctx, env);
if (char_set_enc_str)
{
- char_set_enc = axis2_string_get_buffer(char_set_enc_str, env);
+ char_set_enc = axutil_string_get_buffer(char_set_enc_str, env);
}
if (!char_set_enc)
@@ -198,7 +198,7 @@
AXIS2_CHARACTER_SET_ENCODING);
if (property)
{
- char_set_enc = axis2_property_get_value(property, env);
+ char_set_enc = axutil_property_get_value(property, env);
property = NULL;
}
}
@@ -281,7 +281,7 @@
if (!epr)
{
- axis2_stream_t *out_stream = axis2_msg_ctx_get_transport_out_stream(msg_ctx, env);
+ axutil_stream_t *out_stream = axis2_msg_ctx_get_transport_out_stream(msg_ctx, env);
if (AXIS2_TRUE == axis2_msg_ctx_get_server_side(msg_ctx, env))
{
@@ -436,39 +436,39 @@
axis2_conf_ctx_t *conf_ctx,
axis2_transport_out_desc_t *out_desc)
{
- axis2_param_t *version_param = NULL;
+ axutil_param_t *version_param = NULL;
axis2_char_t *version = NULL;
axis2_char_t *temp = NULL;
- axis2_param_t *temp_param = NULL;
+ axutil_param_t *temp_param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_desc, AXIS2_FAILURE);
- version_param = axis2_param_container_get_param(
+ version_param = axutil_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_PROTOCOL_VERSION);
if (version_param)
{
- version = axis2_param_get_value(version_param, env);
+ version = axutil_param_get_value(version_param, env);
}
if (version)
{
if (0 == axis2_strcmp(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *encoding = NULL;
- axis2_param_t *encoding_param = NULL;
+ axutil_param_t *encoding_param = NULL;
if (AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
{
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
}
AXIS2_INTF_TO_IMPL(transport_sender)->http_version = axis2_strdup(env, version);
- encoding_param = axis2_param_container_get_param(
+ encoding_param = axutil_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
if (encoding_param)
{
- encoding = axis2_param_get_value(encoding_param, env);
+ encoding = axutil_param_get_value(encoding_param, env);
}
if (encoding && 0 == axis2_strcmp(encoding,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
@@ -499,23 +499,23 @@
}
- temp_param = axis2_param_container_get_param(
+ temp_param = axutil_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_SO_TIMEOUT);
if (temp_param)
{
- temp = axis2_param_get_value(temp_param, env);
+ temp = axutil_param_get_value(temp_param, env);
}
if (temp)
{
AXIS2_INTF_TO_IMPL(transport_sender)->so_timeout = AXIS2_ATOI(temp);
}
- temp = (axis2_char_t *)axis2_param_container_get_param(
+ temp = (axis2_char_t *)axutil_param_container_get_param(
axis2_transport_out_desc_param_container(out_desc, env), env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
if (temp_param)
{
- temp = axis2_param_get_value(temp_param, env);
+ temp = axutil_param_get_value(temp_param, env);
}
if (temp)
{
@@ -551,7 +551,7 @@
url = axis2_endpoint_ref_get_address(epr, env);
- soap_action = axis2_string_get_buffer( axis2_msg_ctx_get_soap_action(msg_ctx, env), env);
+ soap_action = axutil_string_get_buffer( axis2_msg_ctx_get_soap_action(msg_ctx, env), env);
if (! soap_action)
{
@@ -594,7 +594,7 @@
{
/* handle one way case */
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axis2_qname_get_localpart = %s",
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "OP name axutil_qname_get_localpart = %s",
mep);
if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0 ||
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Fri Mar 30 12:24:00 2007
@@ -1,6 +1,6 @@
#include "axis2_libcurl.h"
#include <axiom_soap.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <axiom_output.h>
#include <axis2_op_ctx.h>
@@ -8,8 +8,8 @@
#include <axis2_conf_ctx.h>
#include <axis2_http_client.h>
#include <axiom_xml_writer.h>
-#include <axis2_property.h>
-#include <axis2_param.h>
+#include <axutil_property.h>
+#include <axutil_param.h>
#include <axis2_types.h>
#include <axutil_generic_obj.h>
#include <axis2_const.h>
@@ -71,7 +71,7 @@
axis2_bool_t doing_mtom = AXIS2_FALSE;
axiom_node_t *body_node = NULL;
axiom_node_t *data_out = NULL;
- axis2_property_t *method = NULL;
+ axutil_property_t *method = NULL;
axis2_char_t *method_value = NULL;
axiom_xml_writer_t *xml_writer = NULL;
axis2_char_t *buffer = NULL;
@@ -82,9 +82,9 @@
axis2_char_t *content = AXIS2_HTTP_HEADER_CONTENT_TYPE_;
axis2_char_t *soap_action_header = AXIS2_HTTP_HEADER_SOAP_ACTION_;
axis2_libcurl_t *data;
- axis2_stream_t *in_stream;
- axis2_property_t *trans_in_property;
- axis2_string_t *char_set_enc_str;
+ axutil_stream_t *in_stream;
+ axutil_property_t *trans_in_property;
+ axutil_string_t *char_set_enc_str;
axis2_byte_t *output_stream = NULL;
int output_stream_size = 0;
@@ -126,12 +126,12 @@
}
data_out = AXIOM_NODE_GET_FIRST_ELEMENT(body_node, env);
- method = (axis2_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
+ method = (axutil_property_t *) axis2_msg_ctx_get_property(msg_ctx, env,
AXIS2_HTTP_METHOD);
if (method)
{
- method_value = (axis2_char_t *) axis2_property_get_value (method, env);
+ method_value = (axis2_char_t *) axutil_property_get_value (method, env);
}
/* The default is POST */
if (method_value && 0 == axis2_strcmp(method_value, AXIS2_HTTP_HEADER_GET))
@@ -152,7 +152,7 @@
}
else
{
- char_set_enc = axis2_string_get_buffer(char_set_enc_str, env);
+ char_set_enc = axutil_string_get_buffer(char_set_enc_str, env);
}
if (is_soap)
@@ -236,18 +236,18 @@
}
else
{
- axis2_property_t *content_type_property = NULL;
+ axutil_property_t *content_type_property = NULL;
axutil_hash_t *content_type_hash = NULL;
axis2_char_t *content_type_value = NULL;
AXIOM_NODE_SERIALIZE(data_out, env, om_output);
- content_type_property = (axis2_property_t *) axis2_msg_ctx_get_property(
+ content_type_property = (axutil_property_t *) axis2_msg_ctx_get_property(
msg_ctx, env,
AXIS2_USER_DEFINED_HTTP_HEADER_CONTENT_TYPE);
if (content_type_property)
{
- content_type_hash = (axutil_hash_t *) axis2_property_get_value (content_type_property, env);
+ content_type_hash = (axutil_hash_t *) axutil_property_get_value (content_type_property, env);
if (content_type_hash)
content_type_value = (char *) axutil_hash_get (content_type_hash,
AXIS2_HTTP_HEADER_CONTENT_TYPE,
@@ -306,11 +306,11 @@
/* curl_slist_free_all (headers); */
/* curl_easy_cleanup (handler); */
- in_stream = axis2_stream_create_libcurl (env, data->memory, data->size);
- trans_in_property = axis2_property_create(env);
- axis2_property_set_scope(trans_in_property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_free_func(trans_in_property, env, axis2_stream_free_void_arg);
- axis2_property_set_value(trans_in_property, env, in_stream);
+ in_stream = axutil_stream_create_libcurl (env, data->memory, data->size);
+ trans_in_property = axutil_property_create(env);
+ axutil_property_set_scope(trans_in_property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_free_func(trans_in_property, env, axutil_stream_free_void_arg);
+ axutil_property_set_value(trans_in_property, env, in_stream);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, trans_in_property);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.h Fri Mar 30 12:24:00 2007
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <string.h>
#include <axis2_http_sender.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_types.h>
#include <axutil_generic_obj.h>
#include <axis2_const.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c Fri Mar 30 12:24:00 2007
@@ -3,8 +3,8 @@
typedef struct libcurl_stream_impl
{
- axis2_stream_t stream;
- axis2_stream_type_t stream_type;
+ axutil_stream_t stream;
+ axutil_stream_type_t stream_type;
axis2_char_t *buffer;
int size;
int read_len;
@@ -16,45 +16,45 @@
/********************************Function headers******************************/
axis2_status_t AXIS2_CALL
libcurl_stream_free(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
libcurl_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
int AXIS2_CALL
libcurl_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buffer,
size_t count);
int AXIS2_CALL
libcurl_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count);
int AXIS2_CALL
libcurl_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count);
int AXIS2_CALL
libcurl_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
/************************* End of function headers ****************************/
/*
* Internal function. Not exposed to outside
*/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_libcurl(
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_libcurl(
const axutil_env_t *env,
axis2_char_t *buffer,
unsigned int size)
@@ -77,9 +77,9 @@
stream_impl->read_len = 0;
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
- axis2_stream_set_read(stream_impl, env, libcurl_stream_read);
- axis2_stream_set_write(stream_impl, env, libcurl_stream_write);
- axis2_stream_set_skip(stream_impl, env, libcurl_stream_skip);
+ axutil_stream_set_read(stream_impl, env, libcurl_stream_read);
+ axutil_stream_set_write(stream_impl, env, libcurl_stream_write);
+ axutil_stream_set_skip(stream_impl, env, libcurl_stream_skip);
return &(stream_impl->stream);
}
@@ -87,7 +87,7 @@
void AXIS2_CALL
libcurl_stream_free(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
libcurl_stream_impl_t *stream_impl = NULL;
@@ -105,7 +105,7 @@
int AXIS2_CALL
libcurl_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count)
@@ -153,7 +153,7 @@
int AXIS2_CALL
libcurl_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buffer,
size_t count)
@@ -164,7 +164,7 @@
int AXIS2_CALL
libcurl_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count)
{
@@ -173,7 +173,7 @@
int AXIS2_CALL
libcurl_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
return 0;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h Fri Mar 30 12:24:00 2007
@@ -4,7 +4,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#ifdef __cplusplus
extern "C"
@@ -13,9 +13,9 @@
/** brief Constructor for creating apche2 stream
- * @return axis2_stream (libcurl)
+ * @return axutil_stream (libcurl)
*/
- AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_libcurl
+ AXIS2_EXTERN axutil_stream_t * AXIS2_CALL axutil_stream_create_libcurl
(const axutil_env_t *env, axis2_char_t *buffer, unsigned int size);
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/sender_util.c Fri Mar 30 12:24:00 2007
@@ -1,4 +1,4 @@
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <string.h>
#include <axiom_output.h>
@@ -7,8 +7,8 @@
#include <axis2_conf_ctx.h>
#include <axis2_http_client.h>
#include <axiom_xml_writer.h>
-#include <axis2_property.h>
-#include <axis2_param.h>
+#include <axutil_property.h>
+#include <axutil_param.h>
#include <axis2_types.h>
#include <axutil_generic_obj.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c Fri Mar 30 12:24:00 2007
@@ -29,8 +29,8 @@
struct ssl_stream_impl
{
- axis2_stream_t stream;
- axis2_stream_type_t stream_type;
+ axutil_stream_t stream;
+ axutil_stream_type_t stream_type;
SSL *ssl;
SSL_CTX *ctx;
axis2_socket_t socket;
@@ -40,19 +40,19 @@
void AXIS2_CALL
axis2_ssl_stream_free(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env
);
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
axis2_ssl_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env
);
int AXIS2_CALL
axis2_ssl_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buffer,
size_t count
@@ -60,7 +60,7 @@
int AXIS2_CALL
axis2_ssl_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count
@@ -68,20 +68,20 @@
int AXIS2_CALL
axis2_ssl_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count
);
int AXIS2_CALL
axis2_ssl_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env
);
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_ssl(
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_ssl(
const axutil_env_t *env,
axis2_socket_t socket,
axis2_char_t *server_cert,
@@ -109,7 +109,7 @@
key_file, ssl_pp);
if (! stream_impl->ctx)
{
- axis2_ssl_stream_free((axis2_stream_t*)stream_impl, env);
+ axis2_ssl_stream_free((axutil_stream_t*)stream_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SSL_ENGINE, AXIS2_FAILURE);
return NULL;
}
@@ -122,16 +122,16 @@
}
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
- axis2_stream_set_read(stream_impl, env, axis2_ssl_stream_read);
- axis2_stream_set_write(stream_impl, env, axis2_ssl_stream_write);
- axis2_stream_set_skip(stream_impl, env, axis2_ssl_stream_skip);
+ axutil_stream_set_read(stream_impl, env, axis2_ssl_stream_read);
+ axutil_stream_set_write(stream_impl, env, axis2_ssl_stream_write);
+ axutil_stream_set_skip(stream_impl, env, axis2_ssl_stream_skip);
return &(stream_impl->stream);
}
void AXIS2_CALL
-axis2_ssl_stream_free(axis2_stream_t *stream,
+axis2_ssl_stream_free(axutil_stream_t *stream,
const axutil_env_t *env)
{
ssl_stream_impl_t *stream_impl = NULL;
@@ -150,7 +150,7 @@
int AXIS2_CALL
axis2_ssl_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count
@@ -187,7 +187,7 @@
int AXIS2_CALL
axis2_ssl_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buf,
size_t count
@@ -216,7 +216,7 @@
int AXIS2_CALL
axis2_ssl_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count
)
@@ -242,7 +242,7 @@
int AXIS2_CALL
axis2_ssl_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env
)
{
@@ -253,9 +253,9 @@
return ret;
}
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
axis2_ssl_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env
)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.h Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <openssl/ssl.h>
@@ -31,10 +31,10 @@
/** \brief Constructor for creating ssl stream
- * @return axis2_stream (ssl)
+ * @return axutil_stream (ssl)
*/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_ssl(
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_ssl(
const axutil_env_t *env,
axis2_socket_t socket,
axis2_char_t *server_cert,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c Fri Mar 30 12:24:00 2007
@@ -16,9 +16,9 @@
*/
#include "axis2_iis_out_transport_info.h"
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include "axis2_iis_constants.h"
/**
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c Fri Mar 30 12:24:00 2007
@@ -27,8 +27,8 @@
typedef struct iis_stream_impl
{
- axis2_stream_t stream;
- axis2_stream_type_t stream_type;
+ axutil_stream_t stream;
+ axutil_stream_type_t stream_type;
LPEXTENSION_CONTROL_BLOCK lpECB;
unsigned int cur_pos;
void *cur_position;
@@ -38,39 +38,39 @@
#define AXIS2_INTF_TO_IMPL(stream) ((iis_stream_impl_t *)(stream))
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
iis_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
int AXIS2_CALL
iis_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buffer,
size_t count);
int AXIS2_CALL
iis_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count);
int AXIS2_CALL
iis_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count);
int AXIS2_CALL
iis_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
-axis2_stream_t * AXIS2_CALL
-axis2_stream_create_iis(
+axutil_stream_t * AXIS2_CALL
+axutil_stream_create_iis(
const axutil_env_t *env,
LPEXTENSION_CONTROL_BLOCK lpECB)
{
@@ -91,16 +91,16 @@
stream_impl->lpECB = lpECB;
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
- axis2_stream_set_read(&(stream_impl->stream), env, iis_stream_read);
- axis2_stream_set_write(&(stream_impl->stream), env, iis_stream_write);
- axis2_stream_set_skip(&(stream_impl->stream), env, iis_stream_skip);
+ axutil_stream_set_read(&(stream_impl->stream), env, iis_stream_read);
+ axutil_stream_set_write(&(stream_impl->stream), env, iis_stream_write);
+ axutil_stream_set_skip(&(stream_impl->stream), env, iis_stream_skip);
return &(stream_impl->stream);
}
int AXIS2_CALL
iis_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count)
@@ -171,7 +171,7 @@
int AXIS2_CALL
iis_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buf,
size_t count)
@@ -199,7 +199,7 @@
int AXIS2_CALL
iis_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count)
{
@@ -268,7 +268,7 @@
int AXIS2_CALL
iis_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
int ret = -1;
@@ -277,9 +277,9 @@
return ret;
}
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
iis_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.h Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <httpext.h>
#ifdef __cplusplus
@@ -31,9 +31,9 @@
/** brief Constructor for creating IIS stream
- * @return axis2_stream (IIS)
+ * @return axutil_stream (IIS)
*/
-axis2_stream_t * AXIS2_CALL axis2_stream_create_iis
+axutil_stream_t * AXIS2_CALL axutil_stream_create_iis
(const axutil_env_t *env,
LPEXTENSION_CONTROL_BLOCK lpECB);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_http_transport.h>
#include <axis2_conf.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_msg_ctx.h>
#include <axis2_http_out_transport_info.h>
#include <axis2_http_transport_utils.h>
@@ -68,7 +68,7 @@
axis2_char_t *AXIS2_CALL
axis2_iis_worker_get_bytes(
const axutil_env_t *env,
- axis2_stream_t *stream);
+ axutil_stream_t *stream);
void AXIS2_CALL
axis2_iis_worker_free(
@@ -160,8 +160,8 @@
axis2_iis_worker_impl_t *iis_worker_impl = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
- axis2_stream_t *request_body = NULL;
- axis2_stream_t *out_stream = NULL;
+ axutil_stream_t *request_body = NULL;
+ axutil_stream_t *out_stream = NULL;
axis2_transport_out_desc_t *out_desc = NULL;
axis2_transport_in_desc_t *in_desc = NULL;
axis2_bool_t processed = AXIS2_FALSE;
@@ -170,14 +170,14 @@
//axis2_char_t *req_url = NULL;
axis2_char_t *body_string = NULL;
int send_status = -1;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
axis2_url_t *url = NULL;
axis2_http_out_transport_info_t *iis_out_transport_info = NULL;
- axis2_qname_t *transport_qname = NULL;
+ axutil_qname_t *transport_qname = NULL;
axis2_char_t *ctx_uuid = NULL;
axis2_char_t soap_action[INTERNET_MAX_URL_LENGTH];
- axis2_string_t *soap_str_action = NULL;
+ axutil_string_t *soap_str_action = NULL;
axis2_char_t original_url[INTERNET_MAX_URL_LENGTH];
axis2_char_t req_url[INTERNET_MAX_URL_LENGTH];
@@ -227,7 +227,7 @@
// create the url using the above variables
sprintf(req_url, "%s%s%s%s", "http", server_name, port, original_url);
- out_stream = axis2_stream_create_basic(env);
+ out_stream = axutil_stream_create_basic(env);
out_desc = axis2_conf_get_transport_out( axis2_conf_ctx_get_conf
(iis_worker_impl->conf_ctx, env), env,
@@ -244,9 +244,9 @@
ctx_uuid = axis2_uuid_gen(env);
if (ctx_uuid)
{
- axis2_string_t *uuid_str = axis2_string_create_assume_ownership(env, &ctx_uuid);
+ axutil_string_t *uuid_str = axutil_string_create_assume_ownership(env, &ctx_uuid);
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, uuid_str);
- axis2_string_free(uuid_str, env);
+ axutil_string_free(uuid_str, env);
}
iis_out_transport_info = axis2_iis_out_transport_info_create(env, lpECB);
@@ -255,9 +255,9 @@
cbSize = INTERNET_MAX_URL_LENGTH;
if (lpECB->GetServerVariable(lpECB->ConnID, "HTTP_SOAPAction", soap_action, &cbSize))
{
- soap_str_action = axis2_string_create(env, soap_action);
+ soap_str_action = axutil_string_create(env, soap_action);
}
- request_body = axis2_stream_create_iis(env, lpECB);
+ request_body = axutil_stream_create_iis(env, lpECB);
if (! request_body)
{
@@ -313,7 +313,7 @@
axis2_engine_send_fault(engine, env, fault_ctx);
if (out_stream)
{
- body_string = axis2_stream_get_buffer(out_stream, env);
+ body_string = axutil_stream_get_buffer(out_stream, env);
body_str_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
@@ -328,7 +328,7 @@
{
if (out_stream)
{
- body_string = axis2_stream_get_buffer(out_stream, env);
+ body_string = axutil_stream_get_buffer(out_stream, env);
body_str_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
send_status = OK;
@@ -561,17 +561,17 @@
axis2_char_t *AXIS2_CALL
axis2_iis_worker_get_bytes(
const axutil_env_t *env,
- axis2_stream_t *stream)
+ axutil_stream_t *stream)
{
- axis2_stream_t *tmp_stream = NULL;
+ axutil_stream_t *tmp_stream = NULL;
int return_size = -1;
axis2_char_t *buffer = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, stream, NULL);
- tmp_stream = axis2_stream_create_basic(env);
+ tmp_stream = axutil_stream_create_basic(env);
while (1)
{
int read = 0;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Fri Mar 30 12:24:00 2007
@@ -16,9 +16,9 @@
*/
#include "axis2_apache2_out_transport_info.h"
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <apr_strings.h>
typedef struct axis2_apache2_out_transport_info
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c Fri Mar 30 12:24:00 2007
@@ -22,45 +22,45 @@
typedef struct apache2_stream_impl
{
- axis2_stream_t stream;
- axis2_stream_type_t stream_type;
+ axutil_stream_t stream;
+ axutil_stream_type_t stream_type;
request_rec *request;
}apache2_stream_impl_t;
#define AXIS2_INTF_TO_IMPL(stream) ((apache2_stream_impl_t *)(stream))
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
apache2_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
int AXIS2_CALL
apache2_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buffer,
size_t count);
int AXIS2_CALL
apache2_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count);
int AXIS2_CALL
apache2_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count);
int AXIS2_CALL
apache2_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env);
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
-axis2_stream_create_apache2(
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL
+axutil_stream_create_apache2(
const axutil_env_t *env,
request_rec *request)
{
@@ -80,16 +80,16 @@
stream_impl->request = request;
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
- axis2_stream_set_read(&(stream_impl->stream), env, apache2_stream_read);
- axis2_stream_set_write(&(stream_impl->stream), env, apache2_stream_write);
- axis2_stream_set_skip(&(stream_impl->stream), env, apache2_stream_skip);
+ axutil_stream_set_read(&(stream_impl->stream), env, apache2_stream_read);
+ axutil_stream_set_write(&(stream_impl->stream), env, apache2_stream_write);
+ axutil_stream_set_skip(&(stream_impl->stream), env, apache2_stream_skip);
return &(stream_impl->stream);
}
int AXIS2_CALL
apache2_stream_read(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
void *buffer,
size_t count)
@@ -103,7 +103,7 @@
int AXIS2_CALL
apache2_stream_write(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
const void *buf,
size_t count)
@@ -125,7 +125,7 @@
int AXIS2_CALL
apache2_stream_skip(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env,
int count)
{
@@ -150,7 +150,7 @@
int AXIS2_CALL
apache2_stream_get_char(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
int ret = -1;
@@ -160,9 +160,9 @@
return ret;
}
-axis2_stream_type_t AXIS2_CALL
+axutil_stream_type_t AXIS2_CALL
apache2_stream_get_type(
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.h Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <httpd.h>
#ifdef __cplusplus
@@ -30,9 +30,9 @@
/** \brief Constructor for creating apche2 stream
- * @return axis2_stream (apache2)
+ * @return axutil_stream (apache2)
*/
-AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_apache2
+AXIS2_EXTERN axutil_stream_t * AXIS2_CALL axutil_stream_create_apache2
(const axutil_env_t *env, request_rec *req);
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include "axis2_apache2_worker.h"
#include <axis2_http_transport.h>
#include <axis2_conf.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_msg_ctx.h>
#include <axis2_http_out_transport_info.h>
#include <axis2_http_transport_utils.h>
@@ -53,7 +53,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_apache2_worker_get_bytes(
const axutil_env_t *env,
- axis2_stream_t *stream);
+ axutil_stream_t *stream);
void AXIS2_CALL
axis2_apache2_worker_free(
@@ -133,12 +133,12 @@
axis2_apache2_worker_impl_t *apache2_worker_impl = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
- axis2_stream_t *request_body = NULL;
- axis2_stream_t *out_stream = NULL;
+ axutil_stream_t *request_body = NULL;
+ axutil_stream_t *out_stream = NULL;
axis2_transport_out_desc_t *out_desc = NULL;
axis2_transport_in_desc_t *in_desc = NULL;
axis2_char_t *http_version = NULL;
- axis2_string_t *soap_action = NULL;
+ axutil_string_t *soap_action = NULL;
axis2_bool_t processed = AXIS2_FALSE;
int content_length = -1;
axis2_char_t *encoding_header_value = NULL;
@@ -180,7 +180,7 @@
AXIS2_FAILURE);
return AXIS2_CRITICAL_FAILURE;
}
- out_stream = axis2_stream_create_basic(env);
+ out_stream = axutil_stream_create_basic(env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s",
http_version);
@@ -201,19 +201,19 @@
ctx_uuid = axis2_uuid_gen(env);
if (ctx_uuid)
{
- axis2_string_t *uuid_str = axis2_string_create_assume_ownership(env, &ctx_uuid);
+ axutil_string_t *uuid_str = axutil_string_create_assume_ownership(env, &ctx_uuid);
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, uuid_str);
- axis2_string_free(uuid_str, env);
+ axutil_string_free(uuid_str, env);
}
apache2_out_transport_info = axis2_apache2_out_transport_info_create(env,
request);
axis2_msg_ctx_set_http_out_transport_info(msg_ctx, env, apache2_out_transport_info);
- soap_action = axis2_string_create(env,
+ soap_action = axutil_string_create(env,
(axis2_char_t *)apr_table_get(request->headers_in,
AXIS2_HTTP_HEADER_SOAP_ACTION));
- request_body = axis2_stream_create_apache2(env, request);
+ request_body = axutil_stream_create_apache2(env, request);
if (! request_body)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
@@ -262,7 +262,7 @@
axis2_engine_send_fault(engine, env, fault_ctx);
if (out_stream)
{
- body_string = axis2_stream_get_buffer(out_stream, env);
+ body_string = axutil_stream_get_buffer(out_stream, env);
body_string_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
send_status = HTTP_INTERNAL_SERVER_ERROR;
@@ -277,7 +277,7 @@
send_status = OK;
if (out_stream)
{
- body_string = axis2_stream_get_buffer(out_stream, env);
+ body_string = axutil_stream_get_buffer(out_stream, env);
body_string_len = AXIS2_STREAM_BASIC_GET_LEN(out_stream, env);
}
}
@@ -300,7 +300,7 @@
request_body = NULL;
}
- axis2_string_free(soap_action, env);
+ axutil_string_free(soap_action, env);
msg_ctx = NULL;
return send_status;
@@ -309,17 +309,17 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_apache2_worker_get_bytes(
const axutil_env_t *env,
- axis2_stream_t *stream)
+ axutil_stream_t *stream)
{
- axis2_stream_t *tmp_stream = NULL;
+ axutil_stream_t *tmp_stream = NULL;
int return_size = -1;
axis2_char_t *buffer = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, stream, NULL);
- tmp_stream = axis2_stream_create_basic(env);
+ tmp_stream = axutil_stream_create_basic(env);
while (1)
{
int read = 0;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c Fri Mar 30 12:24:00 2007
@@ -16,14 +16,14 @@
*/
#include <axis2_http_chunked_stream.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <string.h>
#include <axis2_http_transport.h>
#include <stdlib.h>
struct axis2_http_chunked_stream
{
- axis2_stream_t *stream;
+ axutil_stream_t *stream;
int current_chunk_size;
int unread_len;
axis2_bool_t end_of_chunks;
@@ -38,7 +38,7 @@
AXIS2_EXTERN axis2_http_chunked_stream_t *AXIS2_CALL
axis2_http_chunked_stream_create(
const axutil_env_t *env,
- axis2_stream_t *stream)
+ axutil_stream_t *stream)
{
axis2_http_chunked_stream_t *chunked_stream = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -82,7 +82,7 @@
{
int len = -1;
int yet_to_read = 0;
- axis2_stream_t *stream = chunked_stream->stream;
+ axutil_stream_t *stream = chunked_stream->stream;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (! buffer)
@@ -137,7 +137,7 @@
const void *buffer,
size_t count)
{
- axis2_stream_t *stream = chunked_stream->stream;
+ axutil_stream_t *stream = chunked_stream->stream;
int len = -1;
axis2_char_t tmp_buf[10];
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -225,7 +225,7 @@
axis2_http_chunked_stream_t *chunked_stream,
const axutil_env_t *env)
{
- axis2_stream_t *stream = NULL;
+ axutil_stream_t *stream = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
stream = chunked_stream->stream;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include <ctype.h>
#include <axis2_conf.h>
#include <axis2_op.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_http_transport.h>
#include <axiom_soap_builder.h>
#include <axis2_engine.h>
@@ -31,7 +31,7 @@
#include <axutil_hash.h>
#include <axiom_soap_const.h>
#include <axis2_http_header.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axis2_utils.h>
#include <axiom_mime_parser.h>
#include <axis2_disp.h>
@@ -46,21 +46,21 @@
axis2_http_transport_utils_process_http_post_request(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
- axis2_stream_t *out_stream,
+ axutil_stream_t *in_stream,
+ axutil_stream_t *out_stream,
const axis2_char_t *content_type,
const int content_length,
- axis2_string_t *soap_action_header,
+ axutil_string_t *soap_action_header,
const axis2_char_t *request_uri);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_process_http_get_request(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
- axis2_stream_t *out_stream,
+ axutil_stream_t *in_stream,
+ axutil_stream_t *out_stream,
const axis2_char_t *content_type,
- axis2_string_t *soap_action_header,
+ axutil_string_t *soap_action_header,
const axis2_char_t *request_uri,
axis2_conf_ctx_t *conf_ctx,
axutil_hash_t *request_params);
@@ -70,7 +70,7 @@
const axutil_env_t *env,
axis2_char_t *request_uri,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
+ axutil_stream_t *in_stream,
axis2_char_t *content_type);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
@@ -108,7 +108,7 @@
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_http_transport_utils_get_charset_enc(
const axutil_env_t *env,
const axis2_char_t *content_type);
@@ -157,11 +157,11 @@
axis2_http_transport_utils_process_http_post_request(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
- axis2_stream_t *out_stream,
+ axutil_stream_t *in_stream,
+ axutil_stream_t *out_stream,
const axis2_char_t *content_type,
const int content_length,
- axis2_string_t *soap_action_header,
+ axutil_string_t *soap_action_header,
const axis2_char_t *request_uri)
{
axiom_soap_envelope_t *soap_envelope = NULL;
@@ -169,7 +169,7 @@
axiom_stax_builder_t *om_builder = NULL;
axis2_bool_t is_soap11 = AXIS2_FALSE;
axiom_xml_reader_t *xml_reader = NULL;
- axis2_string_t *char_set_str = NULL;
+ axutil_string_t *char_set_str = NULL;
/*axis2_char_t *xml_char_set = NULL;*/
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_callback_info_t *callback_ctx;
@@ -179,11 +179,11 @@
axis2_status_t status = AXIS2_FAILURE;
axutil_hash_t *binary_data_map = NULL;
axis2_char_t *soap_body_str = NULL;
- axis2_stream_t *stream = NULL;
+ axutil_stream_t *stream = NULL;
axis2_bool_t do_rest = AXIS2_FALSE;
axis2_char_t *soap_action = NULL;
unsigned int soap_action_len = 0;
- axis2_property_t *http_error_property = NULL;
+ axutil_property_t *http_error_property = NULL;
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_stream, AXIS2_FAILURE);
@@ -202,8 +202,8 @@
callback_ctx->unread_len = content_length;
callback_ctx->chunked_stream = NULL;
- soap_action = (axis2_char_t*)axis2_string_get_buffer(soap_action_header, env);
- soap_action_len = axis2_string_get_length(soap_action_header, env);
+ 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))
{
@@ -288,7 +288,7 @@
mime_parser, env);
}
- stream = axis2_stream_create_basic(env);
+ stream = axutil_stream_create_basic(env);
if (stream)
{
AXIS2_STREAM_WRITE(stream, env, soap_body_str, soap_body_len);
@@ -315,7 +315,7 @@
char_set_str = axis2_http_transport_utils_get_charset_enc(env, content_type);
xml_reader = axiom_xml_reader_create_for_io(env,
axis2_http_transport_utils_on_data_request, NULL,
- (void *) callback_ctx, axis2_string_get_buffer(char_set_str, env));
+ (void *) callback_ctx, axutil_string_get_buffer(char_set_str, env));
if (! xml_reader)
{
@@ -399,18 +399,18 @@
}
else
{
- http_error_property = axis2_property_create(env);
- axis2_property_set_value(http_error_property, env, AXIS2_HTTP_UNSUPPORTED_MEDIA_TYPE);
+ http_error_property = axutil_property_create(env);
+ axutil_property_set_value(http_error_property, env, AXIS2_HTTP_UNSUPPORTED_MEDIA_TYPE);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_TRANSPORT_ERROR, http_error_property);
}
if (do_rest)
{
/* REST support */
- axis2_param_t *rest_param = axis2_msg_ctx_get_parameter(msg_ctx, env
+ axutil_param_t *rest_param = axis2_msg_ctx_get_parameter(msg_ctx, env
, AXIS2_ENABLE_REST);
if (rest_param && 0 == axis2_strcmp(AXIS2_VALUE_TRUE,
- axis2_param_get_value(rest_param, env)))
+ axutil_param_get_value(rest_param, env)))
{
/* TODO we have to check for NULLs */
axiom_soap_body_t *def_body = NULL;
@@ -503,7 +503,7 @@
if(char_set_str)
{
- axis2_string_free(char_set_str, env);
+ axutil_string_free(char_set_str, env);
}
return status;
@@ -514,10 +514,10 @@
axis2_http_transport_utils_process_http_get_request(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
- axis2_stream_t *out_stream,
+ axutil_stream_t *in_stream,
+ axutil_stream_t *out_stream,
const axis2_char_t *content_type,
- axis2_string_t *soap_action_header,
+ axutil_string_t *soap_action_header,
const axis2_char_t *request_uri,
axis2_conf_ctx_t *conf_ctx,
axutil_hash_t *request_params)
@@ -573,7 +573,7 @@
const axutil_env_t *env,
axis2_char_t *request_uri,
axis2_msg_ctx_t *msg_ctx,
- axis2_stream_t *in_stream,
+ axutil_stream_t *in_stream,
axis2_char_t *content_type)
{
/*
@@ -598,8 +598,8 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- /*axis2_property_t *property = NULL;
- axis2_param_t *param = NULL;
+ /*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);
@@ -608,12 +608,12 @@
/*param = axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_ENABLE_MTOM);
if (param)
- value = axis2_param_get_value(param, env);
+ 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 *)axis2_property_get_value(property, env);
+ value = (axis2_char_t *)axutil_property_get_value(property, env);
if (value)
{
@@ -788,7 +788,7 @@
hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, NULL, NULL, &service);
- sname = axis2_qname_get_localpart(axis2_svc_get_qname(
+ sname = axutil_qname_get_localpart(axis2_svc_get_qname(
((axis2_svc_t *)service), env), env);
ret = axis2_stracat(env, tmp2, "<h3><u>");
tmp2 = ret;
@@ -819,7 +819,7 @@
hi2 = axutil_hash_next(env, hi2))
{
axutil_hash_this(hi2, NULL, NULL, &op);
- oname = axis2_qname_get_localpart(axis2_op_get_qname(
+ oname = axutil_qname_get_localpart(axis2_op_get_qname(
((axis2_op_t *)op), env), env);
ret = axis2_stracat(env, tmp2, "<li>");
AXIS2_FREE(env->allocator, tmp2);
@@ -883,7 +883,7 @@
return ret;
}
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_http_transport_utils_get_charset_enc(
const axutil_env_t *env,
const axis2_char_t *content_type)
@@ -891,7 +891,7 @@
axis2_char_t *tmp = NULL;
axis2_char_t *tmp_content_type = NULL;
axis2_char_t *tmp2 = NULL;
- axis2_string_t *str = NULL;
+ axutil_string_t *str = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, content_type, NULL);
@@ -899,7 +899,7 @@
tmp_content_type = (axis2_char_t *)content_type;
if (!tmp_content_type)
{
- return axis2_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
+ return axutil_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
}
tmp = strstr(tmp_content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
@@ -945,11 +945,11 @@
if (tmp)
{
- str = axis2_string_create(env, tmp);
+ str = axutil_string_create(env, tmp);
}
else
{
- str = axis2_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
+ str = axutil_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
}
return str;
}
@@ -982,9 +982,9 @@
}
else
{
- axis2_stream_t *in_stream = NULL;
+ axutil_stream_t *in_stream = NULL;
int read_len = size;
- in_stream = (axis2_stream_t *)((axis2_callback_info_t *)ctx)->in_stream;
+ in_stream = (axutil_stream_t *)((axis2_callback_info_t *)ctx)->in_stream;
/* For managed streams such as Apache2 streams we do not need to
* calculate lenghts
*/
@@ -1027,11 +1027,11 @@
axis2_op_ctx_t *op_ctx = NULL;
const axis2_char_t *char_set_enc = NULL;
axis2_char_t *content_type = NULL;
- axis2_stream_t *in_stream = NULL;
+ axutil_stream_t *in_stream = NULL;
axis2_callback_info_t *callback_ctx = NULL;
axis2_char_t *trans_enc = NULL;
int *content_length = NULL;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
axutil_hash_t *binary_data_map = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -1043,7 +1043,7 @@
AXIS2_TRANSPORT_IN);
if (property)
{
- in_stream = axis2_property_get_value(property, env);
+ in_stream = axutil_property_get_value(property, env);
property = NULL;
}
callback_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_callback_info_t));
@@ -1064,7 +1064,7 @@
AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if (property)
{
- content_length = axis2_property_get_value(property, env);
+ content_length = axutil_property_get_value(property, env);
property = NULL;
}
if (content_length)
@@ -1104,14 +1104,14 @@
AXIS2_CHARACTER_SET_ENCODING);
if (property)
{
- char_set_enc = axis2_property_get_value(property, env);
+ char_set_enc = axutil_property_get_value(property, env);
property = NULL;
}
property = axis2_ctx_get_property(ctx, env,
MTOM_RECIVED_CONTENT_TYPE);
if (property)
{
- content_type = axis2_property_get_value(property, env);
+ content_type = axutil_property_get_value(property, env);
property = NULL;
}
@@ -1131,7 +1131,7 @@
if (mime_boundary)
{
axiom_mime_parser_t *mime_parser = NULL;
- axis2_stream_t *stream = NULL;
+ axutil_stream_t *stream = NULL;
int soap_body_len = 0;
axis2_char_t *soap_body_str = NULL;
@@ -1148,7 +1148,7 @@
mime_parser, env);
}
- stream = axis2_stream_create_basic(env);
+ stream = axutil_stream_create_basic(env);
if (stream)
{
AXIS2_STREAM_WRITE(stream, env, soap_body_str, soap_body_len);
@@ -1360,13 +1360,13 @@
else
{
axis2_char_t *target_ns = NULL;
- axis2_qname_t *bfc_qname = NULL;
+ axutil_qname_t *bfc_qname = NULL;
axiom_element_t *body_child = NULL;
axiom_node_t *body_child_node = NULL;
- target_ns = axis2_qname_get_uri(XML_SCHEMA_ELEMENT_GET_QNAME(
+ target_ns = axutil_qname_get_uri(XML_SCHEMA_ELEMENT_GET_QNAME(
schema_element, env), env);
- bfc_qname = axis2_qname_create(env, XML_SCHEMA_ELEMENT_GET_NAME(
+ bfc_qname = axutil_qname_create(env, XML_SCHEMA_ELEMENT_GET_NAME(
schema_element, env), target_ns, NULL);
body_child = axiom_element_create_with_qname(env, NULL, bfc_qname,
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Fri Mar 30 12:24:00 2007
@@ -16,13 +16,13 @@
*/
#include <axis2_core_utils.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_conf.h>
#include <axis2_relates_to.h>
#include <axis2_addr.h>
#include <axis2_http_transport.h>
#include <axis2_uuid_gen.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axis2_conf_ctx.h>
AXIS2_EXTERN axis2_msg_ctx_t * AXIS2_CALL
@@ -50,7 +50,7 @@
axis2_bool_t server_side = AXIS2_FALSE;
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
axis2_char_t *msg_uuid = NULL;
- axis2_stream_t *out_stream = NULL;
+ axutil_stream_t *out_stream = NULL;
AXIS2_PARAM_CHECK(env->error, in_msg_ctx, NULL);
@@ -174,12 +174,12 @@
return;
}
-AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
+AXIS2_EXTERN axutil_qname_t* AXIS2_CALL
axis2_core_utils_get_module_qname(const axutil_env_t *env,
const axis2_char_t *name,
const axis2_char_t *version)
{
- axis2_qname_t *ret_qname = NULL;
+ axutil_qname_t *ret_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
@@ -199,12 +199,12 @@
mod_name1 = NULL;
return NULL;
}
- ret_qname = axis2_qname_create(env, mod_name, NULL, NULL);
+ ret_qname = axutil_qname_create(env, mod_name, NULL, NULL);
AXIS2_FREE(env->allocator, mod_name);
AXIS2_FREE(env->allocator, mod_name1);
return ret_qname;
}
- ret_qname = axis2_qname_create(env, name, NULL, NULL);
+ ret_qname = axutil_qname_create(env, name, NULL, NULL);
return ret_qname;
}
@@ -234,12 +234,12 @@
mod_desc = (axis2_module_desc_t *) val;
if (mod_desc)
{
- const axis2_qname_t *module_qname = NULL;
+ const axutil_qname_t *module_qname = NULL;
module_qname = axis2_module_desc_get_qname(mod_desc, env);
if (module_qname)
{
axis2_char_t *mod_name_with_ver = NULL;
- mod_name_with_ver = axis2_qname_get_localpart(module_qname, env);
+ mod_name_with_ver = axutil_qname_get_localpart(module_qname, env);
if (mod_name_with_ver)
{
axis2_char_t *module_name_str = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Fri Mar 30 12:24:00 2007
@@ -27,7 +27,7 @@
#include <axis2_msg_ctx.h>
#include <axis2_conf_ctx.h>
#include <axis2_msg_info_headers.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
axis2_status_t AXIS2_CALL
axis2_addr_in_handler_invoke(struct axis2_handler *handler,
@@ -35,8 +35,8 @@
struct axis2_msg_ctx *msg_ctx);
axis2_bool_t
-axis2_addr_in_check_element(const axutil_env_t *env, axis2_qname_t *expected_qname,
- axis2_qname_t *actual_qname);
+axis2_addr_in_check_element(const axutil_env_t *env, axutil_qname_t *expected_qname,
+ axutil_qname_t *actual_qname);
axis2_status_t
axis2_addr_in_extract_svc_grp_ctx_id(const axutil_env_t *env,
@@ -92,7 +92,7 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axis2_addr_in_handler_create(const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
axis2_handler_t *handler = NULL;
@@ -121,7 +121,7 @@
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -176,9 +176,9 @@
ctx = axis2_msg_ctx_get_base(msg_ctx, env);
if (ctx)
{
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_value(property, env, addr_ns_str);
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_value(property, env, addr_ns_str);
axis2_ctx_set_property(ctx, env, AXIS2_WSA_VERSION, property);
}
@@ -206,9 +206,9 @@
node = axiom_soap_header_get_base_node(soap_header, env);
if (node && AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- qname = axis2_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI,
+ qname = axutil_qname_create(env, AXIS2_SVC_GRP_ID, AXIS2_NAMESPACE_URI,
AXIS2_NAMESPACE_PREFIX);
if (qname)
{
@@ -223,7 +223,7 @@
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
if (conf_ctx && grp_id)
{
- axis2_string_t *svc_grp_ctx_id_str = axis2_string_create(env, grp_id);
+ axutil_string_t *svc_grp_ctx_id_str = axutil_string_create(env, grp_id);
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)
{
@@ -231,12 +231,12 @@
return AXIS2_FAILURE;
}
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_ctx_id_str);
- axis2_string_free(svc_grp_ctx_id_str, env);
+ axutil_string_free(svc_grp_ctx_id_str, env);
return AXIS2_SUCCESS;
}
}
}
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
}
/** TODO, set error */
return AXIS2_FAILURE;
@@ -451,7 +451,7 @@
else if (axis2_strcmp(ele_localname, AXIS2_WSA_RELATES_TO) == 0)
{
axis2_char_t *address = NULL;
- axis2_qname_t *rqn = NULL;
+ axutil_qname_t *rqn = NULL;
axiom_attribute_t *relationship_type = NULL;
const axis2_char_t *relationship_type_default_value = NULL;
const axis2_char_t *relationship_type_value = NULL;
@@ -465,7 +465,7 @@
{
relationship_type_default_value = AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
}
- rqn = axis2_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL);
+ rqn = axutil_qname_create(env, AXIS2_WSA_RELATES_TO_RELATIONSHIP_TYPE, NULL, NULL);
relationship_type = axiom_element_get_attribute(header_block_ele, env, rqn);
@@ -484,7 +484,7 @@
axis2_msg_info_headers_set_relates_to(msg_info_headers, env, relates_to);
axiom_soap_header_block_set_processed(header_block, env);
- axis2_qname_free(rqn, env);
+ axutil_qname_free(rqn, env);
}
}
@@ -504,9 +504,9 @@
axis2_endpoint_ref_t *endpoint_ref,
const axis2_char_t *addr_ns_str)
{
- axis2_qname_t *epr_addr_qn = NULL;
- axis2_qname_t *epr_ref_qn = NULL;
- axis2_qname_t *wsa_meta_qn = NULL;
+ axutil_qname_t *epr_addr_qn = NULL;
+ axutil_qname_t *epr_ref_qn = NULL;
+ axutil_qname_t *wsa_meta_qn = NULL;
axiom_node_t *header_block_node = NULL;
axiom_element_t *header_block_ele = NULL;
axiom_child_element_iterator_t *child_ele_iter = NULL;
@@ -522,14 +522,14 @@
child_ele_iter = axiom_element_get_child_elements(header_block_ele, env, header_block_node);
if (!child_ele_iter)
return AXIS2_FAILURE;
- epr_addr_qn = axis2_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL);
- epr_ref_qn = axis2_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL);
- wsa_meta_qn = axis2_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL);
+ epr_addr_qn = axutil_qname_create(env, EPR_ADDRESS, addr_ns_str, NULL);
+ epr_ref_qn = axutil_qname_create(env, EPR_REFERENCE_PARAMETERS, addr_ns_str, NULL);
+ wsa_meta_qn = axutil_qname_create(env, AXIS2_WSA_METADATA, addr_ns_str, NULL);
while (AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(child_ele_iter, env))
{
axiom_node_t *child_node = NULL;
axiom_element_t *child_ele = NULL;
- axis2_qname_t *child_qn = NULL;
+ axutil_qname_t *child_qn = NULL;
child_node = AXIOM_CHILD_ELEMENT_ITERATOR_NEXT(child_ele_iter, env);
child_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
@@ -560,9 +560,9 @@
else if (axis2_addr_in_check_element(env, wsa_meta_qn, child_qn))
{}
}
- axis2_qname_free(epr_addr_qn, env);
- axis2_qname_free(epr_ref_qn, env);
- axis2_qname_free(wsa_meta_qn, env);
+ axutil_qname_free(epr_addr_qn, env);
+ axutil_qname_free(epr_ref_qn, env);
+ axutil_qname_free(wsa_meta_qn, env);
return AXIS2_SUCCESS;
}
@@ -573,7 +573,7 @@
{
axutil_hash_t *header_block_ht = NULL;
axutil_hash_index_t *hash_index = NULL;
- axis2_qname_t *wsa_qname = NULL;
+ axutil_qname_t *wsa_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_header, AXIS2_FAILURE);
@@ -582,7 +582,7 @@
header_block_ht = axiom_soap_header_get_all_header_blocks(soap_header, env);
if (!header_block_ht)
return AXIS2_FAILURE;
- wsa_qname = axis2_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
+ wsa_qname = axutil_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
AXIS2_WSA_NAMESPACE, NULL);
for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
@@ -616,7 +616,7 @@
}
}
- axis2_qname_free(wsa_qname, env);
+ axutil_qname_free(wsa_qname, env);
return AXIS2_SUCCESS;
}
@@ -630,7 +630,7 @@
{
axutil_hash_t *header_blocks_ht = NULL;
axutil_hash_index_t *hash_index = NULL;
- axis2_qname_t *is_ref_qn = NULL;
+ axutil_qname_t *is_ref_qn = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, to_epr, AXIS2_FAILURE);
@@ -641,7 +641,7 @@
if (!header_blocks_ht)
return AXIS2_FAILURE;
- is_ref_qn = axis2_qname_create(env, "IsReferenceParameter", addr_ns_str, NULL);
+ is_ref_qn = axutil_qname_create(env, "IsReferenceParameter", addr_ns_str, NULL);
if (!is_ref_qn)
return AXIS2_FAILURE;
@@ -674,15 +674,15 @@
}
}
- axis2_qname_free(is_ref_qn, env);
+ axutil_qname_free(is_ref_qn, env);
return AXIS2_SUCCESS;
}
axis2_bool_t
axis2_addr_in_check_element(const axutil_env_t *env,
- axis2_qname_t *expected_qname,
- axis2_qname_t *actual_qname)
+ axutil_qname_t *expected_qname,
+ axutil_qname_t *actual_qname)
{
axis2_char_t *exp_qn_lpart = NULL;
axis2_char_t *act_qn_lpart = NULL;
@@ -693,11 +693,11 @@
AXIS2_PARAM_CHECK(env->error, expected_qname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, actual_qname, AXIS2_FAILURE);
- exp_qn_lpart = axis2_qname_get_localpart(expected_qname, env);
- act_qn_lpart = axis2_qname_get_localpart(actual_qname, env);
+ exp_qn_lpart = axutil_qname_get_localpart(expected_qname, env);
+ act_qn_lpart = axutil_qname_get_localpart(actual_qname, env);
- exp_qn_nsuri = axis2_qname_get_localpart(expected_qname, env);
- act_qn_nsuri = axis2_qname_get_localpart(actual_qname, env);
+ exp_qn_nsuri = axutil_qname_get_localpart(expected_qname, env);
+ act_qn_nsuri = axutil_qname_get_localpart(actual_qname, env);
return ((axis2_strcmp(exp_qn_lpart, act_qn_lpart) == 0) &&
(axis2_strcmp(exp_qn_nsuri, act_qn_nsuri) == 0));
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Fri Mar 30 12:24:00 2007
@@ -16,14 +16,14 @@
*/
#include <axis2_handler_desc.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_svc.h>
#include <axiom_soap_header.h>
#include <axiom_soap_body.h>
#include <axis2_addr.h>
#include <axiom_soap_header_block.h>
#include <axis2_endpoint_ref.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <stdio.h>
axis2_status_t AXIS2_CALL
@@ -63,16 +63,16 @@
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
-axis2_addr_out_handler_create(const axutil_env_t *env, axis2_string_t * name)
+axis2_addr_out_handler_create(const axutil_env_t *env, axutil_string_t * name)
{
axis2_handler_t *handler = NULL;
- /*axis2_qname_t *handler_qname = NULL;*/
+ /*axutil_qname_t *handler_qname = NULL;*/
AXIS2_ENV_CHECK(env, NULL);
/*if (qname)
{
- handler_qname = axis2_qname_clone(qname, env);
+ handler_qname = axutil_qname_clone(qname, env);
if (!(handler_qname))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
@@ -83,7 +83,7 @@
else
{
create default qname
- handler_qname = axis2_qname_create(env, "addr_out_handler",
+ handler_qname = axutil_qname_create(env, "addr_out_handler",
"http://axis.ws.apache.org",
NULL);
if (!handler_qname)
@@ -102,7 +102,7 @@
if (handler->ops)
handler->ops->invoke = axis2_addr_out_handler_invoke;
- /*axis2_qname_free(handler_qname, env);*/
+ /*axutil_qname_free(handler_qname, env);*/
return handler;
}
@@ -121,7 +121,7 @@
axiom_node_t *soap_header_node = NULL;
axiom_element_t *soap_header_ele = NULL;
axis2_endpoint_ref_t *epr = NULL;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
const axis2_char_t *wsa_action = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -139,7 +139,7 @@
axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION);
if (property)
{
- addressing_version_from_msg_ctx = axis2_property_get_value(property,
+ addressing_version_from_msg_ctx = axutil_property_get_value(property,
env);
property = NULL;
}
@@ -181,7 +181,7 @@
axis2_ctx_get_property(in_ctx, env, AXIS2_WSA_VERSION);
if (property)
{
- addr_ns = axis2_property_get_value(property, env);
+ addr_ns = axutil_property_get_value(property, env);
property = NULL;
}
@@ -326,7 +326,7 @@
/* add the service group id as a reference parameter */
- svc_group_context_id = axis2_string_get_buffer(
+ svc_group_context_id = axutil_string_get_buffer(
axis2_msg_ctx_get_svc_grp_ctx_id(msg_ctx, env), env);
axis2_addr_out_handler_add_to_soap_header(env, epr,
@@ -697,7 +697,7 @@
const axis2_char_t * addr_ns)
{
axiom_node_t *parent_node = NULL;
- const axis2_qname_t *interface_qname = NULL;
+ const axutil_qname_t *interface_qname = NULL;
axiom_node_t *interface_node = NULL;
axiom_element_t *interface_ele = NULL;
const axis2_char_t *element_localname = NULL;
@@ -734,8 +734,8 @@
element_localname,
addr_ns_obj,
&interface_node);
- qname_prefix = axis2_qname_get_prefix(interface_qname, env);
- qname_localpart = axis2_qname_get_localpart(interface_qname, env);
+ qname_prefix = axutil_qname_get_prefix(interface_qname, env);
+ qname_localpart = axutil_qname_get_localpart(interface_qname, env);
text =
AXIS2_MALLOC(env->allocator,
Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
#include <axis2_msg_ctx.h>
#include <axis2_conf_ctx.h>
#include <axis2_msg_info_headers.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
axis2_status_t AXIS2_CALL
axutil_log_in_handler_invoke(struct axis2_handler *handler,
@@ -38,7 +38,7 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axutil_log_in_handler_create(const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
axis2_handler_t *handler = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Fri Mar 30 12:24:00 2007
@@ -29,7 +29,7 @@
#include <axis2_msg_ctx.h>
#include <axis2_conf_ctx.h>
#include <axis2_msg_info_headers.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
axis2_status_t AXIS2_CALL
axutil_log_out_handler_invoke(struct axis2_handler *handler,
@@ -38,7 +38,7 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axutil_log_out_handler_create(const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
axis2_handler_t *handler = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_log/mod_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/mod_log.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/mod_log.h (original)
+++ webservices/axis2/trunk/c/modules/mod_log/mod_log.h Fri Mar 30 12:24:00 2007
@@ -32,11 +32,11 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axutil_log_in_handler_create(const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axutil_log_out_handler_create(const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
/** @} */
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/axis2_client_utils.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#ifdef __cplusplus
extern "C"
@@ -51,7 +51,7 @@
AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
const axis2_uri_t *wsdl_uri,
- const axis2_qname_t *wsdl_svc_qname,
+ const axutil_qname_t *wsdl_svc_qname,
const axis2_char_t *ep_name,
const axis2_char_t *doc_base_uri,
axis2_options_t *options);
Modified: webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c (original)
+++ webservices/axis2/trunk/c/samples/client/dynamic_client/client_utils.c Fri Mar 30 12:24:00 2007
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_url.h>
#include <axis2_uri.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axis2_options.h>
#include <axiom_util.h>
-#include <axis2_param.h>
+#include <axutil_param.h>
#include "axis2_client_utils.h"
#include <woden_resolver.h>
#include <woden_nc_name.h>
@@ -48,7 +48,7 @@
AXIS2_EXTERN axis2_svc_t *AXIS2_CALL
axis2_client_utils_create_axis2_svc(const axutil_env_t *env,
const axis2_uri_t *wsdl_uri,
- const axis2_qname_t *wsdl_svc_qname,
+ const axutil_qname_t *wsdl_svc_qname,
const axis2_char_t *ep_name,
const axis2_char_t *doc_base_uri,
axis2_options_t *options)
@@ -59,7 +59,7 @@
void *desc = NULL;
axis2_bool_t svc_found = AXIS2_FALSE;
axis2_bool_t endpoint_found = AXIS2_FALSE;
- axis2_qname_t *svc_qname = NULL;
+ axutil_qname_t *svc_qname = NULL;
axutil_array_list_t *wsdl_svcs = NULL;
axutil_array_list_t *endpoints = NULL;
axutil_array_list_t *binding_ops = NULL;
@@ -114,7 +114,7 @@
break;
}
if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(svc_qname, env,
- (axis2_qname_t *) wsdl_svc_qname))
+ (axutil_qname_t *) wsdl_svc_qname))
{
svc_found = AXIS2_TRUE;
break;
@@ -126,17 +126,17 @@
axis2_char_t *ns = NULL;
axis2_char_t *prefix = NULL;
axis2_char_t *localname = NULL;
- axis2_qname_t *temp_svc_qname = NULL;
+ axutil_qname_t *temp_svc_qname = NULL;
- temp1 = axis2_qname_get_localpart(svc_qname, env);
+ temp1 = axutil_qname_get_localpart(svc_qname, env);
localname = axis2_strcat(env, "dii_", temp1, NULL);
- ns = axis2_qname_get_uri(svc_qname, env);
- prefix = axis2_qname_get_prefix(svc_qname, env);
- temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
+ ns = axutil_qname_get_uri(svc_qname, env);
+ prefix = axutil_qname_get_prefix(svc_qname, env);
+ temp_svc_qname = axutil_qname_create(env, localname, ns, prefix);
axis2_svc_set_name(axis2_svc, env, localname);
axis2_svc_set_qname(axis2_svc, env, temp_svc_qname);
AXIS2_FREE(env->allocator, localname);
- axis2_qname_free(temp_svc_qname, env);
+ axutil_qname_free(temp_svc_qname, env);
}
endpoints = WODEN_SVC_GET_ENDPOINTS(wsdl_svc, env);
if (endpoints)
@@ -202,7 +202,7 @@
int j = 0, size = 0;
axis2_bool_t in = AXIS2_FALSE;
axis2_bool_t out = AXIS2_FALSE;
- axis2_qname_t *op_qname = NULL;
+ axutil_qname_t *op_qname = NULL;
axis2_uri_t *mep_uri = NULL;
axis2_char_t *mep_str = NULL;
@@ -292,8 +292,8 @@
svc_found = AXIS2_TRUE;
break;
}
- if (AXIS2_TRUE == axis2_qname_equals(svc_qname, env,
- (axis2_qname_t *) wsdl_svc_qname))
+ if (AXIS2_TRUE == axutil_qname_equals(svc_qname, env,
+ (axutil_qname_t *) wsdl_svc_qname))
{
svc_found = AXIS2_TRUE;
break;
@@ -305,17 +305,17 @@
axis2_char_t *ns = NULL;
axis2_char_t *prefix = NULL;
axis2_char_t *localname = NULL;
- axis2_qname_t *temp_svc_qname = NULL;
+ axutil_qname_t *temp_svc_qname = NULL;
- temp1 = axis2_qname_get_localpart(svc_qname, env);
+ temp1 = axutil_qname_get_localpart(svc_qname, env);
localname = axis2_strcat(env, "dii_", temp1, NULL);
- ns = axis2_qname_get_uri(svc_qname, env);
- prefix = axis2_qname_get_prefix(svc_qname, env);
- temp_svc_qname = axis2_qname_create(env, localname, ns, prefix);
+ ns = axutil_qname_get_uri(svc_qname, env);
+ prefix = axutil_qname_get_prefix(svc_qname, env);
+ temp_svc_qname = axutil_qname_create(env, localname, ns, prefix);
axis2_svc_set_name(axis2_svc, env, localname);
axis2_svc_set_qname(axis2_svc, env, temp_svc_qname);
AXIS2_FREE(env->allocator, localname);
- axis2_qname_free(temp_svc_qname, env);
+ axutil_qname_free(temp_svc_qname, env);
}
if(wsdl_svc)
{
@@ -347,15 +347,15 @@
{
axis2_endpoint_ref_t *endpoint_ref = NULL;
axis2_char_t *address = NULL;
- axis2_qname_t *ext_type_l = NULL;
- axis2_qname_t *ext_type = NULL;
+ axutil_qname_t *ext_type_l = NULL;
+ axutil_qname_t *ext_type = NULL;
int j = 0, size = 0;
axutil_array_list_t *ext_elements = NULL;
axis2_uri_t *soap_address_uri = NULL;
endpoint = woden_wsdl10_endpoint_to_element_extensible(
endpoint, env);
- ext_type_l = axis2_qname_create(env, "address",
+ ext_type_l = axutil_qname_create(env, "address",
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(endpoint,
env);
@@ -369,7 +369,7 @@
ext_element = axutil_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if (AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
+ if (AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l))
{
void *soap_address = NULL;
@@ -417,10 +417,10 @@
int j = 0, size = 0;
axis2_bool_t in = AXIS2_FALSE;
axis2_bool_t out = AXIS2_FALSE;
- axis2_qname_t *op_qname = NULL;
- axis2_qname_t *ext_type = NULL;
- axis2_qname_t *ext_type_l = NULL;
- axis2_param_t *param = NULL;
+ axutil_qname_t *op_qname = NULL;
+ axutil_qname_t *ext_type = NULL;
+ axutil_qname_t *ext_type_l = NULL;
+ axutil_param_t *param = NULL;
axis2_uri_t *mep_uri = NULL;
axis2_char_t *mep_str = NULL;
@@ -467,7 +467,7 @@
}
binding_op = woden_wsdl10_binding_op_to_element_extensible(
binding_op, env);
- ext_type_l = axis2_qname_create(env, "operation",
+ ext_type_l = axutil_qname_create(env, "operation",
"http://schemas.xmlsoap.org/wsdl/soap/", NULL);
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op,
env);
@@ -481,7 +481,7 @@
ext_element = axutil_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
- if (AXIS2_TRUE == axis2_qname_equals(ext_type, env, ext_type_l))
+ if (AXIS2_TRUE == axutil_qname_equals(ext_type, env, ext_type_l))
{
void *soap_binding_op = NULL;
axis2_uri_t *soap_action_uri = NULL;
@@ -493,7 +493,7 @@
soap_action_uri = WODEN_WSDL10_SOAP_BINDING_OP_EXTS_GET_SOAP_ACTION(
soap_binding_op, env);
- param = axis2_param_create(env, AXIS2_SOAP_ACTION, soap_action_uri);
+ param = axutil_param_create(env, AXIS2_SOAP_ACTION, soap_action_uri);
axis2_op_add_param(axis2_op, env, param);
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org