Author: dumindu
Date: Wed Oct 10 07:06:30 2007
New Revision: 583481
URL: http://svn.apache.org/viewvc?rev=583481&view=rev
Log:
Fixed macro names.
Modified:
webservices/rampart/scratch/c/saml/include/SAML.h
webservices/rampart/scratch/c/saml/src/assertion.c
webservices/rampart/scratch/c/saml/src/attr_stmt.c
webservices/rampart/scratch/c/saml/src/auth_des_stmt.c
webservices/rampart/scratch/c/saml/src/auth_smt.c
webservices/rampart/scratch/c/saml/src/condition.c
webservices/rampart/scratch/c/saml/src/saml_request.c
webservices/rampart/scratch/c/saml/src/saml_responce.c
webservices/rampart/scratch/c/saml/src/subject.c
Modified: webservices/rampart/scratch/c/saml/include/SAML.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/include/SAML.h?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/include/SAML.h (original)
+++ webservices/rampart/scratch/c/saml/include/SAML.h Wed Oct 10 07:06:30 2007
@@ -35,42 +35,42 @@
#define SAML_MAJORVERSION "MajorVersion"
#define SAML_MINORVERSION "MinorVersion"
-#define SAML_ASSERTIONID "AssertionID"
+#define SAML_ASSERTION_ID "AssertionID"
#define SAML_ISSUER "Issuer"
-#define SAML_ISSUEINSTANT "IssueInstant"
+#define SAML_ISSUE_INSTANT "IssueInstant"
#define SAML_STATEMENT "Statement"
-#define SAML_SUBJECTSTATEMENT "SubjectStatement"
-#define SAML_AUTHENTICATIONSTATEMENT "AuthenticationStatement"
-#define SAML_AUTHORIZATIONDECISIONSTATEMENT "AuthorizationDecisionStatement"
-#define SAML_ATTRIBUTESTATEMENT "AttributeStatement"
+#define SAML_SUBJECT_STATEMENT "SubjectStatement"
+#define SAML_AUTHENTICATION_STATEMENT "AuthenticationStatement"
+#define SAML_AUTHORIZATION_DECISION_STATEMENT "AuthorizationDecisionStatement"
+#define SAML_ATTRIBUTE_STATEMENT "AttributeStatement"
#define SAML_CONDITIONS "Conditions"
#define SAML_ADVICE "Advice"
-#define SAML_NOTBEFORE "NotBefore"
-#define SAML_NOTONORAFTER "NotOnOrAfter"
+#define SAML_NOT_BEFORE "NotBefore"
+#define SAML_NOT_ON_OR_AFTER "NotOnOrAfter"
-#define SAML_EMAILADDRESS "#emailAddress"
-#define SAML_X509SUBJECTNAME "#X509SubjectName"
-#define SAML_WINDOWSDOMAINQUALIFIEDNAME "#WindowsDomainQualifiedName"
+#define SAML_EMAIL_ADDRESS "#emailAddress"
+#define SAML_X509_SUBJECT_NAME "#X509SubjectName"
+#define SAML_WINDOWS_DOMAIN_QUALIFIED_NAME "#WindowsDomainQualifiedName"
-#define SAML_NAMEQUALIFIER "NameQualifier"
+#define SAML_NAME_QUALIFIER "NameQualifier"
#define SAML_FORMAT "Format"
-#define SAML_NAMEIDENTIFIER "NameIdentifier"
-#define SAML_SUBJECTCONFIRMATION "SubjectConfirmation"
-#define SAML_CONFIRMATIONMETHOD "ConfirmationMethod"
-#define SAML_SUBJECTCONFIRMATIONDATA "SubjectConfirmationData"
-#define SAML_KEYINFO "KeyInfo"
+#define SAML_NAME_IDENTIFIER "NameIdentifier"
+#define SAML_SUBJECT_CONFIRMATION "SubjectConfirmation"
+#define SAML_CONFIRMATION_METHOD "ConfirmationMethod"
+#define SAML_SUBJECT_CONFIRMATION_DATA "SubjectConfirmationData"
+#define SAML_KEY_INFO "KeyInfo"
#define SAML_SUBJECT "Subject"
#define SAML_AUDIENCE "Audience"
-#define SAML_AUDIENCERESTRICTIONCONDITIONTYPE
"AudienceRestrictionConditionType"
+#define SAML_AUDIENCE_RESTRICTION_CONDITION_TYPE
"AudienceRestrictionConditionType"
-#define SAML_AUTHENTICATIONMETHOD "AuthenticationMethod"
-#define SAML_AUTHENTICATIONINSTANT "AuthenticationInstant"
-#define SAML_IPADDRESS "IPAddress"
-#define SAML_DNSADDRESS "DNSAddress"
-#define SAML_SUBJECTOCALITY "SubjectLocality"
-#define SAML_AUTHORITYBINDING "AuthorityBinding"
-#define SAML_AUTHORITYKIND "AuthorityKind"
+#define SAML_AUTHENTICATION_METHOD "AuthenticationMethod"
+#define SAML_AUTHENTICATION_INSTANT "AuthenticationInstant"
+#define SAML_IP_ADDRESS "IPAddress"
+#define SAML_DNS_ADDRESS "DNSAddress"
+#define SAML_SUBJEC_LOCALITY "SubjectLocality"
+#define SAML_AUTHORITY_BINDING "AuthorityBinding"
+#define SAML_AUTHORITY_KIND "AuthorityKind"
#define SAML_LOCATION "Location"
#define SAML_BINDING "Binding"
@@ -78,16 +78,16 @@
#define SAML_DECISION "Decision"
#define SAML_ACTION "Action"
#define SAML_NAMESPACE "Namespace"
-#define SAML_ASSERTIONIDREFERENCE "AssertionIDReference"
+#define SAML_ASSERTION_ID_REFERENCE "AssertionIDReference"
#define SAML_ASSERTION "Assertion"
#define SAML_ACTION "Action"
#define SAML_EVIDENCE "Evidence"
-#define SAML_ATTRIBUTENAME "AttributeName"
-#define SAML_ATTRIBUTENAMESPACE "AttributeNamespace"
-#define SAML_ATTRIBUTEVALUE "AttributeValue"
+#define SAML_ATTRIBUTE_NAME "AttributeName"
+#define SAML_ATTRIBUTE_NAMESPACE "AttributeNamespace"
+#define SAML_ATTRIBUTE_VALUE "AttributeValue"
#define SAML_ATTRIBUTE "Attribute"
-#define SAML_ATTRIBUTEDESIGNATOR "AttributeDesignator"
+#define SAML_ATTRIBUTE_DESIGNATOR "AttributeDesignator"
typedef struct saml_assertion_s saml_assertion_t;
Modified: webservices/rampart/scratch/c/saml/src/assertion.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/assertion.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/assertion.c (original)
+++ webservices/rampart/scratch/c/saml/src/assertion.c Wed Oct 10 07:06:30 2007
@@ -52,28 +52,28 @@
{
}
- else if (axutil_strcmp(SAML_SUBJECTSTATEMENT,
axiom_element_get_localname(ce, env)))
+ else if (axutil_strcmp(SAML_SUBJECT_STATEMENT,
axiom_element_get_localname(ce, env)))
{
if ((assertion->sub_stmt =
saml_subject_stmt_create(env)) != NULL)
{
saml_subject_stmt_build(assertion->sub_stmt, cn, env);
}
}
- else if (axutil_strcmp(SAML_AUTHENTICATIONSTATEMENT,
axiom_element_get_localname(ce, env)))
+ else if (axutil_strcmp(SAML_AUTHENTICATION_STATEMENT,
axiom_element_get_localname(ce, env)))
{
if ((assertion->auth_stmt =
saml_auth_stmt_create(env)) != NULL)
{
saml_auth_stmt_build(assertion->auth_stmt, cn, env);
}
}
- else if
(axutil_strcmp(SAML_AUTHORIZATIONDECISIONSTATEMENT,
axiom_element_get_localname(ce, env)))
+ else if
(axutil_strcmp(SAML_AUTHORIZATION_DECISION_STATEMENT,
axiom_element_get_localname(ce, env)))
{
if ((assertion->auth_des_stmt =
saml_auth_desicion_stmt_create(env)) != NULL)
{
saml_auth_desicion_stmt_build(assertion->auth_des_stmt, cn, env);
}
}
- else if (axutil_strcmp(SAML_ATTRIBUTESTATEMENT,
axiom_element_get_localname(ce, env)))
+ else if (axutil_strcmp(SAML_ATTRIBUTE_STATEMENT,
axiom_element_get_localname(ce, env)))
{
if ((assertion->attr_stmt =
saml_attr_stmt_create(env)) != NULL)
{
@@ -82,7 +82,7 @@
}
else if (axutil_strcmp(SAML_CONDITIONS,
axiom_element_get_localname(ce, env)))
{
- axutil_qname_t *qn = axutil_qname_create(env,
SAML_NOTBEFORE, SAML_NMSP_URI, SAML_PREFIX);
+ axutil_qname_t *qn = axutil_qname_create(env,
SAML_NOT_BEFORE, SAML_NMSP_URI, SAML_PREFIX);
if (qn)
{
attr_val =
axiom_element_get_attribute_value(ce, env, qn);
@@ -93,7 +93,7 @@
}
axutil_qname_free(qn, env);
}
- qn = axutil_qname_create(env,
SAML_NOTONORAFTER, SAML_NMSP_URI, SAML_PREFIX);
+ qn = axutil_qname_create(env,
SAML_NOT_ON_OR_AFTER, SAML_NMSP_URI, SAML_PREFIX);
if (qn)
{
attr_val =
axiom_element_get_attribute_value(ce, env, qn);
Modified: webservices/rampart/scratch/c/saml/src/attr_stmt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/attr_stmt.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/attr_stmt.c (original)
+++ webservices/rampart/scratch/c/saml/src/attr_stmt.c Wed Oct 10 07:06:30 2007
@@ -48,7 +48,7 @@
{
return AXIS2_FAILURE;
}
- if ((attr_desig->attr_name =
axiom_element_get_attribute_value_by_name(element, env, SAML_ATTRIBUTENAME)) ==
NULL || (attr_desig->attr_nmsp =
axiom_element_get_attribute_value_by_name(element, env,
SAML_ATTRIBUTENAMESPACE)) == NULL)
+ if ((attr_desig->attr_name =
axiom_element_get_attribute_value_by_name(element, env, SAML_ATTRIBUTE_NAME))
== NULL || (attr_desig->attr_nmsp =
axiom_element_get_attribute_value_by_name(element, env,
SAML_ATTRIBUTE_NAMESPACE)) == NULL)
{
return AXIS2_FAILURE;
}
@@ -62,7 +62,7 @@
axis2_char_t *attr_val = NULL;
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if (0 != axutil_strcmp(attr_val, SAML_ATTRIBUTENAME) &&
0 != axutil_strcmp(attr_val, SAML_ATTRIBUTENAMESPACE))
+ if (0 != axutil_strcmp(attr_val, SAML_ATTRIBUTE_NAME)
&& 0 != axutil_strcmp(attr_val, SAML_ATTRIBUTE_NAMESPACE))
{
return AXIS2_FALSE;
}
@@ -78,14 +78,14 @@
axiom_attribute_t *attr = NULL;
axiom_namespace_t *ns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_ATTRIBUTEDESIGNATOR, ns, &n);
+ e = axiom_element_create(env, parent, SAML_ATTRIBUTE_DESIGNATOR, ns,
&n);
if (e)
{
if (attr_desig->attr_name && attr_desig->attr_nmsp)
{
- attr = axiom_attribute_create(env, SAML_ATTRIBUTENAME,
attr_desig->attr_name, NULL);
+ attr = axiom_attribute_create(env, SAML_ATTRIBUTE_NAME,
attr_desig->attr_name, NULL);
axiom_element_add_attribute(e, env, attr, n);
- attr = axiom_attribute_create(env,
SAML_ATTRIBUTENAMESPACE, attr_desig->attr_nmsp, NULL);
+ attr = axiom_attribute_create(env,
SAML_ATTRIBUTE_NAMESPACE, attr_desig->attr_nmsp, NULL);
axiom_element_add_attribute(e, env, attr, n);
}
else
@@ -141,7 +141,7 @@
{
return AXIS2_FAILURE;
}
- if ((attr->attr_name =
axiom_element_get_attribute_value_by_name(element, env, SAML_ATTRIBUTENAME)) ==
NULL || (attr->attr_nmsp = axiom_element_get_attribute_value_by_name(element,
env, SAML_ATTRIBUTENAMESPACE)) == NULL)
+ if ((attr->attr_name =
axiom_element_get_attribute_value_by_name(element, env, SAML_ATTRIBUTE_NAME))
== NULL || (attr->attr_nmsp =
axiom_element_get_attribute_value_by_name(element, env,
SAML_ATTRIBUTE_NAMESPACE)) == NULL)
{
return AXIS2_FAILURE;
}
@@ -155,7 +155,7 @@
axis2_char_t *attr_val = NULL;
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if (0 != axutil_strcmp(attr_val, SAML_ATTRIBUTENAME) &&
0 != axutil_strcmp(attr_val, SAML_ATTRIBUTENAMESPACE))
+ if (0 != axutil_strcmp(attr_val, SAML_ATTRIBUTE_NAME)
&& 0 != axutil_strcmp(attr_val, SAML_ATTRIBUTE_NAMESPACE))
{
return AXIS2_FALSE;
}
@@ -168,7 +168,7 @@
{
fcn = axiom_child_element_iterator_next(ci, env);
fce = axiom_node_get_data_element(fcn, env);
- if (strcmp(axiom_element_get_localname(fce, env),
SAML_ATTRIBUTEVALUE) == 0)
+ if (strcmp(axiom_element_get_localname(fce, env),
SAML_ATTRIBUTE_VALUE) == 0)
{
axutil_array_list_add(attr->attr_value, env,
axiom_element_get_text(fce, env, fcn));
}
@@ -194,9 +194,9 @@
{
if (sattr->attr_name && sattr->attr_nmsp)
{
- attr = axiom_attribute_create(env, SAML_ATTRIBUTENAME,
sattr->attr_name, NULL);
+ attr = axiom_attribute_create(env, SAML_ATTRIBUTE_NAME,
sattr->attr_name, NULL);
axiom_element_add_attribute(e, env, attr, n);
- attr = axiom_attribute_create(env,
SAML_ATTRIBUTENAMESPACE, sattr->attr_nmsp, NULL);
+ attr = axiom_attribute_create(env,
SAML_ATTRIBUTE_NAMESPACE, sattr->attr_nmsp, NULL);
axiom_element_add_attribute(e, env, attr, n);
}
else
@@ -208,7 +208,7 @@
{
for (i = 0; i < size; i++)
{
- ce = axiom_element_create(env, n,
SAML_ATTRIBUTEVALUE, ns, &cn);
+ ce = axiom_element_create(env, n,
SAML_ATTRIBUTE_VALUE, ns, &cn);
if (ce)
{
axiom_element_set_text(ce, env,
axutil_array_list_get(sattr->attr_value, env, i), cn);
@@ -291,7 +291,7 @@
axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_ATTRIBUTESTATEMENT, ns, &n);
+ e = axiom_element_create(env, parent, SAML_ATTRIBUTE_STATEMENT, ns, &n);
if (e)
{
saml_subject_to_om(&attr_stmt->subject, n, env);
Modified: webservices/rampart/scratch/c/saml/src/auth_des_stmt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/auth_des_stmt.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/auth_des_stmt.c (original)
+++ webservices/rampart/scratch/c/saml/src/auth_des_stmt.c Wed Oct 10 07:06:30
2007
@@ -142,7 +142,7 @@
{
fcn = axiom_child_element_iterator_next(ci, env);
fce = axiom_node_get_data_element(fcn, env);
- if (strcmp(axiom_element_get_localname(fce, env),
SAML_ASSERTIONIDREFERENCE) == 0)
+ if (strcmp(axiom_element_get_localname(fce, env),
SAML_ASSERTION_ID_REFERENCE) == 0)
{
axutil_array_list_add(evidence->assertion_ids,
env, axiom_element_get_text(fce, env, fcn));
}
@@ -178,7 +178,7 @@
size = axutil_array_list_size(evidence->assertion_ids,
env);
for (i = 0; i < size; i++)
{
- ce = axiom_element_create(env, n,
SAML_ASSERTIONIDREFERENCE, ns, &n);
+ ce = axiom_element_create(env, n,
SAML_ASSERTION_ID_REFERENCE, ns, &n);
axiom_element_set_text(ce, env,
axutil_array_list_get(evidence->assertion_ids, env, i), cn);
}
}
@@ -281,7 +281,7 @@
fce = axiom_node_get_data_element(fcn, env);
while(AXIS2_TRUE == axiom_child_element_iterator_has_next(ci,
env))
{
- if (strcmp(axiom_element_get_localname(fce, env),
SAML_SUBJECTSTATEMENT) == 0)
+ if (strcmp(axiom_element_get_localname(fce, env),
SAML_SUBJECT_STATEMENT) == 0)
{
saml_subject_build(&auth_des_stmt->subject,
fcn, env);
}
@@ -319,7 +319,7 @@
axiom_namespace_t *ns = NULL;
saml_action_t *action = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent,
SAML_AUTHORIZATIONDECISIONSTATEMENT, ns, &n);
+ e = axiom_element_create(env, parent,
SAML_AUTHORIZATION_DECISION_STATEMENT, ns, &n);
if (e)
{
if (auth_des_stmt->resource && auth_des_stmt->decision)
Modified: webservices/rampart/scratch/c/saml/src/auth_smt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/auth_smt.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/auth_smt.c (original)
+++ webservices/rampart/scratch/c/saml/src/auth_smt.c Wed Oct 10 07:06:30 2007
@@ -72,11 +72,11 @@
{
return AXIS2_FAILURE;
}
- if ((auth_stmt->auth_method =
axiom_element_get_attribute_value_by_name(element, env,
SAML_AUTHENTICATIONMETHOD)) == NULL)
+ if ((auth_stmt->auth_method =
axiom_element_get_attribute_value_by_name(element, env,
SAML_AUTHENTICATION_METHOD)) == NULL)
{
return AXIS2_FAILURE;
}
- if ((time = axiom_element_get_attribute_value_by_name(element, env,
SAML_AUTHENTICATIONINSTANT)) != NULL)
+ if ((time = axiom_element_get_attribute_value_by_name(element, env,
SAML_AUTHENTICATION_INSTANT)) != NULL)
{
auth_stmt->auth_instanse = axutil_date_time_create(env);
axutil_date_time_deserialize_date_time(auth_stmt->auth_instanse, env, time);
@@ -92,7 +92,7 @@
{
child_node = axiom_child_element_iterator_next(ci, env);
element = (axiom_element_t *)axiom_node_get_data_element(node,
env);
- if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env), SAML_SUBJECTOCALITY)
== 0)
+ if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env), SAML_SUBJEC_LOCALITY)
== 0)
{
auth_stmt->sub_locality =
saml_subject_locality_create(env);
if (!auth_stmt->sub_locality ||
!saml_subject_locality_build(auth_stmt->sub_locality, child_node, env))
@@ -106,7 +106,7 @@
element = (axiom_element_t
*)axiom_node_get_data_element(node, env);
}
}
- if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env), SAML_AUTHORITYBINDING)
== 0)
+ if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env),
SAML_AUTHORITY_BINDING) == 0)
{
auth_bind = saml_auth_binding_create(env);
auth_stmt->auth_binding =
axutil_array_list_create(env, SAML_ARRAY_LIST_DEF);
@@ -151,14 +151,14 @@
axiom_namespace_t *ns = NULL;
saml_auth_binding_t *auth_bind = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_AUTHENTICATIONINSTANT, ns,
&n);
+ e = axiom_element_create(env, parent, SAML_AUTHENTICATION_INSTANT, ns,
&n);
if (e)
{
if (auth_stmt->auth_instanse && auth_stmt->auth_method)
{
- attr = axiom_attribute_create(env,
SAML_AUTHENTICATIONMETHOD, auth_stmt->auth_method, NULL);
+ attr = axiom_attribute_create(env,
SAML_AUTHENTICATION_METHOD, auth_stmt->auth_method, NULL);
axiom_element_add_attribute(e, env, attr, n);
- attr = axiom_attribute_create(env,
SAML_AUTHENTICATIONINSTANT,
axutil_date_time_serialize_date_time(auth_stmt->auth_instanse, env), NULL);
+ attr = axiom_attribute_create(env,
SAML_AUTHENTICATION_INSTANT,
axutil_date_time_serialize_date_time(auth_stmt->auth_instanse, env), NULL);
axiom_element_add_attribute(e, env, attr, n);
}
else
@@ -229,11 +229,11 @@
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
attr_lname = axiom_attribute_get_localname(attr, env);
- if (!axutil_strcmp(attr_lname, SAML_IPADDRESS))
+ if (!axutil_strcmp(attr_lname, SAML_IP_ADDRESS))
{
sub_locality->ip = attr_val;
}
- else if (!axutil_strcmp(attr_lname, SAML_DNSADDRESS))
+ else if (!axutil_strcmp(attr_lname, SAML_DNS_ADDRESS))
{
sub_locality->dns = attr_val;
}
@@ -253,17 +253,17 @@
axiom_attribute_t *attr = NULL;
axiom_namespace_t *ns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_SUBJECTOCALITY, ns, &n);
+ e = axiom_element_create(env, parent, SAML_SUBJEC_LOCALITY, ns, &n);
if (e)
{
if (sub_locality->dns)
{
- attr = axiom_attribute_create(env, SAML_DNSADDRESS,
sub_locality->dns, NULL);
+ attr = axiom_attribute_create(env, SAML_DNS_ADDRESS,
sub_locality->dns, NULL);
axiom_element_add_attribute(e, env, attr, n);
}
if (sub_locality->ip)
{
- attr = axiom_attribute_create(env, SAML_IPADDRESS,
sub_locality->ip, NULL);
+ attr = axiom_attribute_create(env, SAML_IP_ADDRESS,
sub_locality->ip, NULL);
axiom_element_add_attribute(e, env, attr, n);
}
else
@@ -314,7 +314,7 @@
{
return AXIS2_FAILURE;
}
- if ((auth_bind->auth_kind =
axiom_element_get_attribute_value_by_name(element, env, SAML_AUTHORITYKIND)) ==
NULL ||
+ if ((auth_bind->auth_kind =
axiom_element_get_attribute_value_by_name(element, env, SAML_AUTHORITY_KIND))
== NULL ||
(auth_bind->binding =
axiom_element_get_attribute_value_by_name(element, env, SAML_BINDING)) == NULL
||
(auth_bind->location =
axiom_element_get_attribute_value_by_name(element, env, SAML_LOCATION)) == NULL)
{
@@ -331,12 +331,12 @@
axiom_attribute_t *attr = NULL;
axiom_namespace_t *ns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_AUTHORITYBINDING, ns, &n);
+ e = axiom_element_create(env, parent, SAML_AUTHORITY_BINDING, ns, &n);
if (e)
{
if (auth_binding->auth_kind && auth_binding->binding &&
auth_binding->location)
{
- attr = axiom_attribute_create(env, SAML_AUTHORITYKIND,
auth_binding->auth_kind, NULL);
+ attr = axiom_attribute_create(env, SAML_AUTHORITY_KIND,
auth_binding->auth_kind, NULL);
axiom_element_add_attribute(e, env, attr, n);
attr = axiom_attribute_create(env, SAML_BINDING,
auth_binding->binding, NULL);
axiom_element_add_attribute(e, env, attr, n);
Modified: webservices/rampart/scratch/c/saml/src/condition.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/condition.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/condition.c (original)
+++ webservices/rampart/scratch/c/saml/src/condition.c Wed Oct 10 07:06:30 2007
@@ -90,7 +90,7 @@
axiom_node_t *n = NULL, *cn = NULL;
axiom_namespace_t *ns = NULL, *cns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent,
SAML_AUDIENCERESTRICTIONCONDITIONTYPE, ns, &n);
+ e = axiom_element_create(env, parent,
SAML_AUDIENCE_RESTRICTION_CONDITION_TYPE, ns, &n);
if (e && cond->audiences)
{
size = axutil_array_list_size(cond->audiences, env);
Modified: webservices/rampart/scratch/c/saml/src/saml_request.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/saml_request.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/saml_request.c (original)
+++ webservices/rampart/scratch/c/saml/src/saml_request.c Wed Oct 10 07:06:30
2007
@@ -175,7 +175,7 @@
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_AUTHENTICATIONMETHOD))
+ if(!axutil_strcmp(axiom_attribute_get_localname(attr,
env), SAML_AUTHENTICATION_METHOD))
{
authentication_query->auth_method = attr_val;
}
@@ -472,7 +472,7 @@
{
request->minor_version = attr_val;
}
- else
if(!axutil_strcmp(axiom_attribute_get_localname(attr, env), SAML_ISSUEINSTANT))
+ else
if(!axutil_strcmp(axiom_attribute_get_localname(attr, env), SAML_ISSUE_INSTANT))
{
request->issue_instant =
axutil_date_time_create(env);
axutil_date_time_deserialize_date(request->issue_instant, env, attr_val);
Modified: webservices/rampart/scratch/c/saml/src/saml_responce.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/saml_responce.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/saml_responce.c (original)
+++ webservices/rampart/scratch/c/saml/src/saml_responce.c Wed Oct 10 07:06:30
2007
@@ -116,7 +116,7 @@
{
responce->minor_version = attr_val;
}
- else
if(!axutil_strcmp(axiom_attribute_get_localname(attr, env), SAML_ISSUEINSTANT))
+ else
if(!axutil_strcmp(axiom_attribute_get_localname(attr, env), SAML_ISSUE_INSTANT))
{
responce->issue_instant =
axutil_date_time_create(env);
axutil_date_time_deserialize_date(responce->issue_instant, env, attr_val);
Modified: webservices/rampart/scratch/c/saml/src/subject.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/saml/src/subject.c?rev=583481&r1=583480&r2=583481&view=diff
==============================================================================
--- webservices/rampart/scratch/c/saml/src/subject.c (original)
+++ webservices/rampart/scratch/c/saml/src/subject.c Wed Oct 10 07:06:30 2007
@@ -67,7 +67,7 @@
axiom_attribute_t *attr = (axiom_attribute_t*)v;
attr_val = axiom_attribute_get_value(attr, env);
- if (!axutil_strcmp(attr_val, SAML_NAMEQUALIFIER))
+ if (!axutil_strcmp(attr_val, SAML_NAME_QUALIFIER))
{
named_id->name_qualifier = attr_val;
}
@@ -95,7 +95,7 @@
axiom_namespace_t *ns = NULL;
axiom_attribute_t *attr = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_NAMEIDENTIFIER, ns, &n);
+ e = axiom_element_create(env, parent, SAML_NAME_IDENTIFIER, ns, &n);
if (e)
{
if (id->format)
@@ -105,7 +105,7 @@
}
if (id->name_qualifier)
{
- axiom_attribute_create(env, SAML_NAMEQUALIFIER,
id->name_qualifier, ns);
+ axiom_attribute_create(env, SAML_NAME_QUALIFIER,
id->name_qualifier, ns);
axiom_element_add_attribute(e, env, attr, n);
}
if (id->name)
@@ -166,7 +166,7 @@
axiom_element_t *conf_child_element = NULL;
child_node = axiom_child_element_iterator_next(ci, env);
element = (axiom_element_t *)axiom_node_get_data_element(node,
env);
- if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env), SAML_NAMEIDENTIFIER)
== 0)
+ if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env), SAML_NAME_IDENTIFIER)
== 0)
{
saml_named_id_build(&subject->named_id,
child_node, env);
is_named_id = AXIS2_TRUE;
@@ -177,7 +177,7 @@
element = (axiom_element_t
*)axiom_node_get_data_element(node, env);
}
}
- if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env),
SAML_SUBJECTCONFIRMATION) == 0)
+ if (element != NULL &&
axutil_strcmp(axiom_element_get_localname(element, env),
SAML_SUBJECT_CONFIRMATION) == 0)
{
conf_ci =
axiom_element_get_child_elements(element, env, node);
if (conf_ci)
@@ -187,15 +187,15 @@
conf_child_node =
axiom_child_element_iterator_next(conf_ci, env);
conf_child_element =
axiom_node_get_data_element(conf_child_node, env);
- if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_CONFIRMATIONMETHOD))
+ if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_CONFIRMATION_METHOD))
{
axutil_array_list_add(subject->confirmation_methods, env,
axiom_element_get_text(conf_child_element, env, conf_child_node));
}
- else if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_SUBJECTCONFIRMATIONDATA))
+ else if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_SUBJECT_CONFIRMATION_DATA))
{
subject->confirmation_data = conf_child_node;
}
- else if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_KEYINFO))
+ else if (0 ==
axutil_strcmp(axiom_element_get_localname(conf_child_element, env),
SAML_KEY_INFO))
{
subject->key_info =
conf_child_node;
}
@@ -230,7 +230,7 @@
if (e)
{
saml_named_id_to_om(&subject->named_id, n, env);
- ce = axiom_element_create(env, n, SAML_SUBJECTCONFIRMATION, ns,
&cn);
+ ce = axiom_element_create(env, n, SAML_SUBJECT_CONFIRMATION,
ns, &cn);
if (ce)
{
if (subject->confirmation_methods)
@@ -238,7 +238,7 @@
size =
axutil_array_list_size(subject->confirmation_methods, env);
for (i = 0; i < size; i++)
{
- cce = axiom_element_create(env, cn,
SAML_CONFIRMATIONMETHOD, ns, &ccn);
+ cce = axiom_element_create(env, cn,
SAML_CONFIRMATION_METHOD, ns, &ccn);
if (cce)
{
axiom_element_set_text(cce,
env, axutil_array_list_get(subject->confirmation_methods, env, i), ccn);
@@ -247,7 +247,7 @@
}
if (subject->confirmation_data)
{
- cce = axiom_element_create(env, cn,
SAML_SUBJECTCONFIRMATIONDATA, ns, &ccn);
+ cce = axiom_element_create(env, cn,
SAML_SUBJECT_CONFIRMATION_DATA, ns, &ccn);
if (cce)
{
axiom_node_add_child(cn, env,
subject->confirmation_data);
@@ -255,7 +255,7 @@
}
if (subject->key_info)
{
- cce = axiom_element_create(env, cn,
SAML_KEYINFO, ns, &ccn);
+ cce = axiom_element_create(env, cn,
SAML_KEY_INFO, ns, &ccn);
if (cce)
{
axiom_node_add_child(cn, env,
subject->key_info);
@@ -309,7 +309,7 @@
axiom_node_t *n = NULL;
axiom_namespace_t *ns = NULL;
ns = axiom_namespace_create(env, SAML_NMSP_URI, SAML_PREFIX);
- e = axiom_element_create(env, parent, SAML_SUBJECTSTATEMENT, ns, &n);
+ e = axiom_element_create(env, parent, SAML_SUBJECT_STATEMENT, ns, &n);
if (e)
{
saml_subject_to_om(&subject_stmt->subject, n, env);
