Author: pini
Date: Fri Mar 30 11:31:32 2007
New Revision: 524226
URL: http://svn.apache.org/viewvc?view=rev&rev=524226
Log:
Fixing jira issue 292
Modified:
webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
webservices/rampart/trunk/c/src/core/mod_rampart.c
webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c
webservices/rampart/trunk/c/src/util/rampart_handler_util.c
webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c
Modified: webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/rampart_sec_processed_result.h?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/include/rampart_sec_processed_result.h
(original)
+++ webservices/rampart/trunk/c/include/rampart_sec_processed_result.h Fri Mar
30 11:31:32 2007
@@ -70,7 +70,7 @@
* @env the environment
* @msg_ctx the message context in which data are extracted
*/
- AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
rampart_get_all_security_processed_results(const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
Modified: webservices/rampart/trunk/c/src/core/mod_rampart.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/core/mod_rampart.c?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/src/core/mod_rampart.c (original)
+++ webservices/rampart/trunk/c/src/core/mod_rampart.c Fri Mar 30 11:31:32 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, "RampartInHandler",
+ axutil_hash_set(module->handler_create_func_map, "RampartInHandler",
AXIS2_HASH_KEY_STRING, rampart_in_handler_create);
- axis2_hash_set(module->handler_create_func_map, "RampartOutHandler",
+ axutil_hash_set(module->handler_create_func_map, "RampartOutHandler",
AXIS2_HASH_KEY_STRING, rampart_out_handler_create);
return AXIS2_SUCCESS;
Modified: webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c (original)
+++ webservices/rampart/trunk/c/src/handlers/rampart_in_handler.c Fri Mar 30
11:31:32 2007
@@ -17,7 +17,7 @@
#include <axis2_handler_desc.h>
#include <axutil_array_list.h>
-#include <axis2_hash.h>
+#include <axutil_hash.h>
#include <axiom_soap_const.h>
#include <axiom_soap_envelope.h>
#include <axiom_soap_header.h>
Modified: webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n.c Fri Mar 30 11:31:32
2007
@@ -1024,8 +1024,8 @@
const c14n_ctx_t *ctx
)
{
- axis2_hash_t *attr_ht = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *attr_ht = NULL;
+ axutil_hash_index_t *hi = NULL;
c14n_sorted_list_t *attr_list = c14n_sorted_list_create(ctx->env);
attr_ht = axiom_element_get_all_attributes((axiom_element_t *)ele,
@@ -1033,11 +1033,11 @@
if(attr_ht)
{
- for (hi = axis2_hash_first(attr_ht, ctx->env); hi;
- hi = axis2_hash_next(ctx->env, hi))
+ for (hi = axutil_hash_first(attr_ht, ctx->env); hi;
+ hi = axutil_hash_next(ctx->env, hi))
{
void *v = NULL;
- axis2_hash_this(hi, NULL, NULL, &v);
+ axutil_hash_this(hi, NULL, NULL, &v);
if (v)
{
@@ -1262,8 +1262,8 @@
const c14n_ctx_t *ctx
)
{
- axis2_hash_t *ns_ht = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *ns_ht = NULL;
+ axutil_hash_index_t *hi = NULL;
c14n_sorted_list_t *out_list = c14n_sorted_list_create(ctx->env);
@@ -1272,11 +1272,11 @@
if(ns_ht)
{
- for (hi = axis2_hash_first(ns_ht, ctx->env); hi;
- hi = axis2_hash_next(ctx->env, hi))
+ for (hi = axutil_hash_first(ns_ht, ctx->env); hi;
+ hi = axutil_hash_next(ctx->env, hi))
{
void *v = NULL;
- axis2_hash_this(hi, NULL, NULL, &v);
+ axutil_hash_this(hi, NULL, NULL, &v);
if (v)
{
@@ -1344,8 +1344,8 @@
const c14n_ctx_t *ctx
)
{
- axis2_hash_t *ns_ht = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *ns_ht = NULL;
+ axutil_hash_index_t *hi = NULL;
axiom_node_t *pnode = NULL;
axiom_element_t *pele = NULL;
axiom_namespace_t *ns = NULL;
@@ -1386,11 +1386,11 @@
if (ns_ht)
{
- for (hi = axis2_hash_first(ns_ht, ctx->env); hi;
- hi = axis2_hash_next(ctx->env, hi))
+ for (hi = axutil_hash_first(ns_ht, ctx->env); hi;
+ hi = axutil_hash_next(ctx->env, hi))
{
void *v = NULL;
- axis2_hash_this(hi, NULL, NULL, &v);
+ axutil_hash_this(hi, NULL, NULL, &v);
if (v)
{
@@ -1527,16 +1527,16 @@
vu = AXIS2_TRUE;
else
{
- axis2_hash_t *attr_ht = axiom_element_get_all_attributes(
+ axutil_hash_t *attr_ht = axiom_element_get_all_attributes(
(axiom_element_t *)ele, ctx->env);
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_index_t *hi = NULL;
if (attr_ht)
{
- for (hi = axis2_hash_first(attr_ht, ctx->env); hi;
- hi = axis2_hash_next(ctx->env, hi))
+ for (hi = axutil_hash_first(attr_ht, ctx->env); hi;
+ hi = axutil_hash_next(ctx->env, hi))
{
void *v = NULL;
- axis2_hash_this(hi, NULL, NULL, &v);
+ axutil_hash_this(hi, NULL, NULL, &v);
if (v)
{
@@ -1606,8 +1606,8 @@
/* assuming the parent of an element is always an element node in AXIOM*/
while (parent_node)
{
- axis2_hash_index_t *hi = NULL;
- axis2_hash_t *attr_ht = NULL;
+ axutil_hash_index_t *hi = NULL;
+ axutil_hash_t *attr_ht = NULL;
/* TODO:
* HACK: since we only use a single node as the subset
@@ -1643,11 +1643,11 @@
(axiom_element_t *)parent_element, ctx->env);
if (attr_ht)
{
- for (hi = axis2_hash_first(attr_ht, ctx->env); hi;
- hi = axis2_hash_next(ctx->env, hi))
+ for (hi = axutil_hash_first(attr_ht, ctx->env); hi;
+ hi = axutil_hash_next(ctx->env, hi))
{
void *v = NULL;
- axis2_hash_this(hi, NULL, NULL, &v);
+ axutil_hash_this(hi, NULL, NULL, &v);
if (v)
{
Modified: webservices/rampart/trunk/c/src/util/rampart_handler_util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_handler_util.c?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_handler_util.c (original)
+++ webservices/rampart/trunk/c/src/util/rampart_handler_util.c Fri Mar 30
11:31:32 2007
@@ -108,8 +108,8 @@
{
axutil_array_list_t *sec_headers = NULL;
axis2_char_t *sec_ns_str = NULL;
- axis2_hash_index_t *hash_index = NULL;
- axis2_hash_t *header_block_ht = NULL;
+ axutil_hash_index_t *hash_index = NULL;
+ axutil_hash_t *header_block_ht = NULL;
axiom_element_t *header_block_ele = NULL;
axiom_node_t *header_block_node = NULL;
@@ -123,15 +123,15 @@
return AXIS2_FAILURE;
/*BETTER IF : If there are multiple security header elements, get the
one with @role=rampart*/
- 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 *ele_localname = 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);
header_block_ele =
(axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c?view=diff&rev=524226&r1=524225&r2=524226
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_processed_result.c Fri Mar
30 11:31:32 2007
@@ -32,13 +32,13 @@
axis2_char_t *key,
void *value)
{
- axis2_hash_t *sec_processed_results = NULL;
+ axutil_hash_t *sec_processed_results = NULL;
sec_processed_results = rampart_get_all_security_processed_results(env,
msg_ctx);
if(!sec_processed_results){
return AXIS2_FAILURE;
}
- axis2_hash_set(sec_processed_results, key, AXIS2_HASH_KEY_STRING, value);
+ axutil_hash_set(sec_processed_results, key, AXIS2_HASH_KEY_STRING, value);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][spr] Set %s in Security
Processed Results of message context ", key);
return AXIS2_SUCCESS;
}
@@ -48,27 +48,27 @@
axis2_msg_ctx_t *msg_ctx,
axis2_char_t *key)
{
- axis2_hash_t *sec_processed_results = NULL;
+ axutil_hash_t *sec_processed_results = NULL;
sec_processed_results = rampart_get_all_security_processed_results(env,
msg_ctx);
if(!sec_processed_results){
return NULL;
}
- return axis2_hash_get(sec_processed_results, key, AXIS2_HASH_KEY_STRING);
+ return axutil_hash_get(sec_processed_results, key, AXIS2_HASH_KEY_STRING);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rampart_set_security_processed_results_property(const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_hash_t *sec_processed_results = NULL;
+ axutil_hash_t *sec_processed_results = NULL;
axis2_property_t *sec_processed_results_prop = NULL;
if(!msg_ctx){
return AXIS2_FAILURE;
}
- sec_processed_results = axis2_hash_make(env);
+ sec_processed_results = axutil_hash_make(env);
sec_processed_results_prop = axis2_property_create(env);
axis2_property_set_value(sec_processed_results_prop, env,
sec_processed_results);
@@ -77,12 +77,12 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_hash_t* AXIS2_CALL
+AXIS2_EXTERN axutil_hash_t* AXIS2_CALL
rampart_get_all_security_processed_results(const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
axis2_property_t *sec_processed_results_prop = NULL;
- axis2_hash_t *sec_processed_results = NULL;
+ axutil_hash_t *sec_processed_results = NULL;
sec_processed_results_prop = axis2_msg_ctx_get_property(msg_ctx, env,
RAMPART_SECURITY_PROCESSED_RESULTS);
if(!sec_processed_results_prop){
@@ -90,7 +90,7 @@
return NULL;
}
- sec_processed_results =
(axis2_hash_t*)axis2_property_get_value(sec_processed_results_prop, env);
+ sec_processed_results =
(axutil_hash_t*)axis2_property_get_value(sec_processed_results_prop, env);
if(!sec_processed_results){
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][spr] Cannot get
Security Processed Results Hash table from the property");
return NULL;
@@ -103,8 +103,8 @@
rampart_print_security_processed_results_set(const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_hash_t *sec_processed_results = NULL;
- axis2_hash_index_t *hi = NULL;
+ axutil_hash_t *sec_processed_results = NULL;
+ axutil_hash_index_t *hi = NULL;
const void *key = NULL;
void *val = NULL;
@@ -113,8 +113,8 @@
return;
}
- for (hi = axis2_hash_first(sec_processed_results, env); hi; hi =
axis2_hash_next(env, hi)) {
- axis2_hash_this(hi, &key, NULL, &val);
+ for (hi = axutil_hash_first(sec_processed_results, env); hi; hi =
axutil_hash_next(env, hi)) {
+ axutil_hash_this(hi, &key, NULL, &val);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][spr] (key, val) %s
= %s\n", (axis2_char_t*)key, (axis2_char_t*)val);
}
