Author: milinda
Date: Wed Feb 6 20:35:04 2008
New Revision: 619259
URL: http://svn.apache.org/viewvc?rev=619259&view=rev
Log:
Change some parameter ordering problem.
Modified:
webservices/rampart/trunk/c/include/trust_context.h
webservices/rampart/trunk/c/src/trust/context.c
webservices/rampart/trunk/c/src/trust/sts_client.c
Modified: webservices/rampart/trunk/c/include/trust_context.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/trust_context.h?rev=619259&r1=619258&r2=619259&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/trust_context.h (original)
+++ webservices/rampart/trunk/c/include/trust_context.h Wed Feb 6 20:35:04 2008
@@ -45,67 +45,67 @@
typedef struct trust_context trust_context_t;
AXIS2_EXTERN trust_context_t *AXIS2_CALL
- trust_context_create(
+ trust_context_create(
const axutil_env_t * env);
AXIS2_EXTERN void AXIS2_CALL
- trust_context_free(
- const axutil_env_t * env,
- trust_context_t *trust_context);
+ trust_context_free(
+ trust_context_t *trust_context,
+ const axutil_env_t * env);
/*Populate RST_CONTEXT : Often used in STS/IP side */
- AXIS2_EXTERN axis2_status_t AXIS2_CALL
- trust_context_process_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context,
- axis2_msg_ctx_t * in_msg_ctx);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ trust_context_process_rst(
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * in_msg_ctx);
/*Populate RSTR_CONTEXT : Often used in Token Requestor side*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- trust_context_process_rstr(
- const axutil_env_t * env,
- trust_context_t *trust_context,
- axis2_msg_ctx_t * in_msg_ctx);
+ trust_context_process_rstr(
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * in_msg_ctx);
/*Build RST Node from created RST_CONTEXT */
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
- trust_context_build_rst_node(
- const axutil_env_t * env,
- trust_context_t *trust_context);
+ trust_context_build_rst_node(
+ trust_context_t *trust_context,
+ const axutil_env_t * env);
/*Build RSTR Node from created RSTR_CONTEXT */
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
- trust_context_build_rstr_node(
- const axutil_env_t * env,
- trust_context_t *trust_context);
+ trust_context_build_rstr_node(
+ trust_context_t *trust_context,
+ const axutil_env_t * env);
/*Get Populated RST_CONTEXT */
AXIS2_EXTERN trust_rst_t* AXIS2_CALL
- trust_context_get_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context);
+ trust_context_get_rst(
+ trust_context_t *trust_context,
+ const axutil_env_t * env);
/*Get Populated RSTR_CONTEXT */
AXIS2_EXTERN trust_rstr_t* AXIS2_CALL
- trust_context_get_rstr(
- const axutil_env_t * env,
- trust_context_t *trust_context);
+ trust_context_get_rstr(
+ trust_context_t *trust_context,
+ const axutil_env_t * env);
/*Set RST_CONTEXT */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- trust_context_set_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context,
- trust_rst_t *rst);
+ trust_context_set_rst(
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
+ trust_rst_t *rst);
/*Set RSTR_CONTEXT */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- trust_context_set_rstr(
- const axutil_env_t * env,
- trust_context_t *trust_context,
- trust_rstr_t *rstr);
+ trust_context_set_rstr(
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
+ trust_rstr_t *rstr);
Modified: webservices/rampart/trunk/c/src/trust/context.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/trust/context.c?rev=619259&r1=619258&r2=619259&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/trust/context.c (original)
+++ webservices/rampart/trunk/c/src/trust/context.c Wed Feb 6 20:35:04 2008
@@ -61,9 +61,9 @@
/*Free Contexts*/
AXIS2_EXTERN void AXIS2_CALL
-trust_context_free(
- const axutil_env_t * env,
- trust_context_t *trust_context)
+trust_context_free(
+ trust_context_t *trust_context,
+ const axutil_env_t * env)
{
if (trust_context)
{
@@ -75,8 +75,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
trust_context_process_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context,
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
axis2_msg_ctx_t * in_msg_ctx)
{
axiom_soap_envelope_t *soap_env = NULL;
@@ -129,8 +129,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
trust_context_process_rstr(
+ trust_context_t *trust_context,
const axutil_env_t * env,
- trust_context_t *trust_context,
axis2_msg_ctx_t * in_msg_ctx)
{
axiom_soap_envelope_t *soap_env = NULL;
@@ -184,8 +184,8 @@
/*Build RST Node from created RST_CONTEXT */
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
trust_context_build_rst_node(
- const axutil_env_t * env,
- trust_context_t *trust_context)
+ trust_context_t *trust_context,
+ const axutil_env_t * env)
{
if(trust_context->rst)
{
@@ -208,8 +208,8 @@
/*Build RSTR Node from created RSTR_CONTEXT */
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
trust_context_build_rstr_node(
- const axutil_env_t * env,
- trust_context_t *trust_context)
+ trust_context_t *trust_context,
+ const axutil_env_t * env)
{
if(trust_context->rstr)
{
@@ -225,8 +225,8 @@
/*Get Populated RST_CONTEXT */
AXIS2_EXTERN trust_rst_t* AXIS2_CALL
trust_context_get_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context)
+ trust_context_t *trust_context,
+ const axutil_env_t * env)
{
if(trust_context)
return trust_context->rst;
@@ -235,9 +235,9 @@
/*Get Populated RSTR_CONTEXT */
AXIS2_EXTERN trust_rstr_t* AXIS2_CALL
- trust_context_get_rstr(
- const axutil_env_t * env,
- trust_context_t *trust_context)
+trust_context_get_rstr(
+ trust_context_t *trust_context,
+ const axutil_env_t * env)
{
if(trust_context)
{
@@ -249,8 +249,8 @@
/*Set RST_CONTEXT */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
trust_context_set_rst(
- const axutil_env_t * env,
- trust_context_t *trust_context,
+ trust_context_t *trust_context,
+ const axutil_env_t * env,
trust_rst_t *rst)
{
if(trust_context)
@@ -265,8 +265,8 @@
/*Set RSTR_CONTEXT */
AXIS2_EXTERN axis2_status_t AXIS2_CALL
trust_context_set_rstr(
+ trust_context_t *trust_context,
const axutil_env_t * env,
- trust_context_t *trust_context,
trust_rstr_t *rstr)
{
if(trust_context)
Modified: webservices/rampart/trunk/c/src/trust/sts_client.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/trust/sts_client.c?rev=619259&r1=619258&r2=619259&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/trust/sts_client.c (original)
+++ webservices/rampart/trunk/c/src/trust/sts_client.c Wed Feb 6 20:35:04 2008
@@ -134,7 +134,7 @@
/*Action Logic - RequestType - used for specify the requesting action*/
- rst = trust_context_get_rst(env, trust_context);
+ rst = trust_context_get_rst(trust_context, env);
if(NULL == rst)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[trust] RST is NULL:
Created RST_CTX may not set to TrustContext");
@@ -161,7 +161,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Policy setting failed.");
}
/*Building the RST */
- rst_node = trust_context_build_rst_node(env, trust_context);
+ rst_node = trust_context_build_rst_node(trust_context, env);
if(rst_node)
{
return_node =
axis2_svc_client_send_receive(sts_client->svc_client, env, rst_node);
@@ -182,7 +182,7 @@
if(in_msg_ctx)
{
- trust_context_process_rstr(env,
trust_context, in_msg_ctx);
+
trust_context_process_rstr(trust_context, env, in_msg_ctx);
sts_client->received_in_msg_ctx
= in_msg_ctx; /*Store the in_msg_context for sec_header extentions in trust*/
}
}
