You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 20:28:34 UTC
svn commit: r524225 [3/22] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/
modules/core/clientapi/ modules/core/context/ modules/...
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Mar 30 11:28:18 2007
@@ -26,7 +26,7 @@
struct axis2_conf
{
- axis2_hash_t *svc_grps;
+ axutil_hash_t *svc_grps;
axis2_transport_in_desc_t *transports_in[AXIS2_TRANSPORT_ENUM_MAX];
axis2_transport_out_desc_t *transports_out[AXIS2_TRANSPORT_ENUM_MAX];
/**
@@ -34,19 +34,19 @@
*/
axutil_array_list_t *engaged_modules;
/*to store all the available modules (including version)*/
- axis2_hash_t *all_modules;
+ axutil_hash_t *all_modules;
/*to store mapping between default version to module name*/
- axis2_hash_t *name_to_version_map;
+ axutil_hash_t *name_to_version_map;
axutil_array_list_t *out_phases;
axutil_array_list_t *in_fault_phases;
axutil_array_list_t *out_fault_phases;
axutil_array_list_t *in_phases_upto_and_including_post_dispatch;
axis2_phases_info_t *phases_info;
- axis2_hash_t *all_svcs;
- axis2_hash_t *msg_recvs;
- axis2_hash_t *faulty_svcs;
- axis2_hash_t *faulty_modules;
+ axutil_hash_t *all_svcs;
+ axutil_hash_t *msg_recvs;
+ axutil_hash_t *faulty_svcs;
+ axutil_hash_t *faulty_modules;
axis2_char_t *axis2_repo;
axis2_dep_engine_t *dep_engine;
axutil_array_list_t *handlers;
@@ -106,7 +106,7 @@
return NULL;
}
- conf->svc_grps = axis2_hash_make(env);
+ conf->svc_grps = axutil_hash_make(env);
if (! conf->svc_grps)
{
axis2_conf_free(conf, env);
@@ -197,7 +197,7 @@
}
- conf->all_svcs = axis2_hash_make(env);
+ conf->all_svcs = axutil_hash_make(env);
if (! conf->all_svcs)
{
axis2_conf_free(conf, env);
@@ -205,7 +205,7 @@
return NULL;
}
- conf->msg_recvs = axis2_hash_make(env);
+ conf->msg_recvs = axutil_hash_make(env);
if (! conf->msg_recvs)
{
axis2_conf_free(conf, env);
@@ -213,7 +213,7 @@
return NULL;
}
- conf->faulty_svcs = axis2_hash_make(env);
+ conf->faulty_svcs = axutil_hash_make(env);
if (! conf->faulty_svcs)
{
axis2_conf_free(conf, env);
@@ -221,7 +221,7 @@
return NULL;
}
- conf->faulty_modules = axis2_hash_make(env);
+ conf->faulty_modules = axutil_hash_make(env);
if (! conf->faulty_modules)
{
axis2_conf_free(conf, env);
@@ -229,7 +229,7 @@
return NULL;
}
- conf->all_modules = axis2_hash_make(env);
+ conf->all_modules = axutil_hash_make(env);
if (! conf->all_modules)
{
axis2_conf_free(conf, env);
@@ -237,7 +237,7 @@
return NULL;
}
- conf->name_to_version_map = axis2_hash_make(env);
+ conf->name_to_version_map = axutil_hash_make(env);
if (! conf->name_to_version_map)
{
axis2_conf_free(conf, env);
@@ -264,18 +264,18 @@
if (conf->svc_grps)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(conf->svc_grps, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(conf->svc_grps, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_svc_grp_t * svc_grp = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
svc_grp = (axis2_svc_grp_t *) val;
if (svc_grp)
axis2_svc_grp_free(svc_grp, env);
}
- axis2_hash_free(conf->svc_grps, env);
+ axutil_hash_free(conf->svc_grps, env);
}
for (i = 0; i < AXIS2_TRANSPORT_ENUM_MAX; i++)
@@ -301,40 +301,40 @@
if (conf->all_modules)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(conf->all_modules, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(conf->all_modules, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_module_desc_t * module_desc = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
module_desc = (axis2_module_desc_t *) val;
if (module_desc)
{
axis2_module_desc_free(module_desc, env);
}
}
- axis2_hash_free(conf->all_modules, env);
+ axutil_hash_free(conf->all_modules, env);
}
if (conf->name_to_version_map)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(conf->name_to_version_map, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(conf->name_to_version_map, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_char_t * module_ver = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
module_ver = (axis2_char_t *) val;
if (module_ver)
{
AXIS2_FREE(env->allocator, module_ver);
}
}
- axis2_hash_free(conf->name_to_version_map, env);
+ axutil_hash_free(conf->name_to_version_map, env);
}
if (conf->engaged_modules)
@@ -407,18 +407,18 @@
if (conf->all_svcs)
{
- axis2_hash_free(conf->all_svcs, env);
+ axutil_hash_free(conf->all_svcs, env);
}
if (conf->msg_recvs)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(conf->msg_recvs, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(conf->msg_recvs, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_msg_recv_t * msg_recv = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
msg_recv = (axis2_msg_recv_t *) val;
if (msg_recv)
{
@@ -426,28 +426,28 @@
msg_recv = NULL;
}
}
- axis2_hash_free(conf->msg_recvs, env);
+ axutil_hash_free(conf->msg_recvs, env);
}
if (conf->faulty_svcs)
{
- axis2_hash_free(conf->faulty_svcs, env);
+ axutil_hash_free(conf->faulty_svcs, env);
}
if (conf->faulty_modules)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
- for (hi = axis2_hash_first(conf->faulty_modules, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(conf->faulty_modules, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_module_desc_t * module_desc = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
module_desc = (axis2_module_desc_t *) val;
if (module_desc)
axis2_module_desc_free(module_desc, env);
}
- axis2_hash_free(conf->faulty_modules, env);
+ axutil_hash_free(conf->faulty_modules, env);
}
if (conf->handlers)
@@ -484,8 +484,8 @@
const axutil_env_t *env,
axis2_svc_grp_t *svc_grp)
{
- axis2_hash_t *svcs = NULL;
- axis2_hash_index_t *index_i = NULL;
+ axutil_hash_t *svcs = NULL;
+ axutil_hash_index_t *index_i = NULL;
axis2_char_t *svc_name = NULL;
const axis2_char_t *svc_grp_name = NULL;
int k = 0;
@@ -496,12 +496,12 @@
svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
if (!conf->all_svcs)
{
- conf->all_svcs = axis2_hash_make(env);
+ conf->all_svcs = axutil_hash_make(env);
if (!conf->all_svcs)
return AXIS2_FAILURE;
}
- k = axis2_hash_count(svcs);
- index_i = axis2_hash_first(svcs, env);
+ k = axutil_hash_count(svcs);
+ index_i = axutil_hash_first(svcs, env);
while (index_i)
{
void *value = NULL;
@@ -509,12 +509,12 @@
axis2_char_t *svc_name2 = NULL;
const axis2_qname_t *svc_qname = NULL;
- axis2_hash_this(index_i, NULL, NULL, &value);
+ 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_name2 = axis2_hash_get(conf->all_svcs, svc_name,
+ svc_name2 = axutil_hash_get(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
/* no two service names deployed in the engine can be same */
if (svc_name2)
@@ -523,32 +523,32 @@
AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- index_i = axis2_hash_next(env, index_i);
+ index_i = axutil_hash_next(env, index_i);
}
svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
- index_i = axis2_hash_first(svcs, env);
+ index_i = axutil_hash_first(svcs, env);
while (index_i)
{
void *value = NULL;
axis2_svc_t *desc = NULL;
- axis2_hash_this(index_i, NULL, NULL, &value);
+ 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);
- axis2_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
desc);
- index_i = axis2_hash_next(env, index_i);
+ index_i = axutil_hash_next(env, index_i);
}
svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
if (!conf->svc_grps)
{
- conf->svc_grps = axis2_hash_make(env);
+ conf->svc_grps = axutil_hash_make(env);
if (!conf->svc_grps)
return AXIS2_FAILURE;
}
- axis2_hash_set(conf->svc_grps, svc_grp_name,
+ axutil_hash_set(conf->svc_grps, svc_grp_name,
AXIS2_HASH_KEY_STRING, svc_grp);
return AXIS2_SUCCESS;
@@ -569,11 +569,11 @@
AXIS2_FAILURE);
return NULL;
}
- return (axis2_svc_grp_t *)(axis2_hash_get(conf->svc_grps,
+ return (axis2_svc_grp_t *)(axutil_hash_get(conf->svc_grps,
svc_grp_name, AXIS2_HASH_KEY_STRING));
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_conf_get_all_svc_grps(
const axis2_conf_t *conf,
const axutil_env_t *env)
@@ -644,7 +644,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
- return axis2_hash_get(conf->all_svcs, svc_name,
+ return axutil_hash_get(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
}
@@ -657,7 +657,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
- axis2_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(conf->all_svcs, svc_name, AXIS2_HASH_KEY_STRING,
NULL);
return AXIS2_SUCCESS;
}
@@ -806,7 +806,7 @@
AXIS2_PARAM_CHECK(env->error, qname, NULL);
name = axis2_qname_to_string((axis2_qname_t *)qname, env);
- ret = (axis2_module_desc_t *) axis2_hash_get(conf->all_modules,
+ ret = (axis2_module_desc_t *) axutil_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
if (ret)
{
@@ -824,7 +824,7 @@
return NULL;
}
name = axis2_qname_to_string(mod_qname, env);
- ret = (axis2_module_desc_t *) axis2_hash_get(conf->all_modules,
+ ret = (axis2_module_desc_t *) axutil_hash_get(conf->all_modules,
name, AXIS2_HASH_KEY_STRING);
axis2_qname_free(mod_qname, env);
mod_qname = NULL;
@@ -879,7 +879,7 @@
return (axis2_transport_out_desc_t **)conf->transports_out;
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_conf_get_all_faulty_svcs(
const axis2_conf_t *conf,
const axutil_env_t *env)
@@ -887,7 +887,7 @@
return conf->faulty_svcs;
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_conf_get_all_faulty_modules(
const axis2_conf_t *conf,
const axutil_env_t *env)
@@ -895,44 +895,44 @@
return conf->faulty_modules;
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_conf_get_all_svcs(
const axis2_conf_t *conf,
const axutil_env_t *env)
{
- axis2_hash_t *sgs = NULL;
- axis2_hash_index_t *index_i = NULL;
- axis2_hash_index_t *index_j = NULL;
+ axutil_hash_t *sgs = NULL;
+ axutil_hash_index_t *index_i = NULL;
+ axutil_hash_index_t *index_j = NULL;
void *value = NULL;
void *value2 = NULL;
axis2_svc_grp_t *axis_svc_grp = NULL;
- axis2_hash_t *svcs = NULL;
+ axutil_hash_t *svcs = NULL;
axis2_svc_t *svc = NULL;
axis2_char_t *svc_name = NULL;
AXIS2_ENV_CHECK(env, NULL);
sgs = axis2_conf_get_all_svc_grps(conf, env);
- index_i = axis2_hash_first(sgs, env);
+ index_i = axutil_hash_first(sgs, env);
while (index_i)
{
- axis2_hash_this(index_i, NULL, NULL, &value);
+ axutil_hash_this(index_i, NULL, NULL, &value);
axis_svc_grp = (axis2_svc_grp_t *) value;
svcs = axis2_svc_grp_get_all_svcs(axis_svc_grp, env);
- index_j = axis2_hash_first(svcs, env);
+ index_j = axutil_hash_first(svcs, env);
while (index_j)
{
- axis2_hash_this(index_j, NULL, NULL, &value2);
+ 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);
- axis2_hash_set(conf->all_svcs, svc_name,
+ axutil_hash_set(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
- index_j = axis2_hash_next(env, index_j);
+ index_j = axutil_hash_next(env, index_j);
}
- index_i = axis2_hash_next(env, index_i);
+ index_i = axutil_hash_next(env, index_i);
}
return conf->all_svcs;
}
@@ -1013,11 +1013,11 @@
AXIS2_PARAM_CHECK(env->error, msg_recv, AXIS2_FAILURE);
if (!conf->msg_recvs)
{
- conf->msg_recvs = axis2_hash_make(env);
+ conf->msg_recvs = axutil_hash_make(env);
if (!conf->msg_recvs)
return AXIS2_FAILURE;
}
- axis2_hash_set(conf->msg_recvs, key, AXIS2_HASH_KEY_STRING, msg_recv);
+ axutil_hash_set(conf->msg_recvs, key, AXIS2_HASH_KEY_STRING, msg_recv);
return AXIS2_SUCCESS;
}
@@ -1027,7 +1027,7 @@
const axutil_env_t *env,
axis2_char_t *key)
{
- return (axis2_msg_recv_t *) axis2_hash_get(conf->msg_recvs, key, AXIS2_HASH_KEY_STRING);
+ return (axis2_msg_recv_t *) axutil_hash_get(conf->msg_recvs, key, AXIS2_HASH_KEY_STRING);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -1092,7 +1092,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_conf_get_all_modules(
const axis2_conf_t *conf,
const axutil_env_t *env)
@@ -1127,7 +1127,7 @@
{
axis2_char_t *module_name = NULL;
module_name = axis2_qname_to_string((axis2_qname_t *)module_qname, env);
- axis2_hash_set(conf->all_modules, module_name,
+ axutil_hash_set(conf->all_modules, module_name,
AXIS2_HASH_KEY_STRING, module);
}
@@ -1429,7 +1429,7 @@
const axutil_env_t *env,
const axis2_char_t *module_name)
{
- axis2_hash_t *def_ver_map = NULL;
+ axutil_hash_t *def_ver_map = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
@@ -1438,7 +1438,7 @@
{
return NULL;
}
- return axis2_hash_get(def_ver_map, module_name, AXIS2_HASH_KEY_STRING);
+ return axutil_hash_get(def_ver_map, module_name, AXIS2_HASH_KEY_STRING);
}
AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
@@ -1450,7 +1450,7 @@
axis2_module_desc_t *ret_mod = NULL;
axis2_char_t *mod_name = NULL;
const axis2_char_t *mod_ver = NULL;
- axis2_hash_t *all_modules = NULL;
+ axutil_hash_t *all_modules = NULL;
axis2_qname_t *mod_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -1478,7 +1478,7 @@
{
return NULL;
}
- ret_mod = (axis2_module_desc_t *)axis2_hash_get(all_modules,
+ ret_mod = (axis2_module_desc_t *)axutil_hash_get(all_modules,
axis2_qname_to_string(mod_qname, env),
AXIS2_HASH_KEY_STRING);
@@ -1493,7 +1493,7 @@
const axis2_char_t *module_name,
const axis2_char_t *module_version)
{
- axis2_hash_t *name_to_ver_map = NULL;
+ axutil_hash_t *name_to_ver_map = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
@@ -1504,7 +1504,7 @@
*/
name_to_ver_map = conf->name_to_version_map;
- if (!axis2_hash_get(name_to_ver_map, module_name,
+ if (!axutil_hash_get(name_to_ver_map, module_name,
AXIS2_HASH_KEY_STRING))
{
axis2_char_t *new_entry = axis2_strdup(env, module_version);
@@ -1512,7 +1512,7 @@
{
return AXIS2_FAILURE;
}
- axis2_hash_set(name_to_ver_map, module_name, AXIS2_HASH_KEY_STRING,
+ axutil_hash_set(name_to_ver_map, module_name, AXIS2_HASH_KEY_STRING,
new_entry);
return AXIS2_SUCCESS;
}
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Fri Mar 30 11:28:18 2007
@@ -17,7 +17,7 @@
#include <axis2_engine.h>
#include <axis2_const.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axiom_soap_const.h>
#include <axiom_soap_envelope.h>
#include <axiom_soap_body.h>
@@ -661,8 +661,8 @@
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
- axis2_hash_t *header_block_ht = NULL;
- axis2_hash_index_t *hash_index = NULL;
+ axutil_hash_t *header_block_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -679,14 +679,14 @@
if (!header_block_ht)
return AXIS2_SUCCESS;
- for (hash_index = axis2_hash_first(header_block_ht, env); hash_index;
- hash_index = axis2_hash_next(env, hash_index))
+ for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
+ hash_index = axutil_hash_next(env, hash_index))
{
void *hb = NULL;
axiom_soap_header_block_t *header_block = NULL;
axis2_char_t *role = NULL;
- axis2_hash_this(hash_index, NULL, NULL, &hb);
+ axutil_hash_this(hash_index, NULL, NULL, &hb);
header_block = (axiom_soap_header_block_t *)hb;
if (header_block)
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Fri Mar 30 11:28:18 2007
@@ -140,22 +140,22 @@
axis2_phase_resolver_t *phase_resolver,
const axutil_env_t *env)
{
- axis2_hash_index_t *index_i = 0;
+ axutil_hash_index_t *index_i = 0;
axis2_status_t status = AXIS2_FAILURE;
axis2_op_t *op = NULL;
- axis2_hash_t *ops = NULL;
+ axutil_hash_t *ops = NULL;
if (!(phase_resolver->svc))
return AXIS2_FAILURE;
ops = axis2_svc_get_all_ops(phase_resolver->svc, env);
- for (index_i = axis2_hash_first(ops, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ for (index_i = axutil_hash_first(ops, env); index_i; index_i =
+ axutil_hash_next(env, index_i))
{
void *v = NULL;
int j = 0;
- axis2_hash_this(index_i, NULL, NULL, &v);
+ axutil_hash_this(index_i, NULL, NULL, &v);
op = (axis2_op_t *)v;
for (j = 1; j < 5; j++)
{
@@ -845,8 +845,8 @@
const axutil_env_t *env,
axis2_module_desc_t *module_desc)
{
- axis2_hash_t *svc_grps = NULL;
- axis2_hash_index_t *index_i = NULL;
+ axutil_hash_t *svc_grps = NULL;
+ axutil_hash_index_t *index_i = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -863,26 +863,26 @@
{
return AXIS2_FAILURE;
}
- for (index_i = axis2_hash_first(svc_grps, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ for (index_i = axutil_hash_first(svc_grps, env); index_i; index_i =
+ axutil_hash_next(env, index_i))
{
- axis2_hash_t *svcs = NULL;
+ axutil_hash_t *svcs = NULL;
axis2_svc_grp_t *svc_grp = NULL;
void *v = NULL;
- axis2_hash_index_t *index_j = NULL;
+ axutil_hash_index_t *index_j = NULL;
const axis2_qname_t *mod_name = NULL;
- axis2_hash_this(index_i, NULL, NULL, &v);
+ axutil_hash_this(index_i, NULL, NULL, &v);
svc_grp = (axis2_svc_grp_t *) v;
svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
- for (index_j = axis2_hash_first(svcs, env); index_j; index_j =
- axis2_hash_next(env, index_j))
+ for (index_j = axutil_hash_first(svcs, env); index_j; index_j =
+ axutil_hash_next(env, index_j))
{
axis2_svc_t *svc = NULL;
void *w = NULL;
- axis2_hash_this(index_j, NULL, NULL, &w);
+ axutil_hash_this(index_j, NULL, NULL, &w);
svc = (axis2_svc_t *) w;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
axis2_svc_get_name(svc, env));
@@ -921,9 +921,9 @@
axis2_svc_t *svc,
axis2_module_desc_t *module_desc)
{
- axis2_hash_t *ops = NULL;
+ axutil_hash_t *ops = NULL;
axis2_bool_t engaged = AXIS2_FALSE;
- axis2_hash_index_t *index_i = NULL;
+ axutil_hash_index_t *index_i = NULL;
int type = 0;
axis2_status_t status = AXIS2_FAILURE;
axis2_phase_holder_t *phase_holder = NULL;
@@ -938,8 +938,8 @@
return AXIS2_FAILURE;
}
- for (index_i = axis2_hash_first(ops, env); index_i;
- index_i = axis2_hash_next(env, index_i))
+ for (index_i = axutil_hash_first(ops, env); index_i;
+ index_i = axutil_hash_next(env, index_i))
{
void *v = NULL;
axis2_op_t *op_desc = NULL;
@@ -949,7 +949,7 @@
const axis2_qname_t *module_desc_qname = NULL;
int size = 0;
- axis2_hash_this(index_i, NULL, NULL, &v);
+ 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));
@@ -1247,8 +1247,8 @@
axis2_svc_t *svc,
axis2_module_desc_t *module_desc)
{
- axis2_hash_t *ops = NULL;
- axis2_hash_index_t *index_i = NULL;
+ 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;
@@ -1267,8 +1267,8 @@
return status;
}
module_d_qname = axis2_module_desc_get_qname(module_desc, env);
- for (index_i = axis2_hash_first(ops, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ for (index_i = axutil_hash_first(ops, env); index_i; index_i =
+ axutil_hash_next(env, index_i))
{
axutil_array_list_t *modules = NULL;
axis2_op_t *op_desc = NULL;
@@ -1277,7 +1277,7 @@
void *v = NULL;
axis2_bool_t engaged = AXIS2_FALSE;
- axis2_hash_this(index_i, NULL, NULL, &v);
+ axutil_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
modules = axis2_op_get_all_modules(op_desc, env);
if (modules)
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -53,7 +53,7 @@
axis2_conf_ctx_t *conf_ctx,
axis2_http_simple_response_t *simple_response);
-static axis2_hash_t *
+static axutil_hash_t *
axis2_http_worker_get_headers(
axis2_http_worker_t *http_worker,
const axutil_env_t *env,
@@ -121,7 +121,7 @@
axis2_char_t *peer_ip = NULL;
axis2_url_t *request_url = NULL;
axis2_http_out_transport_info_t *http_out_transport_info = NULL;
- axis2_hash_t *headers = NULL;
+ axutil_hash_t *headers = NULL;
axis2_char_t *url_external_form = NULL;
axis2_char_t *svc_grp_uuid = NULL;
axis2_char_t *path = NULL;
@@ -527,7 +527,7 @@
return AXIS2_SUCCESS;
}
-static axis2_hash_t *
+static axutil_hash_t *
axis2_http_worker_get_headers(
axis2_http_worker_t *http_worker,
const axutil_env_t *env,
@@ -536,7 +536,7 @@
axutil_array_list_t *header_list = NULL;
int hdr_count = 0;
int i = 0;
- axis2_hash_t *header_map = NULL;
+ axutil_hash_t *header_map = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, request, AXIS2_FAILURE);
@@ -561,13 +561,13 @@
}
if (!header_map)
{
- header_map = axis2_hash_make(env);
+ header_map = axutil_hash_make(env);
if (!header_map)
{
return NULL;
}
}
- axis2_hash_set(header_map, AXIS2_HTTP_HEADER_GET_NAME(tmp_hdr, env),
+ axutil_hash_set(header_map, AXIS2_HTTP_HEADER_GET_NAME(tmp_hdr, env),
AXIS2_HASH_KEY_STRING, tmp_hdr);
}
return header_map;
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -160,7 +160,7 @@
axis2_param_t *ssl_pp_param = NULL; /* ssl passphrase */
axis2_char_t *ssl_pp = NULL;
axis2_property_t *content_type_property = NULL;
- axis2_hash_t *content_type_hash = NULL;
+ axutil_hash_t *content_type_hash = NULL;
axis2_char_t *content_type_value = NULL;
axis2_property_t *method = NULL;
axis2_char_t *method_value = NULL;
@@ -439,9 +439,9 @@
if (content_type_property)
{
- content_type_hash = (axis2_hash_t *) axis2_property_get_value (content_type_property, env);
+ content_type_hash = (axutil_hash_t *) axis2_property_get_value (content_type_property, env);
if (content_type_hash)
- content_type_value = (char *) axis2_hash_get (content_type_hash,
+ content_type_value = (char *) axutil_hash_get (content_type_hash,
AXIS2_HTTP_HEADER_CONTENT_TYPE,
AXIS2_HASH_KEY_STRING);
}
@@ -808,7 +808,7 @@
axis2_conf_t *conf = NULL;
axis2_transport_out_desc_t *trans_desc = NULL;
axis2_param_t *proxy_param = NULL;
- axis2_hash_t *transport_attrs = NULL;
+ axutil_hash_t *transport_attrs = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -844,7 +844,7 @@
axis2_char_t *proxy_host = NULL;
axis2_char_t *proxy_port = NULL;
- obj = axis2_hash_get(transport_attrs, AXIS2_PROXY_HOST_NAME,
+ obj = axutil_hash_get(transport_attrs, AXIS2_PROXY_HOST_NAME,
AXIS2_HASH_KEY_STRING);
if (! obj)
{
@@ -864,7 +864,7 @@
/* Now we get the port */
obj = NULL;
- obj = axis2_hash_get(transport_attrs, AXIS2_PROXY_HOST_PORT,
+ obj = axutil_hash_get(transport_attrs, AXIS2_PROXY_HOST_PORT,
AXIS2_HASH_KEY_STRING);
port_attr = (axiom_attribute_t*) axis2_generic_obj_get_value(obj,
env);
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -237,7 +237,7 @@
else
{
axis2_property_t *content_type_property = NULL;
- axis2_hash_t *content_type_hash = NULL;
+ axutil_hash_t *content_type_hash = NULL;
axis2_char_t *content_type_value = NULL;
AXIOM_NODE_SERIALIZE(data_out, env, om_output);
@@ -247,9 +247,9 @@
if (content_type_property)
{
- content_type_hash = (axis2_hash_t *) axis2_property_get_value (content_type_property, env);
+ content_type_hash = (axutil_hash_t *) axis2_property_get_value (content_type_property, env);
if (content_type_hash)
- content_type_value = (char *) axis2_hash_get (content_type_hash,
+ content_type_value = (char *) axutil_hash_get (content_type_hash,
AXIS2_HTTP_HEADER_CONTENT_TYPE,
AXIS2_HASH_KEY_STRING);
}
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -28,7 +28,7 @@
#include <axis2_utils.h>
#include <axiom_namespace.h>
#include <axiom_node.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axiom_soap_const.h>
#include <axis2_http_header.h>
#include <axis2_property.h>
@@ -63,7 +63,7 @@
axis2_string_t *soap_action_header,
const axis2_char_t *request_uri,
axis2_conf_ctx_t *conf_ctx,
- axis2_hash_t *request_params);
+ axutil_hash_t *request_params);
AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
axis2_http_transport_utils_select_builder_for_mime(
@@ -140,7 +140,7 @@
axis2_http_transport_utils_handle_media_type_url_encoded(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_hash_t *param_map,
+ axutil_hash_t *param_map,
axis2_char_t *method,
xml_schema_element_t *schema_element);*/
@@ -148,7 +148,7 @@
axis2_http_transport_utils_handle_media_type_url_encoded(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_hash_t *param_map,
+ axutil_hash_t *param_map,
axis2_char_t *method);
/***************************** End of function headers ************************/
@@ -173,11 +173,11 @@
/*axis2_char_t *xml_char_set = NULL;*/
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_callback_info_t *callback_ctx;
- axis2_hash_t *headers = NULL;
+ axutil_hash_t *headers = NULL;
axis2_engine_t *engine = NULL;
axiom_soap_body_t *soap_body = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_hash_t *binary_data_map = NULL;
+ axutil_hash_t *binary_data_map = NULL;
axis2_char_t *soap_body_str = NULL;
axis2_stream_t *stream = NULL;
axis2_bool_t do_rest = AXIS2_FALSE;
@@ -223,7 +223,7 @@
if (headers)
{
axis2_http_header_t *encoding_header = NULL;
- encoding_header = (axis2_http_header_t *)axis2_hash_get(headers,
+ encoding_header = (axis2_http_header_t *)axutil_hash_get(headers,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
AXIS2_HASH_KEY_STRING);
if (encoding_header)
@@ -520,7 +520,7 @@
axis2_string_t *soap_action_header,
const axis2_char_t *request_uri,
axis2_conf_ctx_t *conf_ctx,
- axis2_hash_t *request_params)
+ axutil_hash_t *request_params)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axis2_engine_t *engine = NULL;
@@ -646,7 +646,7 @@
return AXIS2_FALSE;
}
-AXIS2_EXTERN axis2_hash_t *AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_http_transport_utils_get_request_params(
const axutil_env_t *env,
axis2_char_t *request_uri)
@@ -658,7 +658,7 @@
axis2_char_t *tmp2 = NULL;
axis2_char_t *tmp_name = NULL;
axis2_char_t *tmp_value = NULL;
- axis2_hash_t *ret = NULL;
+ axutil_hash_t *ret = NULL;
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
@@ -688,9 +688,9 @@
{
if (! ret)
{
- ret = axis2_hash_make(env);
+ ret = axutil_hash_make(env);
}
- axis2_hash_set(ret, tmp_name, AXIS2_HASH_KEY_STRING, tmp_value);
+ axutil_hash_set(ret, tmp_name, AXIS2_HASH_KEY_STRING, tmp_value);
tmp_name = NULL;
tmp_value = NULL;
}
@@ -699,11 +699,11 @@
{
if (! ret)
{
- ret = axis2_hash_make(env);
+ ret = axutil_hash_make(env);
}
tmp_value = axis2_strdup(env, tmp2);
axis2_http_transport_utils_strdecode(env, tmp_value, tmp_value);
- axis2_hash_set(ret, tmp_name, AXIS2_HASH_KEY_STRING, tmp_value);
+ axutil_hash_set(ret, tmp_name, AXIS2_HASH_KEY_STRING, tmp_value);
}
return ret;
@@ -763,11 +763,11 @@
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
- axis2_hash_t *services_map = NULL;
- axis2_hash_t *errorneous_svc_map = NULL;
+ axutil_hash_t *services_map = NULL;
+ axutil_hash_t *errorneous_svc_map = NULL;
axis2_char_t *ret = NULL;
axis2_char_t *tmp2 = (axis2_char_t *)"<h2>Deployed Services</h2>";
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
axis2_bool_t svcs_exists = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, NULL);
@@ -777,17 +777,17 @@
env);
errorneous_svc_map = axis2_conf_get_all_faulty_svcs( axis2_conf_ctx_get_conf(
conf_ctx, env), env);
- if (services_map && 0 != axis2_hash_count(services_map))
+ if (services_map && 0 != axutil_hash_count(services_map))
{
void *service = NULL;
axis2_char_t *sname = NULL;
- axis2_hash_t *ops = NULL;
+ axutil_hash_t *ops = NULL;
svcs_exists = AXIS2_TRUE;
- for (hi = axis2_hash_first(services_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(services_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, NULL, NULL, &service);
+ axutil_hash_this(hi, NULL, NULL, &service);
sname = axis2_qname_get_localpart(axis2_svc_get_qname(
((axis2_svc_t *)service), env), env);
ret = axis2_stracat(env, tmp2, "<h3><u>");
@@ -806,19 +806,19 @@
ret = axis2_stracat (env, tmp2, "</p>");
tmp2 = ret;
ops = axis2_svc_get_all_ops(((axis2_svc_t *)service), env);
- if (ops && 0 != axis2_hash_count(ops))
+ if (ops && 0 != axutil_hash_count(ops))
{
- axis2_hash_index_t *hi2 = NULL;
+ axutil_hash_index_t *hi2 = NULL;
void *op = NULL;
axis2_char_t *oname = NULL;
ret = axis2_stracat(env, tmp2, "<i>Available Operations</i> <ul>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi2 = axis2_hash_first(ops, env); hi2;
- hi2 = axis2_hash_next(env, hi2))
+ for (hi2 = axutil_hash_first(ops, env); hi2;
+ hi2 = axutil_hash_next(env, hi2))
{
- axis2_hash_this(hi2, NULL, NULL, &op);
+ axutil_hash_this(hi2, NULL, NULL, &op);
oname = axis2_qname_get_localpart(axis2_op_get_qname(
((axis2_op_t *)op), env), env);
ret = axis2_stracat(env, tmp2, "<li>");
@@ -844,7 +844,7 @@
}
}
}
- if (errorneous_svc_map && 0 != axis2_hash_count(errorneous_svc_map))
+ if (errorneous_svc_map && 0 != axutil_hash_count(errorneous_svc_map))
{
void *fsname = NULL;
svcs_exists = AXIS2_TRUE;
@@ -853,10 +853,10 @@
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi = axis2_hash_first(errorneous_svc_map, env); hi;
- axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(errorneous_svc_map, env); hi;
+ axutil_hash_next(env, hi))
{
- axis2_hash_this(hi, (const void **)&fsname, NULL, NULL);
+ axutil_hash_this(hi, (const void **)&fsname, NULL, NULL);
ret = axis2_stracat(env, tmp2, "<h3><font color=\"red\">");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
@@ -1032,7 +1032,7 @@
axis2_char_t *trans_enc = NULL;
int *content_length = NULL;
axis2_property_t *property = NULL;
- axis2_hash_t *binary_data_map = NULL;
+ axutil_hash_t *binary_data_map = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
@@ -1308,7 +1308,7 @@
axis2_http_transport_utils_handle_media_type_url_encoded(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_hash_t *param_map,
+ axutil_hash_t *param_map,
axis2_char_t *method,
xml_schema_element_t *schema_element)
{
@@ -1340,16 +1340,16 @@
axiom_soap_body_add_child(soap_body, env, body_child_node);
if (param_map)
{
- axis2_hash_index_t *hi = NULL;
- for (hi = axis2_hash_first(param_map, env); hi ;
- hi = axis2_hash_next(env, hi))
+ axutil_hash_index_t *hi = NULL;
+ for (hi = axutil_hash_first(param_map, env); hi ;
+ hi = axutil_hash_next(env, hi))
{
void *name = NULL;
void *value = NULL;
axiom_node_t *node = NULL;
axiom_element_t *element = NULL;
- axis2_hash_this(hi, (const void **)&name, NULL, (void **)&value);
+ axutil_hash_this(hi, (const void **)&name, NULL, (void **)&value);
element = axiom_element_create(env, NULL, (axis2_char_t *)name,
NULL, &node);
axiom_element_set_text(element, env, (axis2_char_t *)value, node);
@@ -1408,7 +1408,7 @@
i);
element_name = XML_SCHEMA_ELEMENT_GET_NAME(inner_element,
env);
- param_val = axis2_hash_get(param_map, element_name,
+ param_val = axutil_hash_get(param_map, element_name,
AXIS2_HASH_KEY_STRING);
if (! param_val)
{
@@ -1438,7 +1438,7 @@
axis2_http_transport_utils_handle_media_type_url_encoded(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- axis2_hash_t *param_map,
+ axutil_hash_t *param_map,
axis2_char_t *method)
{
axiom_soap_envelope_t *soap_env = NULL;
@@ -1467,16 +1467,16 @@
axiom_soap_body_add_child(soap_body, env, body_child_node);
if (param_map)
{
- axis2_hash_index_t *hi = NULL;
- for (hi = axis2_hash_first(param_map, env); hi ;
- hi = axis2_hash_next(env, hi))
+ axutil_hash_index_t *hi = NULL;
+ for (hi = axutil_hash_first(param_map, env); hi ;
+ hi = axutil_hash_next(env, hi))
{
void *name = NULL;
void *value = NULL;
axiom_node_t *node = NULL;
axiom_element_t *element = NULL;
- axis2_hash_this(hi, (const void **)&name, NULL, (void **)&value);
+ axutil_hash_this(hi, (const void **)&name, NULL, (void **)&value);
element = axiom_element_create(env, NULL, (axis2_char_t *)name,
NULL, &node);
axiom_element_set_text(element, env, (axis2_char_t *)value, node);
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=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Fri Mar 30 11:28:18 2007
@@ -210,27 +210,27 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_core_utils_calculate_default_module_version(const axutil_env_t *env,
- axis2_hash_t *modules_map, axis2_conf_t *axis_conf)
+ axutil_hash_t *modules_map, axis2_conf_t *axis_conf)
{
- axis2_hash_t *default_modules = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *default_modules = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, modules_map, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, axis_conf, AXIS2_FAILURE);
- default_modules = axis2_hash_make(env);
+ default_modules = axutil_hash_make(env);
if (!default_modules)
{
return AXIS2_FAILURE;
}
- for (hi = axis2_hash_first(modules_map, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(modules_map, env); hi;
+ hi = axutil_hash_next(env, hi))
{
axis2_module_desc_t *mod_desc = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
mod_desc = (axis2_module_desc_t *) val;
if (mod_desc)
{
@@ -254,7 +254,7 @@
}
module_ver_str = axis2_core_utils_get_module_version(env,
mod_name_with_ver);
- current_def_ver = axis2_hash_get(default_modules,
+ current_def_ver = axutil_hash_get(default_modules,
module_name_str, AXIS2_HASH_KEY_STRING);
if (current_def_ver)
{
@@ -262,7 +262,7 @@
axis2_core_utils_is_latest_mod_ver(env,
module_ver_str, current_def_ver))
{
- axis2_hash_set(default_modules, module_name_str,
+ axutil_hash_set(default_modules, module_name_str,
AXIS2_HASH_KEY_STRING, module_ver_str);
}
else
@@ -279,7 +279,7 @@
}
else
{
- axis2_hash_set(default_modules, module_name_str,
+ axutil_hash_set(default_modules, module_name_str,
AXIS2_HASH_KEY_STRING, module_ver_str);
}
@@ -295,11 +295,11 @@
hi = NULL;
val = NULL;
- for (hi = axis2_hash_first(default_modules, env); hi;
- hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(default_modules, env); hi;
+ hi = axutil_hash_next(env, hi))
{
void *key_string = NULL;
- axis2_hash_this(hi, (const void **)&key_string, NULL, &val);
+ axutil_hash_this(hi, (const void **)&key_string, NULL, &val);
if (key_string && NULL != val)
{
axis2_conf_add_default_module_version(axis_conf, env,
@@ -312,7 +312,7 @@
if (default_modules)
{
- axis2_hash_free(default_modules, env);
+ axutil_hash_free(default_modules, env);
default_modules = 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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -281,8 +281,8 @@
const axis2_char_t *addr_ns_str,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_hash_t *header_block_ht = NULL;
- axis2_hash_index_t *hash_index = NULL;
+ axutil_hash_t *header_block_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
axis2_msg_info_headers_t *msg_info_headers = *(msg_info_headers_p);
axis2_status_t status = AXIS2_SUCCESS;
axis2_bool_t to_found = AXIS2_FALSE;
@@ -308,8 +308,8 @@
if (!header_block_ht)
return AXIS2_FAILURE;
- for (hash_index = axis2_hash_first(header_block_ht, env); hash_index;
- hash_index = axis2_hash_next(env, hash_index))
+ for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
+ hash_index = axutil_hash_next(env, hash_index))
{
void *hb = NULL;
axiom_soap_header_block_t *header_block = NULL;
@@ -319,7 +319,7 @@
axis2_endpoint_ref_t *epr = NULL;
axis2_char_t *role = NULL;
- axis2_hash_this(hash_index, NULL, NULL, &hb);
+ axutil_hash_this(hash_index, NULL, NULL, &hb);
header_block = (axiom_soap_header_block_t *)hb;
header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
@@ -571,8 +571,8 @@
axiom_soap_header_t *soap_header,
axis2_msg_info_headers_t* msg_info_headers)
{
- axis2_hash_t *header_block_ht = NULL;
- axis2_hash_index_t *hash_index = NULL;
+ axutil_hash_t *header_block_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
axis2_qname_t *wsa_qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -585,15 +585,15 @@
wsa_qname = axis2_qname_create(env, AXIS2_WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE,
AXIS2_WSA_NAMESPACE, NULL);
- for (hash_index = axis2_hash_first(header_block_ht, env); hash_index;
- hash_index = axis2_hash_next(env, hash_index))
+ for (hash_index = axutil_hash_first(header_block_ht, env); hash_index;
+ hash_index = axutil_hash_next(env, hash_index))
{
void *hb = NULL;
axiom_soap_header_block_t *header_block = NULL;
axiom_node_t *header_block_node = NULL;
axiom_element_t *header_block_ele = NULL;
- axis2_hash_this(hash_index, NULL, NULL, &hb);
+ axutil_hash_this(hash_index, NULL, NULL, &hb);
header_block = (axiom_soap_header_block_t *)hb;
header_block_node = axiom_soap_header_block_get_base_node(header_block, env);
@@ -628,8 +628,8 @@
axiom_soap_header_t *soap_header,
const axis2_char_t *addr_ns_str)
{
- axis2_hash_t *header_blocks_ht = NULL;
- axis2_hash_index_t *hash_index = NULL;
+ axutil_hash_t *header_blocks_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
axis2_qname_t *is_ref_qn = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -645,8 +645,8 @@
if (!is_ref_qn)
return AXIS2_FAILURE;
- for (hash_index = axis2_hash_first(header_blocks_ht, env); hash_index;
- hash_index = axis2_hash_next(env, hash_index))
+ for (hash_index = axutil_hash_first(header_blocks_ht, env); hash_index;
+ hash_index = axutil_hash_next(env, hash_index))
{
axiom_element_t *header_block_ele = NULL;
axiom_node_t *header_block_node = NULL;
@@ -655,7 +655,7 @@
axiom_attribute_t *is_ref_param_attr = NULL;
axis2_char_t *attr_value = NULL;
- axis2_hash_this(hash_index, NULL, NULL, &hb);
+ axutil_hash_this(hash_index, NULL, NULL, &hb);
if (hb)
{
header_block = (axiom_soap_header_block_t*)hb;
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=524225&r1=524224&r2=524225
==============================================================================
--- 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 11:28:18 2007
@@ -772,8 +772,8 @@
parent_ele_node,
const axis2_char_t * addr_ns)
{
- axis2_hash_t *value_ht = NULL;
- axis2_hash_index_t *hash_index = NULL;
+ axutil_hash_t *value_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -787,10 +787,10 @@
if (!value_ht)
return AXIS2_FAILURE;
- for (hash_index = axis2_hash_first(value_ht, env); hash_index;
- hash_index = axis2_hash_next(env, hash_index))
+ for (hash_index = axutil_hash_first(value_ht, env); hash_index;
+ hash_index = axutil_hash_next(env, hash_index))
{
- axis2_hash_this(hash_index, &k, &len, &v);
+ axutil_hash_this(hash_index, &k, &len, &v);
if (k)
{
axiom_node_t *node = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/mod_addr.c Fri Mar 30 11:28:18 2007
@@ -78,7 +78,7 @@
/* TODO
* do the neccessary clean in hash map
*/
- axis2_hash_free(module->handler_create_func_map, env);
+ axutil_hash_free(module->handler_create_func_map, env);
module->handler_create_func_map = NULL;
}
@@ -96,17 +96,17 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- module->handler_create_func_map = axis2_hash_make(env);
+ module->handler_create_func_map = axutil_hash_make(env);
if (!module->handler_create_func_map)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- axis2_hash_set(module->handler_create_func_map, "AddressingInHandler",
+ axutil_hash_set(module->handler_create_func_map, "AddressingInHandler",
AXIS2_HASH_KEY_STRING, axis2_addr_in_handler_create);
- axis2_hash_set(module->handler_create_func_map, "AddressingOutHandler",
+ axutil_hash_set(module->handler_create_func_map, "AddressingOutHandler",
AXIS2_HASH_KEY_STRING, axis2_addr_out_handler_create);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/mod_log/mod_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/mod_log.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/mod_log.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/mod_log.c Fri Mar 30 11:28:18 2007
@@ -79,7 +79,7 @@
/* TODO
* do the neccessary clean in hash map
*/
- axis2_hash_free(module->handler_create_func_map, env);
+ axutil_hash_free(module->handler_create_func_map, env);
module->handler_create_func_map = NULL;
}
@@ -97,18 +97,18 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- module->handler_create_func_map = axis2_hash_make(env);
+ module->handler_create_func_map = axutil_hash_make(env);
if(!module->handler_create_func_map)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- axis2_hash_set(module->handler_create_func_map, "LoggingInHandler",
+ axutil_hash_set(module->handler_create_func_map, "LoggingInHandler",
AXIS2_HASH_KEY_STRING, axis2_log_in_handler_create);
- axis2_hash_set(module->handler_create_func_map, "LoggingOutHandler",
+ axutil_hash_set(module->handler_create_func_map, "LoggingOutHandler",
AXIS2_HASH_KEY_STRING, axis2_log_out_handler_create);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/savan/include/savan_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/savan_client.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/include/savan_client.h (original)
+++ webservices/axis2/trunk/c/savan/include/savan_client.h Fri Mar 30 11:28:18 2007
@@ -33,7 +33,7 @@
#include <axutil_env.h>
#include <axis2_conf_ctx.h>
#include <axis2_svc_client.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#ifdef __cplusplus
extern "C"
@@ -55,7 +55,7 @@
savan_client_t *client,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
- axis2_hash_t *options);
+ axutil_hash_t *options);
/**
* Send Renew request using the given service client
@@ -70,7 +70,7 @@
savan_client_t *client,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
- axis2_hash_t *options);
+ axutil_hash_t *options);
/**
* Send Unsubscribe request using the given service client
Modified: webservices/axis2/trunk/c/savan/include/savan_publishing_client.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/savan_publishing_client.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/include/savan_publishing_client.h (original)
+++ webservices/axis2/trunk/c/savan/include/savan_publishing_client.h Fri Mar 30 11:28:18 2007
@@ -32,7 +32,7 @@
#include <axutil_env.h>
#include <axis2_conf_ctx.h>
#include <axis2_svc_client.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/savan/include/savan_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/include/savan_util.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/include/savan_util.h (original)
+++ webservices/axis2/trunk/c/savan/include/savan_util.h Fri Mar 30 11:28:18 2007
@@ -76,7 +76,7 @@
* @param msg_ctx pointer to message context
* @return the store on success, else NULL
*/
- axis2_hash_t * AXIS2_CALL
+ axutil_hash_t * AXIS2_CALL
savan_util_get_subscriber_store(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
Modified: webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c Fri Mar 30 11:28:18 2007
@@ -38,7 +38,7 @@
axis2_options_t *options = NULL;
axis2_char_t *client_home = NULL;
axis2_svc_client_t* svc_client = NULL;
- axis2_hash_t *savan_options = NULL;
+ axutil_hash_t *savan_options = NULL;
axis2_status_t status = AXIS2_FAILURE;
savan_client_t *savan_client = NULL;
axis2_char_t *expire_time = NULL;
@@ -86,8 +86,8 @@
/* Engage savan module */
axis2_svc_client_engage_module(svc_client, env, "savan");
- savan_options = axis2_hash_make(env);
- axis2_hash_set(savan_options, SAVAN_OP_KEY_NOTIFY_EPR, AXIS2_HASH_KEY_STRING,
+ savan_options = axutil_hash_make(env);
+ axutil_hash_set(savan_options, SAVAN_OP_KEY_NOTIFY_EPR, AXIS2_HASH_KEY_STRING,
"http://localhost:9090/axis2/services/listener");
/* Create a savan client */
Modified: webservices/axis2/trunk/c/savan/src/client/savan_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_client.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Fri Mar 30 11:28:18 2007
@@ -72,7 +72,7 @@
savan_client_t *client,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
- axis2_hash_t *options)
+ axutil_hash_t *options)
{
axis2_options_t *wsa_options = NULL;
const axis2_char_t *old_action = NULL;
@@ -107,10 +107,10 @@
axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_SUB);
/* extract the values from the options map */
- endto = axis2_hash_get(options, SAVAN_OP_KEY_ENDTO_EPR, AXIS2_HASH_KEY_STRING);
- notify = axis2_hash_get(options, SAVAN_OP_KEY_NOTIFY_EPR, AXIS2_HASH_KEY_STRING);
- filter = axis2_hash_get(options, SAVAN_OP_KEY_FILTER, AXIS2_HASH_KEY_STRING);
- expires = axis2_hash_get(options, SAVAN_OP_KEY_EXPIRES, AXIS2_HASH_KEY_STRING);
+ endto = axutil_hash_get(options, SAVAN_OP_KEY_ENDTO_EPR, AXIS2_HASH_KEY_STRING);
+ notify = axutil_hash_get(options, SAVAN_OP_KEY_NOTIFY_EPR, AXIS2_HASH_KEY_STRING);
+ filter = axutil_hash_get(options, SAVAN_OP_KEY_FILTER, AXIS2_HASH_KEY_STRING);
+ expires = axutil_hash_get(options, SAVAN_OP_KEY_EXPIRES, AXIS2_HASH_KEY_STRING);
/* create the body of the Subscribe request */
ns = axiom_namespace_create (env, EVENTING_NAMESPACE, EVENTING_NS_PREFIX);
@@ -181,7 +181,7 @@
savan_client_t *client,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
- axis2_hash_t *options)
+ axutil_hash_t *options)
{
axis2_options_t *wsa_options = NULL;
const axis2_char_t *old_action = NULL;
@@ -202,7 +202,7 @@
axis2_options_set_action(wsa_options, env, SAVAN_ACTIONS_RENEW);
/* Extract the values from the options map */
- expires = axis2_hash_get(options, SAVAN_OP_KEY_EXPIRES, AXIS2_HASH_KEY_STRING);
+ expires = axutil_hash_get(options, SAVAN_OP_KEY_EXPIRES, AXIS2_HASH_KEY_STRING);
/* Create the body of the Renew request */
ns = axiom_namespace_create (env, EVENTING_NAMESPACE, EVENTING_NS_PREFIX);
Modified: webservices/axis2/trunk/c/savan/src/core/mod_savan.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/mod_savan.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/mod_savan.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/mod_savan.c Fri Mar 30 11:28:18 2007
@@ -84,7 +84,7 @@
/* TODO
* do the neccessary clean in hash map
*/
- axis2_hash_free(module->handler_create_func_map, env);
+ axutil_hash_free(module->handler_create_func_map, env);
module->handler_create_func_map = NULL;
}
@@ -104,18 +104,18 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- module->handler_create_func_map = axis2_hash_make(env);
+ module->handler_create_func_map = axutil_hash_make(env);
if(!module->handler_create_func_map)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- axis2_hash_set(module->handler_create_func_map, "SavanInHandler",
+ axutil_hash_set(module->handler_create_func_map, "SavanInHandler",
AXIS2_HASH_KEY_STRING, savan_in_handler_create);
- axis2_hash_set(module->handler_create_func_map, "SavanOutHandler",
+ axutil_hash_set(module->handler_create_func_map, "SavanOutHandler",
AXIS2_HASH_KEY_STRING, savan_out_handler_create);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c (original)
+++ webservices/axis2/trunk/c/savan/src/core/savan_sub_processor.c Fri Mar 30 11:28:18 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_svc.h>
#include <axiom_element.h>
#include <axiom_node.h>
@@ -95,7 +95,7 @@
{
axis2_svc_t *svc = NULL;
axis2_param_t *param = NULL;
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
savan_subscriber_t *subscriber = NULL;
axis2_char_t *expires = NULL;
axis2_char_t *id = NULL;
@@ -134,7 +134,7 @@
param = axis2_svc_get_param(svc, env, SUBSCRIBER_STORE);
}
- store = (axis2_hash_t*)axis2_param_get_value(param, env);
+ store = (axutil_hash_t*)axis2_param_get_value(param, env);
/* Set the expiry time on the subscription */
/* TODO : For now we are ignoring the Expiry sent by the client. Add support
@@ -143,7 +143,7 @@
savan_subscriber_set_expires(subscriber, env, expires);
/* Store the created subscriber in the svc */
- axis2_hash_set(store, savan_subscriber_get_id(subscriber, env),
+ axutil_hash_set(store, savan_subscriber_get_id(subscriber, env),
AXIS2_HASH_KEY_STRING, subscriber);
/* Store sub id in msg ctx to be used by the msg receiver */
@@ -275,7 +275,7 @@
axis2_svc_t *svc,
const axutil_env_t *env)
{
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
axis2_param_t *param = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -284,7 +284,7 @@
"set sub store...");
/* Create a hash map */
- store = axis2_hash_make(env);
+ store = axutil_hash_make(env);
if (!store)
{
/* TODO : error reporting */
@@ -476,7 +476,7 @@
savan_subscriber_t *subscriber)
{
axis2_char_t *id = NULL;
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -495,7 +495,7 @@
}
/* Setting NULL as value will remove the entry */
- axis2_hash_set(store, id, AXIS2_HASH_KEY_STRING, NULL);
+ axutil_hash_set(store, id, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c (original)
+++ webservices/axis2/trunk/c/savan/src/handlers/savan_out_handler.c Fri Mar 30 11:28:18 2007
@@ -82,10 +82,10 @@
savan_message_types_t msg_type = SAVAN_MSG_TYPE_UNKNOWN;
/*axis2_svc_t *svc = NULL;*/
axis2_param_t *param = NULL;
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
const axis2_svc_t *svc = NULL;
const axis2_char_t *svc_name = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *val = NULL;
AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
@@ -123,7 +123,7 @@
return AXIS2_SUCCESS; /* returning FAILURE will break handler chain */
}
- store = (axis2_hash_t*)axis2_param_get_value(param, env);
+ store = (axutil_hash_t*)axis2_param_get_value(param, env);
if (!store)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][out handler] "
@@ -133,10 +133,10 @@
/* Iterate the subscribe store and send the msg to each one */
- for (hi = axis2_hash_first(store, env); hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(store, env); hi; hi = axutil_hash_next(env, hi))
{
savan_subscriber_t * sub = NULL;
- axis2_hash_this(hi, NULL, NULL, &val);
+ axutil_hash_this(hi, NULL, NULL, &val);
sub = (savan_subscriber_t *)val;
if (sub)
{
Modified: webservices/axis2/trunk/c/savan/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/util/savan_util.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/savan/src/util/savan_util.c (original)
+++ webservices/axis2/trunk/c/savan/src/util/savan_util.c Fri Mar 30 11:28:18 2007
@@ -130,7 +130,7 @@
axis2_msg_ctx_t *msg_ctx,
axis2_char_t *sub_id)
{
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
savan_subscriber_t *subscriber = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -150,21 +150,21 @@
return NULL;
}
- subscriber = axis2_hash_get(store, sub_id, AXIS2_HASH_KEY_STRING);
+ subscriber = axutil_hash_get(store, sub_id, AXIS2_HASH_KEY_STRING);
return subscriber;
}
/******************************************************************************/
-axis2_hash_t * AXIS2_CALL
+axutil_hash_t * AXIS2_CALL
savan_util_get_subscriber_store(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
axis2_svc_t *svc = NULL;
axis2_param_t *param = NULL;
- axis2_hash_t *store = NULL;
+ axutil_hash_t *store = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -187,7 +187,7 @@
return NULL;
}
- store = (axis2_hash_t*)axis2_param_get_value(param, env);
+ store = (axutil_hash_t*)axis2_param_get_value(param, env);
return store;
}
Modified: webservices/axis2/trunk/c/test/core/context/test_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/test_context.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/test_context.c (original)
+++ webservices/axis2/trunk/c/test/core/context/test_context.c Fri Mar 30 11:28:18 2007
@@ -39,9 +39,9 @@
struct axis2_op_ctx *op_ctx1 = NULL;
struct axis2_op_ctx *op_ctx2 = NULL;
struct axis2_op *op = NULL;
- struct axis2_hash_t *op_ctx_map = NULL;
- struct axis2_hash_t *svc_ctx_map = NULL;
- struct axis2_hash_t *svc_grp_ctx_map = NULL;
+ struct axutil_hash_t *op_ctx_map = NULL;
+ struct axutil_hash_t *svc_ctx_map = NULL;
+ struct axutil_hash_t *svc_grp_ctx_map = NULL;
axis2_status_t status = AXIS2_FAILURE;
axutil_allocator_t *allocator = axutil_allocator_init(NULL);
@@ -76,24 +76,24 @@
if (op_ctx_map)
{
- axis2_hash_set(op_ctx_map, "op_ctx1", AXIS2_HASH_KEY_STRING, op_ctx1);
- axis2_hash_set(op_ctx_map, "op_ctx2", AXIS2_HASH_KEY_STRING, op_ctx2);
+ axutil_hash_set(op_ctx_map, "op_ctx1", AXIS2_HASH_KEY_STRING, op_ctx1);
+ axutil_hash_set(op_ctx_map, "op_ctx2", AXIS2_HASH_KEY_STRING, op_ctx2);
}
svc_ctx_map = axis2_conf_ctx_get_svc_ctx_map(conf_ctx, env);
if (svc_ctx_map)
{
- axis2_hash_set(svc_ctx_map, "svc_ctx1", AXIS2_HASH_KEY_STRING, svc_ctx1);
- axis2_hash_set(svc_ctx_map, "svc_ctx2", AXIS2_HASH_KEY_STRING, svc_ctx2);
+ axutil_hash_set(svc_ctx_map, "svc_ctx1", AXIS2_HASH_KEY_STRING, svc_ctx1);
+ axutil_hash_set(svc_ctx_map, "svc_ctx2", AXIS2_HASH_KEY_STRING, svc_ctx2);
}
svc_grp_ctx_map = axis2_conf_ctx_get_svc_grp_ctx_map(conf_ctx, env);
if (svc_grp_ctx_map)
{
- axis2_hash_set(svc_ctx_map, "svc_grp_ctx1", AXIS2_HASH_KEY_STRING, svc_grp_ctx1);
- axis2_hash_set(svc_ctx_map, "svc_grp_ctx2", AXIS2_HASH_KEY_STRING, svc_grp_ctx2);
+ axutil_hash_set(svc_ctx_map, "svc_grp_ctx1", AXIS2_HASH_KEY_STRING, svc_grp_ctx1);
+ axutil_hash_set(svc_ctx_map, "svc_grp_ctx2", AXIS2_HASH_KEY_STRING, svc_grp_ctx2);
}
status = axis2_conf_ctx_init(conf_ctx, env, conf);
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Fri Mar 30 11:28:18 2007
@@ -37,7 +37,7 @@
{
axis2_dep_engine_t *dep_engine = NULL;
axis2_conf_t *conf = NULL;
- axis2_hash_t *svc_map = NULL;
+ axutil_hash_t *svc_map = NULL;
axutil_array_list_t *in_phases = NULL;
axis2_char_t *axis2c_home = NULL;
@@ -64,22 +64,22 @@
svc_map = axis2_conf_get_all_svcs(conf, env);
if (svc_map)
- printf("svc_map count = %d\n", axis2_hash_count(svc_map));
+ printf("svc_map count = %d\n", axutil_hash_count(svc_map));
else
printf("svc_map count = zero\n");
if (svc_map)
{
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
void *service = NULL;
- for (hi = axis2_hash_first(svc_map, env);
- hi; hi = axis2_hash_next(env, hi))
+ for (hi = axutil_hash_first(svc_map, env);
+ hi; hi = axutil_hash_next(env, hi))
{
- axis2_hash_t *ops = NULL;
+ axutil_hash_t *ops = NULL;
axis2_svc_t *svc = NULL;
axis2_param_t *impl_info_param = NULL;
- axis2_hash_this(hi, NULL, NULL, &service);
+ axutil_hash_this(hi, NULL, NULL, &service);
svc = (axis2_svc_t *) service;
impl_info_param = axis2_svc_get_param(svc, env, AXIS2_SERVICE_CLASS);
if (!impl_info_param)
@@ -89,17 +89,17 @@
ops = axis2_svc_get_all_ops(svc, env);
if (ops)
{
- printf("ops count = %d\n", axis2_hash_count(ops));
+ printf("ops count = %d\n", axutil_hash_count(ops));
- axis2_hash_index_t *hi2 = NULL;
+ axutil_hash_index_t *hi2 = NULL;
void *op = NULL;
axis2_char_t *oname = NULL;
- for (hi2 = axis2_hash_first(ops, env); hi2; hi2 = axis2_hash_next(env, hi2))
+ for (hi2 = axutil_hash_first(ops, env); hi2; hi2 = axutil_hash_next(env, hi2))
{
if (!hi2)
break;
- axis2_hash_this(hi2, NULL, NULL, &op);
+ axutil_hash_this(hi2, NULL, NULL, &op);
if (op)
{
const axis2_qname_t *qname = NULL;
Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Fri Mar 30 11:28:18 2007
@@ -132,7 +132,7 @@
{
struct axis2_svc *svc = NULL;
struct axis2_qname *qname = NULL;
- struct axis2_hash_t *ops = NULL;
+ struct axutil_hash_t *ops = NULL;
struct axis2_op *op = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -166,20 +166,20 @@
if (ops)
{
- printf("ops count = %d\n", axis2_hash_count(ops));
+ printf("ops count = %d\n", axutil_hash_count(ops));
- axis2_hash_index_t *hi2 = NULL;
+ axutil_hash_index_t *hi2 = NULL;
void *op2 = NULL;
axis2_char_t *oname = NULL;
int count = 0;
- for (hi2 = axis2_hash_first(ops, env); hi2; hi2 = axis2_hash_next(env, hi2))
+ for (hi2 = axutil_hash_first(ops, env); hi2; hi2 = axutil_hash_next(env, hi2))
{
printf("count = %d \n", count++);
axis2_svc_get_all_ops(svc, env);
if (!(hi2))
break;
- axis2_hash_this(hi2, NULL, NULL, &op2);
+ axutil_hash_this(hi2, NULL, NULL, &op2);
if (op2)
{
const axis2_qname_t *qname = NULL;
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_cmdline_option_parser.h Fri Mar 30 11:28:18 2007
@@ -24,7 +24,7 @@
*/
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axutil_array_list.h>
#ifdef __cplusplus
@@ -60,7 +60,7 @@
* @param env Environment. MUST NOT be NULL
* @return hash of options
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_options)(w2c_cmdline_option_parser_t *cmdline_option_parser,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_config_property_loader.h Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <axis2_utils.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#ifdef __cplusplus
extern "C"
@@ -140,9 +140,9 @@
/**
* Gets the emitter names map keys with the language name.
* @param env Environment. MUST NOT be NULL
- * @return Returns axis2_hash_t*.
+ * @return Returns axutil_hash_t*.
*/
- axis2_hash_t* (AXIS2_CALL*
+ axutil_hash_t* (AXIS2_CALL*
get_language_emitter_map )(
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
@@ -160,9 +160,9 @@
/**
* Gets the language specific properties.
* @param env Environment. MUST NOT be NULL
- * @return Returns axis2_hash_t*.
+ * @return Returns axutil_hash_t*.
*/
- axis2_hash_t* (AXIS2_CALL*
+ axutil_hash_t* (AXIS2_CALL*
get_language_specific_properties_map )(
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
@@ -181,9 +181,9 @@
* Gets the extensions map for the databinding frameworks.
* The entries are keys by the framework name.
* @param env Environment. MUST NOT be NULL
- * @return Returns axis2_hash_t*.
+ * @return Returns axutil_hash_t*.
*/
- axis2_hash_t* (AXIS2_CALL*
+ axutil_hash_t* (AXIS2_CALL*
get_databinding_framework_name_to_extension_map )(
w2c_config_property_loader_t *config_property_loader,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_config_loader.h Fri Mar 30 11:28:18 2007
@@ -24,7 +24,7 @@
*/
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_engine_configuration.h>
#ifdef __cplusplus
@@ -49,7 +49,7 @@
w2c_engine_config_loader_load_config(
const axutil_env_t *env,
w2c_engine_configuration_t *conf,
- axis2_hash_t *option_map );
+ axutil_hash_t *option_map );
/** @} */
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_engine_configuration.h Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <axis2_utils.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_typemapper.h>
#include <w2c_qname2name_maker.h>
@@ -105,7 +105,7 @@
* @param env Environment. MUST NOT be NULL
* @return uri2packagemap
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_uri2packagemap)(w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env );
@@ -285,7 +285,7 @@
* @param env Environment. MUST NOT be NULL
* @return policy_map
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_policy_map)(w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env );
@@ -295,7 +295,7 @@
* @param env Environment. MUST NOT be NULL
* @return configuration_properties
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_configuration_properties)(w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env );
@@ -419,7 +419,7 @@
axis2_status_t (AXIS2_CALL*
set_uri2packagemap ) ( w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *uri2packagemap );
+ axutil_hash_t *uri2packagemap );
/**
* set params_wrapped.
@@ -635,7 +635,7 @@
axis2_status_t (AXIS2_CALL*
set_policy_map ) ( w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *policy_map );
+ axutil_hash_t *policy_map );
/**
* set configuration_properties.
@@ -647,7 +647,7 @@
axis2_status_t (AXIS2_CALL*
set_configuration_properties ) ( w2c_engine_configuration_t *engine_configuration,
const axutil_env_t *env,
- axis2_hash_t *configuration_properties );
+ axutil_hash_t *configuration_properties );
/**
* set wsdl_versio.
@@ -789,7 +789,7 @@
*/
AXIS2_EXTERN w2c_engine_configuration_t* AXIS2_CALL
w2c_engine_configuration_create_with_options( const axutil_env_t *env,
- axis2_hash_t *options );
+ axutil_hash_t *options );
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_messages.h Fri Mar 30 11:28:18 2007
@@ -24,7 +24,7 @@
*/
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axis2_properties.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_properties.h Fri Mar 30 11:28:18 2007
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#ifdef __cplusplus
extern "C"
@@ -60,7 +60,7 @@
* @param env double pointer to environment struct. MUST NOT be NULL
* return hash ( key, array list of strings)
*/
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_hash)(w2c_properties_t *properties,
const axutil_env_t *env);
};
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_compiler_options.h Fri Mar 30 11:28:18 2007
@@ -24,7 +24,7 @@
*/
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_engine_configuration.h>
#include <w2c_qname2name_maker.h>
@@ -113,9 +113,9 @@
axis2_status_t (AXIS2_CALL *
set_ns2package_map)( w2c_schema_compiler_options_t *schema_compiler_options,
const axutil_env_t *env,
- axis2_hash_t *ns2package_map);
+ axutil_hash_t *ns2package_map);
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_ns2package_map)( w2c_schema_compiler_options_t *schema_compiler_options,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h?view=diff&rev=524225&r1=524224&r2=524225
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_schema_writer.h Fri Mar 30 11:28:18 2007
@@ -24,7 +24,7 @@
*/
#include <axis2_utils.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <w2c_schema_compiler_options.h>
#include <xml_schema_element.h>
#include <w2c_schema_writer_meta_info.h>
@@ -61,7 +61,7 @@
free)(w2c_schema_writer_t *schema_writer,
const axutil_env_t *env);
- axis2_hash_t* (AXIS2_CALL *
+ axutil_hash_t* (AXIS2_CALL *
get_model_map)( w2c_schema_writer_t *writer,
const axutil_env_t *env);
@@ -70,20 +70,20 @@
const axutil_env_t *env,
w2c_schema_compiler_options_t *options,
axis2_char_t *template_name,
- axis2_hash_t *base_typemap);
+ axutil_hash_t *base_typemap);
axis2_char_t* (AXIS2_CALL *
write_element)( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_element_t *element,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_char_t* (AXIS2_CALL *
write_complex_type)( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_status_t (AXIS2_CALL *
@@ -94,7 +94,7 @@
write_simple_type)( w2c_schema_writer_t *writer,
const axutil_env_t *env,
xml_schema_complex_type_t *type,
- axis2_hash_t *typemap,
+ axutil_hash_t *typemap,
w2c_schema_writer_meta_info_t *meta_info);
axis2_char_t* (AXIS2_CALL *
@@ -111,7 +111,7 @@
axis2_status_t (AXIS2_CALL *
write_extension_mapper)( w2c_schema_writer_t *writer,
const axutil_env_t *env,
- axis2_hash_t *meta_info_array);
+ axutil_hash_t *meta_info_array);
axis2_char_t* (AXIS2_CALL *
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org