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 sh...@apache.org on 2008/08/20 15:34:43 UTC
svn commit: r687329 - in /webservices/axis2/trunk/c:
neethi/include/rp_defines.h neethi/src/assertion_builder.c
src/core/deployment/module_builder.c src/core/deployment/svc_builder.c
Author: shankar
Date: Wed Aug 20 06:34:43 2008
New Revision: 687329
URL: http://svn.apache.org/viewvc?rev=687329&view=rev
Log:
WS-Policy 1.5 support
Modified:
webservices/axis2/trunk/c/neethi/include/rp_defines.h
webservices/axis2/trunk/c/neethi/src/assertion_builder.c
webservices/axis2/trunk/c/src/core/deployment/module_builder.c
webservices/axis2/trunk/c/src/core/deployment/svc_builder.c
Modified: webservices/axis2/trunk/c/neethi/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/rp_defines.h?rev=687329&r1=687328&r2=687329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/rp_defines.h (original)
+++ webservices/axis2/trunk/c/neethi/include/rp_defines.h Wed Aug 20 06:34:43 2008
@@ -60,6 +60,7 @@
#define RP_WSS10 "Wss10"
#define RP_WSS11 "Wss11"
#define RP_TRUST10 "Trust10"
+#define RP_TRUST13 "Trust13"
#define RP_MUST_SUPPORT_REF_KEY_IDENTIFIER "MustSupportRefKeyIdentifier"
#define RP_MUST_SUPPORT_REF_ISSUER_SERIAL "MustSupportRefIssuerSerial"
Modified: webservices/axis2/trunk/c/neethi/src/assertion_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/assertion_builder.c?rev=687329&r1=687328&r2=687329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/assertion_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/assertion_builder.c Wed Aug 20 06:34:43 2008
@@ -225,6 +225,11 @@
{
return rp_trust10_builder_build(env, node, element);
}
+ else if(!axutil_strcmp(localname, RP_TRUST13))
+ {
+ /* we can still use rp_trust10 structures */
+ return rp_trust10_builder_build(env, node, element);
+ }
else if(!axutil_strcmp(localname, RP_INCLUDE_TIMESTAMP))
{
neethi_assertion_t *assertion = NULL;
Modified: webservices/axis2/trunk/c/src/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/module_builder.c?rev=687329&r1=687328&r2=687329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/module_builder.c Wed Aug 20 06:34:43 2008
@@ -488,7 +488,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_POLICY, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(op_element, env, qpolicy, op_node);
@@ -507,7 +507,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_REFERENCE, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(op_element, env, qpolicy, op_node);
Modified: webservices/axis2/trunk/c/src/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/svc_builder.c?rev=687329&r1=687328&r2=687329&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/svc_builder.c Wed Aug 20 06:34:43 2008
@@ -468,7 +468,7 @@
itr = axiom_element_get_children_with_qname(svc_element, env, qpolicy, svc_node);
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_POLICY, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(svc_element, env, qpolicy, svc_node);
@@ -488,7 +488,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_REFERENCE, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(svc_element, env, qpolicy, svc_node);
@@ -653,7 +653,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_POLICY, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(op_element, env, qpolicy, op_node);
@@ -673,7 +673,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_REFERENCE, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(op_element, env, qpolicy, op_node);
@@ -777,7 +777,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_POLICY, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(element, env, qpolicy, node);
@@ -800,7 +800,7 @@
axutil_qname_free(qpolicy, env);
qpolicy = NULL;
- if(!axiom_children_qname_iterator_has_next(itr, env))
+ if((!itr) || (!axiom_children_qname_iterator_has_next(itr, env)))
{
qpolicy = axutil_qname_create(env, NEETHI_REFERENCE, NEETHI_POLICY_15_NAMESPACE, NULL);
itr = axiom_element_get_children_with_qname(element, env, qpolicy,node);