You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/05/03 08:56:08 UTC
svn commit: r534731 - in /webservices/axis2/scratch/c/neethi/axis2c/neethi:
include/rp_defines.h src/secpolicy/builder/transport_binding_builder.c
Author: manjula
Date: Wed May 2 23:56:07 2007
New Revision: 534731
URL: http://svn.apache.org/viewvc?view=rev&rev=534731
Log:
Committing latest changes.
Modified:
webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_defines.h
webservices/axis2/scratch/c/neethi/axis2c/neethi/src/secpolicy/builder/transport_binding_builder.c
Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_defines.h?view=diff&rev=534731&r1=534730&r2=534731
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_defines.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/rp_defines.h Wed May 2 23:56:07 2007
@@ -161,9 +161,9 @@
#define RP_INCLUDE_TOKEN "IncludeToken"
#define RP_INCLUDE_ALWAYS "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"
-#define RP_INCLUDE_NEVER "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/Never"
-#define RP_INCLUDE_ONCE "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/Once"
-#define RP_INCLUDE_ALWAYS_TO_RECIPIENT "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/AlwaysToRecipient"
+#define RP_INCLUDE_NEVER "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"
+#define RP_INCLUDE_ONCE "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once"
+#define RP_INCLUDE_ALWAYS_TO_RECIPIENT "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"
#define RP_REQUIRE_KEY_IDENTIFIRE_REFERENCE "RequireKeyIdentifireReference"
#define RP_REQUIRE_ISSUER_SERIAL_REFERENCE "RequireIssuerSerializerReference"
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=534731&r1=534730&r2=534731
==============================================================================
--- 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 Wed May 2 23:56:07 2007
@@ -104,66 +104,63 @@
value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if(value)
+ if(type == ASSERTION_TYPE_TRANSPORT_TOKEN)
{
- if(type == ASSERTION_TYPE_TRANSPORT_TOKEN)
+ rp_property_t *transport_token = NULL;
+ transport_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
+ if(transport_token)
{
- rp_property_t *transport_token = NULL;
- transport_token = (rp_property_t *)neethi_assertion_get_value(assertion, env);
- if(transport_token)
- {
- rp_transport_binding_set_transport_token(transport_binding, env, transport_token);
- }
- else return AXIS2_FAILURE;
+ rp_transport_binding_set_transport_token(transport_binding, env, transport_token);
}
- else if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
+ else return AXIS2_FAILURE;
+ }
+ else if(type == ASSERTION_TYPE_ALGORITHM_SUITE)
+ {
+ rp_algorithmsuite_t *algorithmsuite = NULL;
+ algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
+ if(algorithmsuite)
{
- rp_algorithmsuite_t *algorithmsuite = NULL;
- algorithmsuite = (rp_algorithmsuite_t *)neethi_assertion_get_value(assertion, env);
- if(algorithmsuite)
- {
- rp_binding_commons_set_algorithmsuite(commons, env, algorithmsuite);
- }
- else return AXIS2_FAILURE;
- }
- else if(type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
+ rp_binding_commons_set_algorithmsuite(commons, env, algorithmsuite);
+ }
+ else return AXIS2_FAILURE;
+ }
+ else if(type == ASSERTION_TYPE_INCLUDE_TIMESTAMP)
+ {
+ rp_binding_commons_set_include_timestamp(commons, env, AXIS2_TRUE);
+ }
+ else if(type == ASSERTION_TYPE_LAYOUT)
+ {
+ rp_layout_t *layout = NULL;
+ layout = (rp_layout_t *)neethi_assertion_get_value(assertion, env);
+ if(layout)
{
- rp_binding_commons_set_include_timestamp(commons, env, AXIS2_TRUE);
- }
- else if(type == ASSERTION_TYPE_LAYOUT)
+ rp_binding_commons_set_layout(commons, env, layout);
+ }
+ else return AXIS2_FAILURE;
+ }
+ else if(type == ASSERTION_TYPE_SUPPORTING_TOKENS)
+ {
+ rp_supporting_tokens_t *supporting_tokens = NULL;
+ supporting_tokens = (rp_supporting_tokens_t *)neethi_assertion_get_value(assertion, env);
+ if(supporting_tokens)
{
- rp_layout_t *layout = NULL;
- layout = (rp_layout_t *)neethi_assertion_get_value(assertion, env);
- if(layout)
+ int type = 0;
+ type = rp_supporting_tokens_get_type(supporting_tokens, env);
+ if(type == RP_SUPPORTING_SIGNED_SUPPORTING)
{
- rp_binding_commons_set_layout(commons, env, layout);
- }
- else return AXIS2_FAILURE;
- }
- else if(type == ASSERTION_TYPE_SUPPORTING_TOKENS)
- {
- rp_supporting_tokens_t *supporting_tokens = NULL;
- supporting_tokens = (rp_supporting_tokens_t *)neethi_assertion_get_value(assertion, env);
- if(supporting_tokens)
+ rp_binding_commons_set_signed_supporting_tokens(commons, env, supporting_tokens);
+ }
+ else if(type == RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING)
{
- int type = 0;
- type = rp_supporting_tokens_get_type(supporting_tokens, env);
- if(type == RP_SUPPORTING_SIGNED_SUPPORTING)
- {
- rp_binding_commons_set_signed_supporting_tokens(commons, env, supporting_tokens);
- }
- else if(type == RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING)
- {
- rp_binding_commons_set_signed_endorsing_supporting_tokens(commons, env, supporting_tokens);
- }
- else return AXIS2_FAILURE;
- }
+ rp_binding_commons_set_signed_endorsing_supporting_tokens(commons, env, supporting_tokens);
+ }
else return AXIS2_FAILURE;
- }
+ }
else return AXIS2_FAILURE;
- }
+ }
else return AXIS2_FAILURE;
}
+
rp_transport_binding_set_binding_commons(transport_binding, env, commons);
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org