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 [6/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/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Mar 30 12:24:00 2007
@@ -54,7 +54,7 @@
/*This is used in rampart*/
axis2_bool_t enable_security;
/** configuration parameter container */
- axis2_param_container_t *param_container;
+ axutil_param_container_t *param_container;
};
AXIS2_EXTERN axis2_conf_t *AXIS2_CALL
@@ -97,8 +97,8 @@
conf->enable_mtom = AXIS2_FALSE;
conf->enable_security = AXIS2_FALSE;
- conf->param_container = (axis2_param_container_t *)
- axis2_param_container_create(env);
+ conf->param_container = (axutil_param_container_t *)
+ axutil_param_container_create(env);
if (! conf->param_container)
{
axis2_conf_free(conf, env);
@@ -259,7 +259,7 @@
if (conf->param_container)
{
- axis2_param_container_free(conf->param_container, env);
+ axutil_param_container_free(conf->param_container, env);
}
if (conf->svc_grps)
@@ -343,11 +343,11 @@
for (i = 0; i < axutil_array_list_size(conf->engaged_modules,
env); i++)
{
- axis2_qname_t *module_desc_qname = NULL;
- module_desc_qname = (axis2_qname_t *)
+ axutil_qname_t *module_desc_qname = NULL;
+ module_desc_qname = (axutil_qname_t *)
axutil_array_list_get(conf->engaged_modules, env, i);
if (module_desc_qname)
- axis2_qname_free(module_desc_qname, env);
+ axutil_qname_free(module_desc_qname, env);
}
axutil_array_list_free(conf->engaged_modules, env);
}
@@ -507,12 +507,12 @@
void *value = NULL;
axis2_svc_t *desc = NULL;
axis2_char_t *svc_name2 = NULL;
- const axis2_qname_t *svc_qname = NULL;
+ const axutil_qname_t *svc_qname = NULL;
axutil_hash_this(index_i, NULL, NULL, &value);
desc = (axis2_svc_t *) value;
svc_qname = axis2_svc_get_qname(desc, env);
- svc_name = axis2_qname_get_localpart(svc_qname, env);
+ svc_name = axutil_qname_get_localpart(svc_qname, env);
svc_name2 = axutil_hash_get(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
@@ -535,7 +535,7 @@
axutil_hash_this(index_i, NULL, NULL, &value);
desc = (axis2_svc_t *) value;
- svc_name = axis2_qname_get_localpart(axis2_svc_get_qname(desc, env), env);
+ svc_name = axutil_qname_get_localpart(axis2_svc_get_qname(desc, env), env);
axutil_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
desc);
index_i = axutil_hash_next(env, index_i);
@@ -588,7 +588,7 @@
axis2_svc_t *svc)
{
axis2_svc_grp_t *svc_grp = NULL;
- const axis2_qname_t *svc_grp_qname = NULL;
+ const axutil_qname_t *svc_grp_qname = NULL;
axis2_char_t *svc_grp_name = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -610,7 +610,7 @@
return AXIS2_FAILURE;
}
- svc_grp_name = axis2_qname_get_localpart(svc_grp_qname, env);
+ svc_grp_name = axutil_qname_get_localpart(svc_grp_qname, env);
if (!svc_grp_name)
{
return AXIS2_FAILURE;
@@ -666,7 +666,7 @@
axis2_conf_add_param(
axis2_conf_t *conf,
const axutil_env_t *env,
- axis2_param_t *param)
+ axutil_param_t *param)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -674,7 +674,7 @@
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_conf_is_param_locked(conf, env,
- axis2_param_get_name(param, env)))
+ axutil_param_get_name(param, env)))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
@@ -682,13 +682,13 @@
}
else
{
- status = axis2_param_container_add_param(conf->param_container, env,
+ status = axutil_param_container_add_param(conf->param_container, env,
param);
}
return status;
}
-AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_conf_get_param(
const axis2_conf_t *conf,
const axutil_env_t *env,
@@ -704,7 +704,7 @@
return NULL;
}
- return axis2_param_container_get_param(conf->param_container, env,
+ return axutil_param_container_get_param(conf->param_container, env,
name);
}
@@ -715,7 +715,7 @@
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_param_container_get_params(conf->param_container, env);
+ return axutil_param_container_get_params(conf->param_container, env);
}
@@ -725,13 +725,13 @@
const axutil_env_t *env,
const axis2_char_t *param_name)
{
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param = axis2_conf_get_param(conf, env, param_name);
- return (param && AXIS2_TRUE == axis2_param_is_locked(param, env));
+ return (param && AXIS2_TRUE == axutil_param_is_locked(param, env));
}
AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
@@ -794,25 +794,25 @@
axis2_conf_get_module(
const axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *qname)
+ const axutil_qname_t *qname)
{
axis2_char_t *name = NULL;
axis2_module_desc_t *ret = NULL;
axis2_char_t *module_name = NULL;
- axis2_qname_t *mod_qname = NULL;
+ axutil_qname_t *mod_qname = NULL;
const axis2_char_t *def_mod_ver = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = axis2_qname_to_string((axis2_qname_t *)qname, env);
+ name = axutil_qname_to_string((axutil_qname_t *)qname, env);
ret = (axis2_module_desc_t *) axutil_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
if (ret)
{
return ret;
}
- module_name = axis2_qname_get_localpart(qname, env);
+ module_name = axutil_qname_get_localpart(qname, env);
if (! module_name)
{
return NULL;
@@ -823,10 +823,10 @@
{
return NULL;
}
- name = axis2_qname_to_string(mod_qname, env);
+ name = axutil_qname_to_string(mod_qname, env);
ret = (axis2_module_desc_t *) axutil_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
- axis2_qname_free(mod_qname, env);
+ axutil_qname_free(mod_qname, env);
mod_qname = NULL;
return ret;
}
@@ -925,7 +925,7 @@
axutil_hash_this(index_j, NULL, NULL, &value2);
svc = (axis2_svc_t *) value2;
svc_name =
- axis2_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
+ axutil_qname_get_localpart(axis2_svc_get_qname(svc, env), env);
axutil_hash_set(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
@@ -941,9 +941,9 @@
axis2_conf_is_engaged(
axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *module_name)
+ const axutil_qname_t *module_name)
{
- const axis2_qname_t *def_mod_qname = NULL;
+ const axutil_qname_t *def_mod_qname = NULL;
axis2_module_desc_t *def_mod = NULL;
int i = 0;
int size = 0;
@@ -951,7 +951,7 @@
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FALSE);
def_mod = axis2_conf_get_default_module(conf, env,
- axis2_qname_get_localpart(module_name, env));
+ axutil_qname_get_localpart(module_name, env));
if (def_mod)
{
def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
@@ -960,13 +960,13 @@
for (i = 0; i < size; i++)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
- qname = (axis2_qname_t *) axutil_array_list_get(conf->
+ qname = (axutil_qname_t *) axutil_array_list_get(conf->
engaged_modules, env, i);
- if (AXIS2_TRUE == axis2_qname_equals(module_name, env, qname) ||
- (def_mod_qname && AXIS2_TRUE == axis2_qname_equals(
+ if (AXIS2_TRUE == axutil_qname_equals(module_name, env, qname) ||
+ (def_mod_qname && AXIS2_TRUE == axutil_qname_equals(
def_mod_qname, env, qname)))
{
return AXIS2_TRUE;
@@ -1106,7 +1106,7 @@
const axutil_env_t *env,
axis2_module_desc_t *module)
{
- const axis2_qname_t *module_qname = NULL;
+ const axutil_qname_t *module_qname = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1126,7 +1126,7 @@
if (module_qname)
{
axis2_char_t *module_name = NULL;
- module_name = axis2_qname_to_string((axis2_qname_t *)module_qname, env);
+ module_name = axutil_qname_to_string((axutil_qname_t *)module_qname, env);
axutil_hash_set(conf->all_modules, module_name,
AXIS2_HASH_KEY_STRING, module);
}
@@ -1282,7 +1282,7 @@
axis2_conf_engage_module(
axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *module_ref)
+ const axutil_qname_t *module_ref)
{
axis2_module_desc_t *module_desc = NULL;
axis2_bool_t is_new_module = AXIS2_FALSE;
@@ -1311,7 +1311,7 @@
{
return AXIS2_FAILURE;
}
- file_name = axis2_qname_get_localpart(module_ref, env);
+ file_name = axutil_qname_get_localpart(module_ref, env);
file = (axutil_file_t *) axis2_arch_reader_create_module_arch(
arch_reader, env, file_name) ;
repos_path = axis2_conf_get_repo(conf, env);
@@ -1335,17 +1335,17 @@
{
int size = 0;
int i = 0;
- const axis2_qname_t *module_qname = NULL;
+ const axutil_qname_t *module_qname = NULL;
size = axutil_array_list_size(conf->engaged_modules, env);
module_qname = axis2_module_desc_get_qname(module_desc, env);
for (i = 0; i < size; i++)
{
- axis2_qname_t *qname = NULL;
+ axutil_qname_t *qname = NULL;
- qname = (axis2_qname_t *) axutil_array_list_get(conf->
+ qname = (axutil_qname_t *) axutil_array_list_get(conf->
engaged_modules, env, i);
- if (AXIS2_TRUE == axis2_qname_equals(module_qname, env, qname))
+ if (AXIS2_TRUE == axutil_qname_equals(module_qname, env, qname))
{
to_be_engaged = AXIS2_FALSE;
}
@@ -1359,8 +1359,8 @@
if (to_be_engaged)
{
axis2_phase_resolver_t *phase_resolver = NULL;
- axis2_qname_t *module_qref_l = NULL;
- const axis2_qname_t *module_qname = NULL;
+ axutil_qname_t *module_qref_l = NULL;
+ const axutil_qname_t *module_qname = NULL;
phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
if (!phase_resolver)
@@ -1376,7 +1376,7 @@
return status;
}
module_qname = axis2_module_desc_get_qname(module_desc, env);
- module_qref_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
+ module_qref_l = axutil_qname_clone((axutil_qname_t *)module_qname, env);
status = axutil_array_list_add(conf->engaged_modules, env,
module_qref_l);
}
@@ -1451,7 +1451,7 @@
axis2_char_t *mod_name = NULL;
const axis2_char_t *mod_ver = NULL;
axutil_hash_t *all_modules = NULL;
- axis2_qname_t *mod_qname = NULL;
+ axutil_qname_t *mod_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
@@ -1470,7 +1470,7 @@
mod_name = axis2_stracat(env, tmp_name, mod_ver);
AXIS2_FREE(env->allocator, tmp_name);
}
- mod_qname = axis2_qname_create(env, mod_name, NULL, NULL);
+ mod_qname = axutil_qname_create(env, mod_name, NULL, NULL);
AXIS2_FREE(env->allocator, mod_name);
mod_name = NULL;
@@ -1479,7 +1479,7 @@
return NULL;
}
ret_mod = (axis2_module_desc_t *)axutil_hash_get(all_modules,
- axis2_qname_to_string(mod_qname, env),
+ axutil_qname_to_string(mod_qname, env),
AXIS2_HASH_KEY_STRING);
return ret_mod;
@@ -1526,7 +1526,7 @@
const axis2_char_t *module_name,
const axis2_char_t *version_id)
{
- axis2_qname_t *module_qname = NULL;
+ axutil_qname_t *module_qname = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1539,7 +1539,7 @@
return AXIS2_FAILURE;
}
status = axis2_conf_engage_module(conf, env, module_qname);
- axis2_qname_free(module_qname, env);
+ axutil_qname_free(module_qname, env);
return status;
}
@@ -1583,7 +1583,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_conf_get_param_container(const axis2_conf_t *conf,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_svc.h>
#include <axis2_conf_ctx.h>
@@ -39,17 +39,17 @@
axis2_handler_t *AXIS2_CALL
axis2_ctx_handler_create(
const axutil_env_t *env,
- const axis2_string_t *string)
+ const axutil_string_t *string)
{
axis2_handler_t *handler = NULL;
axis2_handler_desc_t *handler_desc = NULL;
- axis2_string_t *handler_string = NULL;
+ axutil_string_t *handler_string = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (string)
{
- handler_string = axis2_string_clone((axis2_string_t *)string, env);
+ handler_string = axutil_string_clone((axutil_string_t *)string, env);
if (!(handler_string))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -59,7 +59,7 @@
else
{
/* create default string */
- handler_string = axis2_string_create_const(env, (axis2_char_t**)&AXIS2_CTX_HANDLER_NAME);
+ handler_string = axutil_string_create_const(env, (axis2_char_t**)&AXIS2_CTX_HANDLER_NAME);
if (!handler_string)
{
return NULL;
@@ -74,7 +74,7 @@
/* handler desc of base handler */
handler_desc = axis2_handler_desc_create(env, handler_string);
- axis2_string_free(handler_string, env);
+ axutil_string_free(handler_string, env);
if (!handler_desc)
{
AXIS2_HANDLER_FREE(handler, env);
@@ -113,10 +113,10 @@
svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
if (svc_grp_ctx)
{
- axis2_string_t *svc_grp_ctx_id_str =
- axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
+ axutil_string_t *svc_grp_ctx_id_str =
+ axutil_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
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;
}
@@ -131,15 +131,15 @@
svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
if (svc_ctx)
{
- axis2_string_t *svc_grp_ctx_id_str = NULL;
+ axutil_string_t *svc_grp_ctx_id_str = NULL;
svc_grp_ctx = axis2_svc_ctx_get_parent(svc_ctx, env);
axis2_msg_ctx_set_svc_ctx(msg_ctx, env, svc_ctx);
axis2_msg_ctx_set_svc_grp_ctx(msg_ctx, env, svc_grp_ctx);
- svc_grp_ctx_id_str = axis2_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
+ svc_grp_ctx_id_str = axutil_string_create(env, axis2_svc_grp_ctx_get_id(svc_grp_ctx, env));
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;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axis2_disp.h>
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_relates_to.h>
#include <axis2_svc.h>
#include <axis2_const.h>
@@ -30,7 +30,7 @@
/** base class, inherits from handler */
axis2_handler_t *base;
/** phase name */
- axis2_string_t *name;
+ axutil_string_t *name;
/** derived struct */
void* derived; /* deep copy */
int derived_type;
@@ -39,7 +39,7 @@
axis2_disp_t *AXIS2_CALL
axis2_disp_create(
const axutil_env_t *env,
- const axis2_string_t *name)
+ const axutil_string_t *name)
{
axis2_disp_t *disp = NULL;
axis2_handler_desc_t *handler_desc = NULL;
@@ -58,7 +58,7 @@
if (name)
{
- disp->name = axis2_string_clone((axis2_string_t *)name, env);
+ disp->name = axutil_string_clone((axutil_string_t *)name, env);
if (!(disp->name))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -69,7 +69,7 @@
else
{
/* create default name */
- disp->name = axis2_string_create_const(env, (axis2_char_t**)&AXIS2_DISP_NAME);
+ disp->name = axutil_string_create_const(env, (axis2_char_t**)&AXIS2_DISP_NAME);
if (!(disp->name))
{
axis2_disp_free(disp, env);
@@ -105,7 +105,7 @@
return disp->base;
}
-axis2_string_t *AXIS2_CALL
+axutil_string_t *AXIS2_CALL
axis2_disp_get_name(
const axis2_disp_t *disp,
const axutil_env_t *env)
@@ -117,18 +117,18 @@
axis2_disp_set_name(
struct axis2_disp *disp,
const axutil_env_t *env,
- axis2_string_t *name)
+ axutil_string_t *name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (disp->name)
{
- axis2_string_free(disp->name, env);
+ axutil_string_free(disp->name, env);
}
if (name)
{
- disp->name = axis2_string_clone(name, env);
+ disp->name = axutil_string_clone(name, env);
if (!(disp->name))
return AXIS2_FAILURE;
}
@@ -180,7 +180,7 @@
AXIS2_ENV_CHECK(env, void);
if (disp->name)
{
- axis2_string_free(disp->name, env);
+ axutil_string_free(disp->name, env);
}
AXIS2_FREE(env->allocator, disp);
return;
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include "axis2_disp_checker.h"
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_relates_to.h>
#include <axis2_svc.h>
#include <axis2_const.h>
@@ -35,7 +35,7 @@
/** base class, inherits from handler */
axis2_handler_t *base;
/** phase name */
- axis2_string_t *name;
+ axutil_string_t *name;
};
axis2_disp_checker_t *AXIS2_CALL
@@ -58,7 +58,7 @@
disp_checker->base = NULL;
/* create default name */
- disp_checker->name = axis2_string_create_const(env,
+ disp_checker->name = axutil_string_create_const(env,
(axis2_char_t**)&AXIS2_DISP_CHECKER_NAME);
if (!(disp_checker->name))
@@ -94,7 +94,7 @@
return disp_checker->base;
}
-axis2_string_t *AXIS2_CALL
+axutil_string_t *AXIS2_CALL
axis2_disp_checker_get_name(
const axis2_disp_checker_t *disp_checker,
const axutil_env_t *env)
@@ -106,19 +106,19 @@
axis2_disp_checker_set_name(
axis2_disp_checker_t *disp_checker,
const axutil_env_t *env,
- const axis2_string_t *name)
+ const axutil_string_t *name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (disp_checker->name)
{
- axis2_string_free(disp_checker->name, env);
+ axutil_string_free(disp_checker->name, env);
disp_checker->name = NULL;
}
if (name)
{
- disp_checker->name = axis2_string_clone((axis2_string_t *)name, env);
+ disp_checker->name = axutil_string_clone((axutil_string_t *)name, env);
if (!(disp_checker->name))
return AXIS2_FAILURE;
}
@@ -135,7 +135,7 @@
if (disp_checker->name)
{
- axis2_string_free(disp_checker->name, env);
+ axutil_string_free(disp_checker->name, env);
}
AXIS2_FREE(env->allocator, disp_checker);
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Fri Mar 30 12:24:00 2007
@@ -413,7 +413,7 @@
axis2_msg_ctx_t *fault_ctx = NULL;
axis2_endpoint_ref_t *fault_to = NULL;
axis2_endpoint_ref_t *reply_to = NULL;
- axis2_stream_t *stream = NULL;
+ axutil_stream_t *stream = NULL;
axiom_soap_envelope_t *envelope = NULL;
const axis2_char_t *wsa_action = NULL;
const axis2_char_t *msg_id = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/handler.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/handler.c Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
axis2_handler_t *handler,
const axutil_env_t *env);
-const axis2_string_t *AXIS2_CALL
+const axutil_string_t *AXIS2_CALL
axis2_handler_get_name(
const axis2_handler_t *handler,
const axutil_env_t *env) ;
@@ -47,7 +47,7 @@
const axutil_env_t *env,
struct axis2_msg_ctx *msg_ctx);
-axis2_param_t *AXIS2_CALL
+axutil_param_t *AXIS2_CALL
axis2_handler_get_param(
const axis2_handler_t *handler,
const axutil_env_t *env,
@@ -134,7 +134,7 @@
return;
}
-const axis2_string_t *AXIS2_CALL
+const axutil_string_t *AXIS2_CALL
axis2_handler_get_name(
const axis2_handler_t *handler,
const axutil_env_t *env)
@@ -157,7 +157,7 @@
return AXIS2_SUCCESS;
}
-axis2_param_t *AXIS2_CALL
+axutil_param_t *AXIS2_CALL
axis2_handler_get_param(
const axis2_handler_t *handler,
const axutil_env_t *env,
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_phase.h>
#include <axutil_array_list.h>
#include <axis2_msg_ctx.h>
@@ -106,7 +106,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_handler_t *%s added to the index %d of the phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
+ axutil_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
index,
phase->name);
@@ -121,7 +121,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log, "Handler %s added to phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
+ axutil_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
phase->name);
return axis2_phase_add_unique(env, phase->handlers, handler);
@@ -148,7 +148,7 @@
{
AXIS2_LOG_INFO(env->log,
"Invoke the first handler %s within the phase %s",
- axis2_string_get_buffer(
+ axutil_string_get_buffer(
AXIS2_HANDLER_GET_NAME(phase->first_handler, env), env),
phase->name);
@@ -173,7 +173,7 @@
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Invoke the handler %s within the phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
+ axutil_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
phase->name);
status = AXIS2_HANDLER_INVOKE(handler, env, msg_ctx);
if (status != AXIS2_SUCCESS)
@@ -197,7 +197,7 @@
{
AXIS2_LOG_INFO(env->log,
"Invoke the last handler %s within the phase %s",
- axis2_string_get_buffer(
+ axutil_string_get_buffer(
AXIS2_HANDLER_GET_NAME(phase->last_handler, env), env),
phase->name);
status = AXIS2_HANDLER_INVOKE(phase->last_handler, env, msg_ctx);
@@ -435,7 +435,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- first_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ first_handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!first_handler_name)
return AXIS2_TRUE;
@@ -479,7 +479,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- last_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ last_handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!last_handler_name)
return AXIS2_TRUE;
@@ -549,7 +549,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -577,7 +577,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -640,7 +640,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -667,7 +667,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -748,7 +748,7 @@
return AXIS2_FAILURE;
}
- before_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ before_handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -765,7 +765,7 @@
return AXIS2_FAILURE;
}
- after_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ after_handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -808,7 +808,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
+ handler_name = axutil_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -976,14 +976,14 @@
{
int i = 0, size = 0;
axis2_bool_t add_handler = AXIS2_TRUE;
- const axis2_string_t *handler_name = NULL;
+ const axutil_string_t *handler_name = NULL;
handler_name = AXIS2_HANDLER_GET_NAME(handler, env);
size = axutil_array_list_size(list, env);
for (i = 0; i < size; i++)
{
axis2_handler_t *obj = NULL;
- const axis2_string_t *obj_name = NULL;
+ const axutil_string_t *obj_name = NULL;
obj = (axis2_handler_t *) axutil_array_list_get(list, env, i);
obj_name = AXIS2_HANDLER_GET_NAME(obj, env);
@@ -992,8 +992,8 @@
add_handler = AXIS2_FALSE;
break;
}
- else if (0 == axis2_strcmp(axis2_string_get_buffer(handler_name, env),
- axis2_string_get_buffer(obj_name, env)))
+ else if (0 == axis2_strcmp(axutil_string_get_buffer(handler_name, env),
+ axutil_string_get_buffer(obj_name, env)))
{
add_handler = AXIS2_FALSE;
break;
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axis2_disp.h>
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_relates_to.h>
#include <axis2_svc.h>
#include <axis2_const.h>
@@ -51,11 +51,11 @@
{
axis2_disp_t *disp = NULL;
axis2_handler_t *handler = NULL;
- axis2_string_t *name = NULL;
+ axutil_string_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- name = axis2_string_create_const(env,
+ name = axutil_string_create_const(env,
(axis2_char_t **)&AXIS2_REQ_URI_DISP_NAME);
disp = axis2_disp_create(env, name);
@@ -75,7 +75,7 @@
handler->ops->invoke = axis2_req_uri_disp_invoke;
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return disp;
}
@@ -165,15 +165,15 @@
{
if (url_tokens[1])
{
- axis2_qname_t *op_qname = NULL;
+ axutil_qname_t *op_qname = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Checking for operation using \
target endpoint uri fragment : %s",
url_tokens[1]);
- op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
+ op_qname = axutil_qname_create(env, url_tokens[1], NULL, NULL);
op = axis2_svc_get_op_with_name(svc, env,
- axis2_qname_get_localpart(op_qname, env));
- axis2_qname_free(op_qname, env);
+ axutil_qname_get_localpart(op_qname, env));
+ axutil_qname_free(op_qname, env);
if (op)
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Operation found using target endpoint uri fragment");
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_disp.h>
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_relates_to.h>
#include <axis2_svc.h>
#include <axis2_const.h>
@@ -51,11 +51,11 @@
{
axis2_disp_t *disp = NULL;
axis2_handler_t *handler = NULL;
- axis2_string_t *name = NULL;
+ axutil_string_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- name = axis2_string_create_const(env,
+ name = axutil_string_create_const(env,
(axis2_char_t**)&AXIS2_SOAP_ACTION_DISP_NAME);
disp = axis2_disp_create(env, name);
@@ -75,7 +75,7 @@
handler->ops->invoke = axiom_soap_action_disp_invoke;
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return disp;
}
@@ -101,7 +101,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, svc, NULL);
- action = axis2_string_get_buffer(
+ action = axutil_string_get_buffer(
axis2_msg_ctx_get_soap_action(msg_ctx, env), env);
if (action)
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_disp.h>
#include <axis2_handler_desc.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_svc.h>
#include <axis2_const.h>
#include <axis2_conf_ctx.h>
@@ -53,11 +53,11 @@
{
axis2_disp_t *disp = NULL;
axis2_handler_t *handler = NULL;
- axis2_string_t *name = NULL;
+ axutil_string_t *name = NULL;
AXIS2_ENV_CHECK(env, NULL);
- name = axis2_string_create_const(env,
+ name = axutil_string_create_const(env,
(axis2_char_t**)&AXIS2_SOAP_MESSAGE_BODY_DISP_NAME);
disp = axis2_disp_create(env, name);
@@ -78,7 +78,7 @@
handler->ops->invoke = axiom_soap_body_disp_invoke;
- axis2_string_free(name, env);
+ axutil_string_free(name, env);
return disp;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Fri Mar 30 12:24:00 2007
@@ -127,7 +127,7 @@
phase = axis2_phase_holder_get_phase(phase_holder, env, phase_name);
status = axis2_phase_add_handler_desc(phase, env, handler);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Add handler %s to phase %s",
- axis2_string_get_buffer(axis2_handler_desc_get_name(handler, env), env),
+ axutil_string_get_buffer(axis2_handler_desc_get_name(handler, env), env),
phase_name);
}
else
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_phase_resolver.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
struct axis2_phase_resolver
{
@@ -180,7 +180,7 @@
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- axis2_qname_get_localpart(axis2_op_get_qname(op, env),
+ axutil_qname_get_localpart(axis2_op_get_qname(op, env),
env));
for (i = 1; i < 5; i++)
{
@@ -223,13 +223,13 @@
for (i = 0; i < size; i++)
{
- axis2_qname_t *modulename = NULL;
+ axutil_qname_t *modulename = NULL;
axis2_module_desc_t *module_desc = NULL;
- modulename = (axis2_qname_t *) axutil_array_list_get(moduleqnames, env,
+ modulename = (axutil_qname_t *) axutil_array_list_get(moduleqnames, env,
i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module name is:%s",
- axis2_qname_get_localpart(modulename, env));
+ axutil_qname_get_localpart(modulename, env));
module_desc = axis2_conf_get_module(phase_resolver->axis2_config, env,
modulename);
if (module_desc)
@@ -870,7 +870,7 @@
axis2_svc_grp_t *svc_grp = NULL;
void *v = NULL;
axutil_hash_index_t *index_j = NULL;
- const axis2_qname_t *mod_name = NULL;
+ const axutil_qname_t *mod_name = NULL;
axutil_hash_this(index_i, NULL, NULL, &v);
svc_grp = (axis2_svc_grp_t *) v;
@@ -946,13 +946,13 @@
int j = 0;
axutil_array_list_t *modules = NULL;
axis2_flow_t *flow = NULL;
- const axis2_qname_t *module_desc_qname = NULL;
+ const axutil_qname_t *module_desc_qname = NULL;
int size = 0;
axutil_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- axis2_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
+ axutil_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
modules = axis2_op_get_all_modules(op_desc, env);
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
@@ -962,14 +962,14 @@
for (j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
- const axis2_qname_t *module_desc_qname_l = NULL;
+ const axutil_qname_t *module_desc_qname_l = NULL;
module_desc_l = (axis2_module_desc_t *)
axutil_array_list_get(modules, env, j);
module_desc_qname_l = axis2_module_desc_get_qname(module_desc_l ,
env);
- if (axis2_qname_equals(module_desc_qname_l, env, module_desc_qname))
+ if (axutil_qname_equals(module_desc_qname_l, env, module_desc_qname))
{
engaged = AXIS2_TRUE;
break;
@@ -1250,7 +1250,7 @@
axutil_hash_t *ops = NULL;
axutil_hash_index_t *index_i = NULL;
axis2_status_t status = AXIS2_FAILURE;
- const axis2_qname_t *module_d_qname = NULL;
+ const axutil_qname_t *module_d_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1287,18 +1287,18 @@
for (j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
- const axis2_qname_t *module_d_qname_l = NULL;
+ const axutil_qname_t *module_d_qname_l = NULL;
module_desc_l = axutil_array_list_get(modules, env, j);
module_d_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
- if (AXIS2_TRUE == axis2_qname_equals(module_d_qname, env,
+ if (AXIS2_TRUE == axutil_qname_equals(module_d_qname, env,
module_d_qname_l))
{
engaged = AXIS2_TRUE;
status = AXIS2_FAILURE;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Module %s already engaged.",
- axis2_qname_get_localpart(module_d_qname, env));
+ axutil_qname_get_localpart(module_d_qname, env));
break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Fri Mar 30 12:24:00 2007
@@ -16,12 +16,12 @@
*/
#include <axis2_msg_recv.h>
-#include <axis2_param.h>
+#include <axutil_param.h>
#include <axis2_description.h>
#include <axutil_class_loader.h>
#include <axis2_engine.h>
#include <axis2_core_utils.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#include <axiom_soap_envelope.h>
#include <axiom_soap_body.h>
@@ -119,7 +119,7 @@
struct axis2_svc *svc = NULL;
struct axis2_op_ctx *op_ctx = NULL;
struct axis2_svc_ctx *svc_ctx = NULL;
- axis2_param_t *impl_info_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
void *impl_class = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -220,8 +220,8 @@
axis2_svc_t *svc = NULL;
axis2_op_ctx_t *op_ctx = NULL;
axis2_svc_ctx_t *svc_ctx = NULL;
- axis2_param_t *impl_info_param = NULL;
- axis2_param_t *scope_param = NULL;
+ axutil_param_t *impl_info_param = NULL;
+ axutil_param_t *scope_param = NULL;
axis2_char_t *param_value = NULL;
axutil_dll_desc_t *dll_desc = NULL;
@@ -239,7 +239,7 @@
scope_param = axis2_svc_get_param(svc, env, AXIS2_SCOPE);
if (scope_param)
{
- param_value = axis2_param_get_value(scope_param, env);
+ param_value = axutil_param_get_value(scope_param, env);
}
if (param_value && (0 == axis2_strcmp(AXIS2_APPLICATION_SCOPE,
param_value)))
@@ -254,7 +254,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- dll_desc = axis2_param_get_value(impl_info_param, env);
+ dll_desc = axutil_param_get_value(impl_info_param, env);
return axutil_class_loader_delete_dll(env, dll_desc);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_header.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <stdio.h>
#include <string.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Fri Mar 30 12:24:00 2007
@@ -16,9 +16,9 @@
*/
#include <axis2_http_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>
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_out_transport_info_impl_set_content_type(
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_request_line.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <string.h>
#include <axis2_http_transport.h>
#include <stdio.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#include <axis2_http_simple_request.h>
#include <axutil_array_list.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <string.h>
#include <axis2_types.h>
@@ -26,7 +26,7 @@
{
axis2_http_request_line_t *request_line;
axutil_array_list_t *header_group;
- axis2_stream_t *stream;
+ axutil_stream_t *stream;
axis2_bool_t owns_stream;
};
@@ -36,7 +36,7 @@
axis2_http_request_line_t *request_line,
axis2_http_header_t **http_headers,
axis2_ssize_t http_hdr_count,
- axis2_stream_t *content)
+ axutil_stream_t *content)
{
axis2_http_simple_request_t *simple_request = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -58,7 +58,7 @@
if (!(simple_request->stream))
{
- simple_request->stream = axis2_stream_create_basic(env);
+ simple_request->stream = axutil_stream_create_basic(env);
if (! simple_request->stream)
{
axis2_http_simple_request_free((axis2_http_simple_request_t *)
@@ -355,7 +355,7 @@
}
-AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
axis2_http_simple_request_get_body(
const axis2_http_simple_request_t *simple_request,
const axutil_env_t *env)
@@ -370,7 +370,7 @@
const axutil_env_t *env,
char **buf)
{
- axis2_stream_t *body = NULL;
+ axutil_stream_t *body = NULL;
char *tmp_buf = NULL;
char *tmp_buf2 = NULL;
char *tmp_buf3 = NULL;
@@ -423,14 +423,14 @@
void *str,
unsigned int str_len)
{
- axis2_stream_t *body_stream = NULL;
+ axutil_stream_t *body_stream = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
body_stream = simple_request->stream;
if (! body_stream)
{
- body_stream = axis2_stream_create_basic(env);
+ body_stream = axutil_stream_create_basic(env);
if (! body_stream)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_simple_response.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <stdio.h>
#include <string.h>
#include <axis2_types.h>
@@ -27,7 +27,7 @@
{
axis2_http_status_line_t *status_line;
axutil_array_list_t *header_group;
- axis2_stream_t *stream;
+ axutil_stream_t *stream;
};
AXIS2_EXTERN axis2_http_simple_response_t *AXIS2_CALL
@@ -36,7 +36,7 @@
axis2_http_status_line_t *status_line,
const axis2_http_header_t **http_headers,
const axis2_ssize_t http_hdr_count,
- axis2_stream_t *content)
+ axutil_stream_t *content)
{
axis2_http_simple_response_t *ret = NULL;
axis2_http_simple_response_t *simple_response = NULL;
@@ -420,14 +420,14 @@
const axutil_env_t *env,
axis2_char_t *str)
{
- axis2_stream_t *body_stream = NULL;
+ axutil_stream_t *body_stream = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
body_stream = simple_response->stream;
if (! body_stream)
{
- body_stream = axis2_stream_create_basic(env);
+ body_stream = axutil_stream_create_basic(env);
if (! body_stream)
{
return AXIS2_FAILURE;
@@ -442,7 +442,7 @@
axis2_http_simple_response_set_body_stream(
axis2_http_simple_response_t *simple_response,
const axutil_env_t *env,
- axis2_stream_t *stream)
+ axutil_stream_t *stream)
{
/*
* We don't free the stream
@@ -453,7 +453,7 @@
return AXIS2_SUCCESS;
}
-axis2_stream_t *AXIS2_CALL
+axutil_stream_t *AXIS2_CALL
axis2_http_simple_response_get_body(
axis2_http_simple_response_t *simple_response,
const axutil_env_t *env)
@@ -468,7 +468,7 @@
const axutil_env_t *env,
axis2_char_t **buffer)
{
- axis2_stream_t *tmp_stream = NULL;
+ axutil_stream_t *tmp_stream = NULL;
int return_size = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -478,7 +478,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_BODY, AXIS2_FAILURE);
return -1;
}
- 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/common/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_status_line.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <string.h>
#include <axis2_types.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Fri Mar 30 12:24:00 2007
@@ -17,10 +17,10 @@
#include <axis2_http_worker.h>
-#include <axis2_string.h>
+#include <axutil_string.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_request_line.h>
#include <axis2_http_out_transport_info.h>
@@ -29,7 +29,7 @@
#include <axis2_engine.h>
#include <axis2_uuid_gen.h>
#include <axis2_url.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
struct axis2_http_worker
{
@@ -103,14 +103,14 @@
{
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 = axis2_stream_create_basic(env);
+ axutil_stream_t *request_body = NULL;
+ axutil_stream_t *out_stream = axutil_stream_create_basic(env);
axis2_http_simple_response_t *response = NULL;
axis2_transport_out_desc_t *out_desc = NULL;
axis2_transport_in_desc_t *in_desc = NULL;
axis2_char_t *http_version = NULL;
axis2_char_t *soap_action = NULL;
- axis2_string_t *soap_action_str = NULL;
+ axutil_string_t *soap_action_str = NULL;
axis2_bool_t processed = AXIS2_FALSE;
axis2_status_t status = AXIS2_FAILURE;
int content_length = -1;
@@ -125,7 +125,7 @@
axis2_char_t *url_external_form = NULL;
axis2_char_t *svc_grp_uuid = NULL;
axis2_char_t *path = NULL;
- axis2_property_t *peer_property = NULL;
+ axutil_property_t *peer_property = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FAILURE);
@@ -203,8 +203,8 @@
if (peer_ip)
{
- peer_property = axis2_property_create (env);
- axis2_property_set_value (peer_property, env, axis2_strdup (env, peer_ip));
+ peer_property = axutil_property_create (env);
+ axutil_property_set_value (peer_property, env, axis2_strdup (env, peer_ip));
axis2_msg_ctx_set_property (msg_ctx, env, AXIS2_SVR_PEER_IP_ADDR, peer_property);
}
@@ -226,9 +226,9 @@
svc_grp_uuid = axis2_uuid_gen(env);
if (svc_grp_uuid)
{
- axis2_string_t *svc_grp_uuid_str = axis2_string_create_assume_ownership(env, &svc_grp_uuid);
+ axutil_string_t *svc_grp_uuid_str = axutil_string_create_assume_ownership(env, &svc_grp_uuid);
axis2_msg_ctx_set_svc_grp_ctx_id(msg_ctx, env, svc_grp_uuid_str);
- axis2_string_free(svc_grp_uuid_str, env);
+ axutil_string_free(svc_grp_uuid_str, env);
}
http_out_transport_info = axis2_http_out_transport_info_create(env, response);
@@ -241,7 +241,7 @@
AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(
simple_request, env, AXIS2_HTTP_HEADER_SOAP_ACTION),
env);
- soap_action_str = axis2_string_create(env, soap_action);
+ soap_action_str = axutil_string_create(env, soap_action);
}
if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
@@ -299,7 +299,7 @@
axis2_http_request_line_t *req_line = NULL;
axis2_http_status_line_t *tmp_stat_line = NULL;
axis2_char_t status_line_str[100];
- axis2_property_t *http_error_property = NULL;
+ axutil_property_t *http_error_property = NULL;
axis2_char_t *http_error_value = NULL;
if (! engine)
{
@@ -310,7 +310,7 @@
AXIS2_HTTP_TRANSPORT_ERROR);
if (http_error_property)
- http_error_value = (axis2_char_t *)axis2_property_get_value(
+ http_error_value = (axis2_char_t *)axutil_property_get_value(
http_error_property, env);
fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
@@ -408,7 +408,7 @@
msg_ctx = NULL;
axis2_url_free(request_url, env);
- axis2_string_free(soap_action_str, env);
+ axutil_string_free(soap_action_str, env);
request_url = NULL;
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <axis2_http_svr_thread.h>
#include <axis2_http_server.h>
#include <axis2_transport_in_desc.h>
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
#include <axis2_url.h>
#include <axis2_conf_init.h>
@@ -185,18 +185,18 @@
{
axis2_http_server_impl_t *server_impl = NULL;
axis2_char_t *port_str = NULL;
- axis2_param_t *param = NULL;
+ axutil_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
server_impl = AXIS2_INTF_TO_IMPL(server);
server_impl->conf_ctx = conf_ctx;
- param = (axis2_param_t *)axis2_param_container_get_param(
+ param = (axutil_param_t *)axutil_param_container_get_param(
axis2_transport_in_desc_param_container(in_desc, env),
env, "port");
if (param)
{
- port_str = axis2_param_get_value(param, env);
+ port_str = axutil_param_get_value(param, env);
}
if (port_str)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Fri Mar 30 12:24:00 2007
@@ -18,18 +18,18 @@
#include <axis2_http_response_writer.h>
#include <axutil_array_list.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
struct axis2_http_response_writer
{
- axis2_stream_t *stream;
+ axutil_stream_t *stream;
axis2_char_t *encoding;
};
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create(
const axutil_env_t *env,
- axis2_stream_t *stream)
+ axutil_stream_t *stream)
{
AXIS2_ENV_CHECK(env, NULL);
return axis2_http_response_writer_create_with_encoding(env, stream,
@@ -40,7 +40,7 @@
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create_with_encoding(
const axutil_env_t *env,
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axis2_char_t *encoding)
{
axis2_http_response_writer_t *response_writer = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Fri Mar 30 12:24:00 2007
@@ -19,8 +19,8 @@
#include <axis2_http_svr_thread.h>
#include <axis2_http_server.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
-#include <axis2_network_handler.h>
+#include <axutil_string.h>
+#include <axutil_network_handler.h>
#include <axis2_http_simple_request.h>
#include <axis2_simple_http_svr_conn.h>
#include <axis2_url.h>
@@ -123,7 +123,7 @@
svr_thread_impl->worker = NULL;
svr_thread_impl->stopped = AXIS2_FALSE;
svr_thread_impl->port = port;
- svr_thread_impl->listen_socket = axis2_network_handler_create_server_socket
+ svr_thread_impl->listen_socket = axutil_network_handler_create_server_socket
(env, svr_thread_impl->port);
svr_thread_impl->svr_thread.ops = NULL;
if (-1 == svr_thread_impl->listen_socket)
@@ -173,7 +173,7 @@
}
if (-1 != svr_thread_impl->listen_socket)
{
- axis2_network_handler_close_socket(env, svr_thread_impl->listen_socket);
+ axutil_network_handler_close_socket(env, svr_thread_impl->listen_socket);
svr_thread_impl->listen_socket = -1;
}
svr_thread_impl->stopped = AXIS2_TRUE;
@@ -201,13 +201,13 @@
axis2_http_svr_thd_args_t *arg_list = NULL;
axis2_thread_t *worker_thread = NULL;
- socket = axis2_network_handler_svr_socket_accept(env,
+ socket = axutil_network_handler_svr_socket_accept(env,
svr_thread_impl->listen_socket);
if (! svr_thread_impl->worker)
{
AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "Worker not ready yet."
" Cannot serve the request");
- axis2_network_handler_close_socket(env, socket);
+ axutil_network_handler_close_socket(env, socket);
continue;
}
arg_list = AXIS2_MALLOC(env->allocator,
@@ -257,7 +257,7 @@
"thread.");
if (svr_thread_impl->listen_socket)
{
- axis2_network_handler_close_socket(env, svr_thread_impl->listen_socket);
+ axutil_network_handler_close_socket(env, svr_thread_impl->listen_socket);
svr_thread_impl->listen_socket = -1;
}
/* TODO: stop all the child threads */
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Fri Mar 30 12:24:00 2007
@@ -17,8 +17,8 @@
#include <axis2_simple_http_svr_conn.h>
#include <axis2_http_transport.h>
-#include <axis2_string.h>
-#include <axis2_network_handler.h>
+#include <axutil_string.h>
+#include <axutil_network_handler.h>
#include <axis2_http_chunked_stream.h>
#include <platforms/axis2_platform_auto_sense.h>
@@ -31,7 +31,7 @@
{
axis2_simple_http_svr_conn_t svr_conn;
int socket;
- axis2_stream_t *stream;
+ axutil_stream_t *stream;
axis2_bool_t keep_alive;
}
axis2_simple_http_svr_conn_impl_t;
@@ -62,7 +62,7 @@
axis2_simple_http_svr_conn_t *svr_conn,
const axutil_env_t *env);
-axis2_stream_t *AXIS2_CALL
+axutil_stream_t *AXIS2_CALL
axis2_simple_http_svr_conn_get_stream(
const axis2_simple_http_svr_conn_t *svr_conn,
const axutil_env_t *env);
@@ -141,7 +141,7 @@
if (-1 != svr_conn_impl->socket)
{
- svr_conn_impl->stream = axis2_stream_create_socket(env,
+ svr_conn_impl->stream = axutil_stream_create_socket(env,
svr_conn_impl->socket);
if (! svr_conn_impl->stream)
{
@@ -219,7 +219,7 @@
AXIS2_STREAM_FREE(svr_conn_impl->stream, env);
if (-1 != svr_conn_impl->socket)
{
- axis2_network_handler_close_socket(env, svr_conn_impl->socket);
+ axutil_network_handler_close_socket(env, svr_conn_impl->socket);
svr_conn_impl->socket = -1;
}
return AXIS2_SUCCESS;
@@ -269,7 +269,7 @@
}
-axis2_stream_t *AXIS2_CALL
+axutil_stream_t *AXIS2_CALL
axis2_simple_http_svr_conn_get_stream(
const axis2_simple_http_svr_conn_t *svr_conn,
const axutil_env_t *env)
@@ -309,7 +309,7 @@
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
memset(str_line, 0, 2048);
- while ((read = axis2_stream_peek_socket(svr_conn_impl->stream, env, tmp_buf, 2048)) > 0)
+ while ((read = axutil_stream_peek_socket(svr_conn_impl->stream, env, tmp_buf, 2048)) > 0)
{
axis2_char_t *start = tmp_buf;
axis2_char_t *end = NULL;
@@ -385,7 +385,7 @@
end_of_line = AXIS2_FALSE;
while (AXIS2_FALSE == end_of_headers)
{
- while ((read = axis2_stream_peek_socket(svr_conn_impl->stream, env, tmp_buf, 2048)) > 0)
+ while ((read = axutil_stream_peek_socket(svr_conn_impl->stream, env, tmp_buf, 2048)) > 0)
{
axis2_char_t *start = tmp_buf;
axis2_char_t *end = NULL;
@@ -461,7 +461,7 @@
axis2_http_response_writer_t *response_writer = NULL;
axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
axutil_array_list_t *headers = NULL;
- axis2_stream_t *response_stream = NULL;
+ axutil_stream_t *response_stream = NULL;
axis2_char_t *response_body = NULL;
int body_size = 0;
int i = 0;
@@ -548,8 +548,8 @@
if (response_stream)
{
body_size = AXIS2_STREAM_BASIC_GET_LEN(response_stream, env);
- response_body = axis2_stream_get_buffer(response_stream, env);
- axis2_stream_flush_buffer(response_stream, env);
+ response_body = axutil_stream_get_buffer(response_stream, env);
+ axutil_stream_flush_buffer(response_stream, env);
response_body[body_size] = '\0';
}
@@ -604,7 +604,7 @@
int timeout)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_network_handler_set_sock_option(env,
+ return axutil_network_handler_set_sock_option(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_RCVTIMEO,
timeout);
@@ -618,7 +618,7 @@
int timeout)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_network_handler_set_sock_option(env,
+ return axutil_network_handler_set_sock_option(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_SNDTIMEO,
timeout);
}
@@ -629,7 +629,7 @@
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_network_handler_get_svr_ip(env,
+ return axutil_network_handler_get_svr_ip(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket);
}
@@ -639,6 +639,6 @@
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return axis2_network_handler_get_peer_ip(env,
+ return axutil_network_handler_get_peer_ip(env,
AXIS2_INTF_TO_IMPL(svr_conn)->socket);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/axis2_http_sender_util.h Fri Mar 30 12:24:00 2007
@@ -18,7 +18,7 @@
#ifndef AXIS2_HTTP_SENDER_UTIL_H
#define AXIS2_HTTP_SENDER_UTIL_H
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <string.h>
#include <axiom_output.h>
@@ -27,8 +27,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/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Fri Mar 30 12:24:00 2007
@@ -18,9 +18,9 @@
#include <axis2_http_client.h>
#include <axis2_http_transport.h>
-#include <axis2_stream.h>
-#include <axis2_string.h>
-#include <axis2_network_handler.h>
+#include <axutil_stream.h>
+#include <axutil_string.h>
+#include <axutil_network_handler.h>
#include <axis2_http_request_line.h>
#include <axis2_http_header.h>
#include <axis2_http_status_line.h>
@@ -34,7 +34,7 @@
struct axis2_http_client
{
int sockfd;
- axis2_stream_t *data_stream;
+ axutil_stream_t *data_stream;
axis2_url_t *url;
axis2_http_simple_response_t *response;
axis2_bool_t request_sent;
@@ -100,7 +100,7 @@
}
if (-1 != http_client->sockfd)
{
- axis2_network_handler_close_socket(env, http_client->sockfd);
+ axutil_network_handler_close_socket(env, http_client->sockfd);
http_client->sockfd = -1;
}
@@ -162,12 +162,12 @@
{
return AXIS2_FAILURE;
}
- client->sockfd = axis2_network_handler_open_socket(env,
+ client->sockfd = axutil_network_handler_open_socket(env,
client->proxy_host, client->proxy_port);
}
else
{
- client->sockfd = axis2_network_handler_open_socket(env,
+ client->sockfd = axutil_network_handler_open_socket(env,
axis2_url_get_server(client->url, env),
axis2_url_get_port(client->url, env));
}
@@ -181,14 +181,14 @@
return AXIS2_FAILURE;
}
/* ONLY FOR TESTING
- * client->data_stream = axis2_stream_create_file(env,
+ * client->data_stream = axutil_stream_create_file(env,
* stdout);
*/
if (client->timeout > 0)
{
- axis2_network_handler_set_sock_option(env, client->sockfd,
+ axutil_network_handler_set_sock_option(env, client->sockfd,
SO_RCVTIMEO, client->timeout);
- axis2_network_handler_set_sock_option(env, client->sockfd,
+ axutil_network_handler_set_sock_option(env, client->sockfd,
SO_SNDTIMEO, client->timeout);
}
if (0 == axis2_strcasecmp(axis2_url_get_protocol(client->url, env),
@@ -204,7 +204,7 @@
return AXIS2_FAILURE;
}
}
- client->data_stream = axis2_stream_create_ssl(env,
+ client->data_stream = axutil_stream_create_ssl(env,
client->sockfd,
AXIS2_HTTP_CLIENT_GET_SERVER_CERT(client, env),
AXIS2_HTTP_CLIENT_GET_KEY_FILE(client, env),
@@ -217,13 +217,13 @@
}
else
{
- client->data_stream = axis2_stream_create_socket(env,
+ client->data_stream = axutil_stream_create_socket(env,
client->sockfd);
}
if (! client->data_stream)
{
- axis2_network_handler_close_socket(env, client->sockfd);
+ axutil_network_handler_close_socket(env, client->sockfd);
return AXIS2_FAILURE;
}
@@ -611,7 +611,7 @@
axis2_char_t *host,
int port)
{
- axis2_stream_t *tmp_stream = NULL;
+ axutil_stream_t *tmp_stream = NULL;
axis2_char_t *connect_string = NULL;
axis2_char_t str_status_line[512];
axis2_char_t tmp_buf[3];
@@ -628,7 +628,7 @@
return AXIS2_FAILURE;
}
- tmp_stream = axis2_stream_create_socket(env, client->sockfd);
+ tmp_stream = axutil_stream_create_socket(env, client->sockfd);
if (! tmp_stream)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_sender.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_http_transport.h>
#include <string.h>
#include <axiom_output.h>
@@ -25,8 +25,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>
@@ -149,20 +149,20 @@
axis2_char_t *buffer = NULL;
unsigned int buffer_size = 0;
const axis2_char_t *char_set_enc = NULL;
- axis2_string_t *char_set_enc_str = NULL;
+ axutil_string_t *char_set_enc_str = NULL;
int status_code = -1;
axis2_http_simple_response_t *response = NULL;
axis2_char_t *content_type = NULL;
axis2_byte_t *output_stream = NULL;
int output_stream_size = 0;
axis2_bool_t doing_mtom = AXIS2_FALSE;
- axis2_property_t *dump_property = NULL;
- axis2_param_t *ssl_pp_param = NULL; /* ssl passphrase */
+ axutil_property_t *dump_property = NULL;
+ axutil_param_t *ssl_pp_param = NULL; /* ssl passphrase */
axis2_char_t *ssl_pp = NULL;
- 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;
- axis2_property_t *method = NULL;
+ axutil_property_t *method = NULL;
axis2_char_t *method_value = NULL;
axis2_bool_t send_via_get = AXIS2_FALSE;
axiom_node_t *data_out = NULL;
@@ -202,10 +202,10 @@
}
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))
@@ -238,15 +238,15 @@
if (!send_via_get)
{
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
/* We put the client into msg_ctx so that we can free it once the processing
* is done at client side
*/
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_free_func(property, env, axis2_http_client_free_void_arg);
- axis2_property_set_value(property, env, sender->client);
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_free_func(property, env, axis2_http_client_free_void_arg);
+ axutil_property_set_value(property, env, sender->client);
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT, property);
doing_mtom = axis2_msg_ctx_get_doing_mtom(msg_ctx, env);
@@ -266,7 +266,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)
@@ -275,7 +275,7 @@
AXIS2_DUMP_INPUT_MSG_TRUE);
if(dump_property)
{
- axis2_char_t *dump_true = axis2_property_get_value(dump_property, env);
+ axis2_char_t *dump_true = axutil_property_get_value(dump_property, env);
if(0 == axis2_strcmp(dump_true, AXIS2_VALUE_TRUE))
{
AXIS2_HTTP_CLIENT_SET_DUMP_INPUT_MSG(sender->client, env, AXIS2_TRUE);
@@ -433,13 +433,13 @@
}
else
{
- 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,
@@ -476,7 +476,7 @@
if (doing_mtom)
{
- axis2_stream_t *stream = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(request, env);
+ axutil_stream_t *stream = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(request, env);
if (stream)
{
AXIS2_STREAM_WRITE(stream, env, output_stream, output_stream_size);
@@ -499,7 +499,7 @@
if (ssl_pp_param)
{
- ssl_pp = axis2_param_get_value(ssl_pp_param, env);
+ ssl_pp = axutil_param_get_value(ssl_pp_param, env);
}
status_code = AXIS2_HTTP_CLIENT_SEND(sender->client, env, request, ssl_pp);
@@ -605,7 +605,7 @@
int i = 0;
axis2_bool_t response_chunked = AXIS2_FALSE;
int *content_length = NULL;
- axis2_property_t *property = NULL;
+ axutil_property_t *property = NULL;
axis2_char_t *content_type = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -635,9 +635,9 @@
/* transfer_encoding = */
/* axis2_strdup(AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED, */
/* env); */
-/* property = axis2_property_create(env); */
-/* axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST); */
-/* axis2_property_set_value(property, env, transfer_encoding); */
+/* property = axutil_property_create(env); */
+/* axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST); */
+/* axutil_property_set_value(property, env, transfer_encoding); */
/* axis2_msg_ctx_set_property(msg_ctx, env, */
/* AXIS2_HTTP_HEADER_TRANSFER_ENCODING, */
/* property); */
@@ -672,9 +672,9 @@
{
axis2_ctx_t *axis_ctx = axis2_op_ctx_get_base(
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_value(property, env, axis2_strdup(env, content_type));
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_value(property, env, axis2_strdup(env, content_type));
axis2_ctx_set_property(axis_ctx, env, MTOM_RECIVED_CONTENT_TYPE,
property);
}
@@ -685,9 +685,9 @@
msg_ctx, env), env);
if (axis_ctx)
{
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_value(property, env, charset);
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_value(property, env, charset);
axis2_ctx_set_property(axis_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
property);
}
@@ -702,9 +702,9 @@
}
tmp_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(response, env);
memcpy(content_length, &tmp_len, sizeof(int));
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_value(property, env, content_length);
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_value(property, env, content_length);
axis2_msg_ctx_set_property(msg_ctx, env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, property);
}
@@ -718,8 +718,8 @@
axis2_msg_ctx_t *msg_ctx,
axis2_http_simple_response_t *response)
{
- axis2_stream_t *in_stream = NULL;
- axis2_property_t *property = NULL;
+ axutil_stream_t *in_stream = NULL;
+ axutil_property_t *property = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -736,10 +736,10 @@
axis2_http_sender_get_header_info(sender, env, msg_ctx, response);
/*axis_ctx = axis2_op_ctx_get_base( axis2_msg_ctx_get_op_ctx(msg_ctx, env),
env);*/
- property = axis2_property_create(env);
- axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
- axis2_property_set_free_func(property, env, axis2_stream_free_void_arg);
- axis2_property_set_value(property, env, in_stream);
+ property = axutil_property_create(env);
+ axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axutil_property_set_free_func(property, env, axutil_stream_free_void_arg);
+ axutil_property_set_value(property, env, in_stream);
/*axis2_ctx_set_property(axis_ctx, env, AXIS2_TRANSPORT_IN, property);*/
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, property);
return AXIS2_SUCCESS;
@@ -753,7 +753,7 @@
{
axis2_char_t *so_str = NULL;
axis2_char_t *connection_str = NULL;
- axis2_param_t *tmp_param = NULL;
+ axutil_param_t *tmp_param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -763,7 +763,7 @@
if (tmp_param)
{
- so_str = (axis2_char_t *)axis2_param_get_value(tmp_param, env);
+ so_str = (axis2_char_t *)axutil_param_get_value(tmp_param, env);
if (so_str)
{
sender->so_timeout = AXIS2_ATOI(so_str);
@@ -773,7 +773,7 @@
AXIS2_HTTP_CONNECTION_TIMEOUT);
if (tmp_param)
{
- connection_str = (axis2_char_t *)axis2_param_get_value(tmp_param, env);
+ connection_str = (axis2_char_t *)axutil_param_get_value(tmp_param, env);
if (connection_str)
{
sender->connection_timeout =
@@ -807,7 +807,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
axis2_transport_out_desc_t *trans_desc = NULL;
- axis2_param_t *proxy_param = NULL;
+ axutil_param_t *proxy_param = NULL;
axutil_hash_t *transport_attrs = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -830,12 +830,12 @@
return AXIS2_FAILURE;
}
- proxy_param = axis2_param_container_get_param(
+ proxy_param = axutil_param_container_get_param(
axis2_transport_out_desc_param_container(trans_desc, env),
env, AXIS2_HTTP_PROXY);
if (proxy_param)
{
- transport_attrs = axis2_param_get_attributes(proxy_param, env);
+ transport_attrs = axutil_param_get_attributes(proxy_param, env);
if (transport_attrs)
{
axutil_generic_obj_t *obj = NULL;
@@ -894,8 +894,8 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_property_t *server_cert_property = NULL;
- axis2_param_t *server_cert_param = NULL;
+ axutil_property_t *server_cert_property = NULL;
+ axutil_param_t *server_cert_param = NULL;
axis2_char_t *server_cert = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -906,7 +906,7 @@
AXIS2_SSL_SERVER_CERT);
if(server_cert_property)
{
- server_cert = (axis2_char_t *) axis2_property_get_value(
+ server_cert = (axis2_char_t *) axutil_property_get_value(
server_cert_property, env);
}
else
@@ -915,7 +915,7 @@
AXIS2_SSL_SERVER_CERT);
if(server_cert_param)
{
- server_cert = (axis2_char_t *) axis2_param_get_value(
+ server_cert = (axis2_char_t *) axutil_param_get_value(
server_cert_param, env);
}
}
@@ -935,8 +935,8 @@
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_property_t *key_file_property = NULL;
- axis2_param_t *key_file_param = NULL;
+ axutil_property_t *key_file_property = NULL;
+ axutil_param_t *key_file_param = NULL;
axis2_char_t *key_file = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -947,7 +947,7 @@
AXIS2_SSL_KEY_FILE);
if(key_file_property)
{
- key_file = (axis2_char_t *) axis2_property_get_value(
+ key_file = (axis2_char_t *) axutil_property_get_value(
key_file_property, env);
}
else
@@ -956,7 +956,7 @@
AXIS2_SSL_KEY_FILE);
if(key_file_param)
{
- key_file = (axis2_char_t *) axis2_param_get_value(
+ key_file = (axis2_char_t *) axutil_param_get_value(
key_file_param, env);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org