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 ma...@apache.org on 2007/04/23 05:59:41 UTC
svn commit: r531327 - in /webservices/axis2/scratch/c/neethi/axis2c/neethi:
include/ src/ src/secpolicy/builder/
Author: manjula
Date: Sun Apr 22 20:59:40 2007
New Revision: 531327
URL: http://svn.apache.org/viewvc?view=rev&rev=531327
Log:
Fixing the build break and adding latest changes.
Modified:
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_algorithmsuite_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_layout_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_supporting_tokens_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_binding_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_token_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_username_token_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_wss10_builder.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/layout_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/supporting_token_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_token_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/username_token_builder.c
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/wss10_builder.c
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_assertion.h Sun Apr 22 20:59:40 2007
@@ -41,8 +41,7 @@
ASSERTION_TYPE_ALGORITHM_SUITE,
ASSERTION_TYPE_INCLUDE_TIMESTAMP,
ASSERTION_TYPE_LAYOUT,
- ASSERTION_TYPE_SIGNED_SUPPORTING_TOKENS,
- ASSERTION_TYPE_SIGNED_ENDORSING_SUPPORTING_TOKENS,
+ ASSERTION_TYPE_SUPPORTING_TOKENS,
ASSERTION_TYPE_HTTPS_TOKEN,
ASSERTION_TYPE_WSS_USERNAME_TOKEN_10,
ASSERTION_TYPE_WSS_USERNAME_TOKEN_11,
@@ -52,6 +51,7 @@
ASSERTION_TYPE_MUST_SUPPORT_REF_ISSUER_SERIAL,
ASSERTION_TYPE_MUST_SUPPORT_REF_EXTERNAL_URI,
ASSERTION_TYPE_MUST_SUPPORT_REF_EMBEDDED_TOKEN,
+ ASSERTION_TYPE_WSS10,
ASSERTION_TYPE_UNKNOWN
}neethi_assertion_type_t;
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h Sun Apr 22 20:59:40 2007
@@ -33,6 +33,7 @@
#include <neethi_exactlyone.h>
#include <neethi_reference.h>
#include <neethi_registry.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_algorithmsuite_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_algorithmsuite_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_algorithmsuite_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_algorithmsuite_builder.h Sun Apr 22 20:59:40 2007
@@ -25,13 +25,14 @@
#include <rp_includes.h>
#include <rp_property.h>
#include <rp_algorithmsuite.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_algorithmsuite_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
rp_algorithmsuite_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_layout_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_layout_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_layout_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_layout_builder.h Sun Apr 22 20:59:40 2007
@@ -25,13 +25,14 @@
#include <rp_includes.h>
#include <rp_property.h>
#include <rp_layout.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_layout_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
rp_layout_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_supporting_tokens_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_supporting_tokens_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_supporting_tokens_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_supporting_tokens_builder.h Sun Apr 22 20:59:40 2007
@@ -29,13 +29,14 @@
#include <rp_username_token.h>
#include <rp_token_identifier.h>
#include <rp_algorithmsuite.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
supporting_tokens_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_binding_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_binding_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_binding_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_binding_builder.h Sun Apr 22 20:59:40 2007
@@ -25,7 +25,7 @@
#include <rp_includes.h>
#include <rp_property.h>
#include <rp_transport_binding.h>
-
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
@@ -33,7 +33,7 @@
#endif
- AXIS2_EXTERN rp_transport_binding_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
transport_binding_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_token_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_token_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_token_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_transport_token_builder.h Sun Apr 22 20:59:40 2007
@@ -25,13 +25,14 @@
#include <rp_includes.h>
#include <rp_property.h>
#include <rp_https_token.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_property_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
transport_token_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_username_token_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_username_token_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_username_token_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_username_token_builder.h Sun Apr 22 20:59:40 2007
@@ -25,13 +25,14 @@
#include <rp_includes.h>
#include <rp_property.h>
#include <rp_username_token.h>
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_username_token_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
rp_username_token_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_wss10_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_wss10_builder.h?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_wss10_builder.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_wss10_builder.h Sun Apr 22 20:59:40 2007
@@ -25,14 +25,14 @@
#include <rp_includes.h>
#include <rp_wss10.h>
#include <neethi_includes.h>
-
+#include <neethi_assertion.h>
#ifdef __cplusplus
extern "C"
{
#endif
- AXIS2_EXTERN rp_wss10_t *AXIS2_CALL
+ AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
wss10_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c Sun Apr 22 20:59:40 2007
@@ -272,7 +272,6 @@
neethi_operator_set_value(operator,env,all,OPERATOR_TYPE_ALL);
neethi_engine_add_policy_component(env,neethi_operator,operator);
}
-
else if(axutil_strcmp(local_name,NEETHI_EXACTLYONE)==0)
{
neethi_exactlyone_t *exactlyone = get_operator_exactlyone(env,child_node,child_element);
@@ -290,17 +289,19 @@
}
else
{
- neethi_assertion_t *assertion = get_operator_assertion(env, child_node, child_element);
+ /* neethi_assertion_t *assertion = neethi_assertion_builder_build(env, child_node, child_element);
operator = neethi_operator_create(env);
neethi_operator_set_value(operator, env, assertion, OPERATOR_TYPE_ASSERTION);
neethi_engine_add_policy_component(env,neethi_operator,operator);
+ */
}
}
}
}
}
return AXIS2_SUCCESS;
- }
+ }
+ return AXIS2_FAILURE;
}
@@ -344,6 +345,12 @@
case OPERATOR_TYPE_UNKNOWN:
return AXIS2_FAILURE;
break;
+
+ case OPERATOR_TYPE_ASSERTION:
+ break;
+
+ case OPERATOR_TYPE_REFERENCE:
+ break;
}
return AXIS2_SUCCESS;
}
@@ -498,6 +505,13 @@
case OPERATOR_TYPE_UNKNOWN:
return AXIS2_FALSE;
break;
+
+ case OPERATOR_TYPE_ASSERTION:
+ break;
+
+ case OPERATOR_TYPE_REFERENCE:
+ break;
+
}
return AXIS2_FALSE;
}
@@ -541,6 +555,13 @@
case OPERATOR_TYPE_UNKNOWN:
return NULL;
break;
+
+ case OPERATOR_TYPE_ASSERTION:
+ break;
+
+ case OPERATOR_TYPE_REFERENCE:
+ break;
+
}
}
else return NULL;
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/algorithmsuite_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/algorithmsuite_builder.c Sun Apr 22 20:59:40 2007
@@ -18,14 +18,13 @@
#include <rp_algorithmsuite_builder.h>
#include <policy_operator.h>
#include <policy.h>
-#include <policy_assertion.h>
#include <policy_exactlyone.h>
#include <policy_all.h>
#include <policy_engine.h>
-AXIS2_EXTERN rp_algorithmsuite_t *AXIS2_CALL
+AXIS2_EXTERN rp_assertion_t *AXIS2_CALL
rp_algorithmsuite_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -36,6 +35,7 @@
axiom_node_t *child_node = NULL;
axiom_node_t *algo_node = NULL;
axiom_element_t *algo_element = NULL;
+ rp_assertion_t *assertion = NULL;
algorithmsuite = rp_algorithmsuite_create(env);
@@ -57,7 +57,10 @@
if(!algosuite_string)
return NULL;
rp_algorithmsuite_set_algosuite(algorithmsuite, env, algosuite_string);
- return algorithmsuite;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE);
+
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/layout_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/layout_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/layout_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/layout_builder.c Sun Apr 22 20:59:40 2007
@@ -18,14 +18,13 @@
#include <rp_layout_builder.h>
#include <policy_operator.h>
#include <policy.h>
-#include <policy_assertion.h>
#include <policy_exactlyone.h>
#include <policy_all.h>
#include <policy_engine.h>
-AXIS2_EXTERN rp_layout_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
rp_layout_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -36,6 +35,7 @@
axiom_node_t *child_node = NULL;
axiom_node_t *layout_node = NULL;
axiom_element_t *layout_element = NULL;
+ neeti_assertion_t *assertion = NULL;
layout = rp_layout_create(env);
@@ -57,7 +57,9 @@
if(!local_name)
return NULL;
rp_layout_set_value(layout, env, local_name);
- return layout;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, layout, ASSERTION_TYPE_LAYOUT);
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/supporting_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/supporting_token_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/supporting_token_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/supporting_token_builder.c Sun Apr 22 20:59:40 2007
@@ -18,7 +18,6 @@
#include <rp_supporting_tokens_builder.h>
#include <neethi_operator.h>
#include <neethi_policy.h>
-#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
#include <neethi_engine.h>
@@ -40,7 +39,7 @@
/***********************************/
-AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
supporting_tokens_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -54,9 +53,26 @@
axutil_array_list_t *alternatives = NULL;
neethi_operator_t *component = NULL;
neethi_all_t *all = NULL;
+ neethi_assertion_t *assertion = NULL;
+ axis2_char_t *local_name = NULL;
supporting_tokens = rp_supporting_tokens_create(env);
-
+ local_name = axiom_element_get_localname(element, env);
+
+ if(local_name)
+ {
+ if(axutil_strcmp(local_name, RP_SIGNED_SUPPORTING_TOKENS) == 0)
+ {
+ rp_supporting_tokens_set_type(supporting_tokens, env, RP_SUPPORTING_SIGNED_SUPPORTING);
+ }
+ else if(axutil_strcmp(local_name, RP_SIGNED_ENDORSING_SUPPORTING_TOKENS)==0)
+ {
+ rp_supporting_tokens_set_type(supporting_tokens, env, RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING);
+ }
+ else return NULL;
+ }
+ else return NULL;
+
child_node = axiom_node_get_first_element(node,env);
if(axiom_node_get_node_type(child_node, env) == AXIOM_ELEMENT)
@@ -75,7 +91,9 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
supporting_tokens_process_alternatives(env, all, supporting_tokens);
- return supporting_tokens;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS);
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c Sun Apr 22 20:59:40 2007
@@ -18,7 +18,6 @@
#include <rp_transport_binding_builder.h>
#include <neethi_operator.h>
#include <neethi_policy.h>
-#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
#include <neethi_engine.h>
@@ -34,7 +33,7 @@
/***********************************/
-AXIS2_EXTERN rp_transport_binding_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
transport_binding_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -48,6 +47,7 @@
axutil_array_list_t *alternatives = NULL;
neethi_operator_t *component = NULL;
neethi_all_t *all = NULL;
+ neethi_assertion_t *assertion = NULL;
transport_binding = rp_transport_binding_create(env);
@@ -69,7 +69,9 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
transport_binding_process_alternatives(env, all, transport_binding);
- return transport_binding;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING);
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_token_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_token_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_token_builder.c Sun Apr 22 20:59:40 2007
@@ -34,7 +34,7 @@
/***********************************/
-AXIS2_EXTERN rp_property_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
transport_token_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -48,6 +48,7 @@
axutil_array_list_t *alternatives = NULL;
neethi_operator_t *component = NULL;
neethi_all_t *all = NULL;
+ neethi_assertion_t *assertion = NULL;
transport_token = rp_property_create(env);
@@ -69,7 +70,9 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
transport_token_process_alternatives(env, all, transport_token);
- return transport_token;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN);
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/username_token_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/username_token_builder.c Sun Apr 22 20:59:40 2007
@@ -18,7 +18,6 @@
#include <rp_username_token_builder.h>
#include <neethi_operator.h>
#include <neethi_policy.h>
-#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
#include <neethi_engine.h>
@@ -34,7 +33,7 @@
/***********************************/
-AXIS2_EXTERN rp_username_token_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
username_token_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -50,6 +49,7 @@
neethi_all_t *all = NULL;
axis2_char_t *inclusion_value = NULL;
axutil_qname_t *qname = NULL;
+ neethi_assertion_t *assertion = NULL;
username_token = rp_username_token_create(env);
qname = axutil_qname_create(env,RP_INCLUDE_TOKEN,RP_SP_NS,RP_SP_PREFIX);
@@ -79,7 +79,9 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
username_token_process_alternatives(env, all, username_token);
- return username_token;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, username_token, ASSERTION_TYPE_USERNAME_TOKEN);
+ return assertion;
}
else return NULL;
}
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/wss10_builder.c?view=diff&rev=531327&r1=531326&r2=531327
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/wss10_builder.c Sun Apr 22 20:59:40 2007
@@ -18,7 +18,6 @@
#include <rp_wss10_builder.h>
#include <neethi_operator.h>
#include <neethi_policy.h>
-#include <neethi_assertion.h>
#include <neethi_exactlyone.h>
#include <neethi_all.h>
#include <neethi_engine.h>
@@ -34,7 +33,7 @@
/***********************************/
-AXIS2_EXTERN rp_wss10_t *AXIS2_CALL
+AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
wss10_builder_build(
const axutil_env_t *env,
axiom_node_t *node,
@@ -48,6 +47,7 @@
axutil_array_list_t *alternatives = NULL;
neethi_operator_t *component = NULL;
neethi_all_t *all = NULL;
+ neethi_assertion_t *assertion = NULL;
wss10 = rp_wss10_create(env);
@@ -69,7 +69,9 @@
all = (neethi_all_t *)neethi_operator_get_value(component ,env);
wss10_process_alternatives(env, all, wss10);
- return wss10;
+ assertion = neethi_assertion_create(env);
+ neethi_assertion_set_value(assertion, env, wss10, ASSERTION_TYPE_WSS10);
+ return assertion;
}
else return NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org