/*
- * Copyright 2001-2006 Internet2
+ * Copyright 2001-2007 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#ifndef __saml1_assertions_h__
#define __saml1_assertions_h__
-#include <saml/signature/SignableObject.h>
+#include <saml/Assertion.h>
#include <saml/util/SAMLConstants.h>
-#include <xmltooling/AttributeExtensibleXMLObject.h>
#include <xmltooling/ElementProxy.h>
-#include <xmltooling/SimpleElement.h>
#include <xmltooling/XMLObjectBuilder.h>
#include <xmltooling/signature/KeyInfo.h>
#include <xmltooling/signature/Signature.h>
#include <xmltooling/util/DateTime.h>
-#include <xmltooling/validation/ValidatorSuite.h>
#define DECL_SAML1OBJECTBUILDER(cname) \
- DECL_XMLOBJECTBUILDER(SAML_API,cname,opensaml::SAMLConstants::SAML1_NS,opensaml::SAMLConstants::SAML1_PREFIX)
+ DECL_XMLOBJECTBUILDER(SAML_API,cname,samlconstants::SAML1_NS,samlconstants::SAML1_PREFIX)
namespace opensaml {
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(SAML_API,NameIdentifier,xmltooling::SimpleElement,SAML 1.x NameIdentifier element);
+ BEGIN_XMLOBJECT(SAML_API,NameIdentifier,xmltooling::XMLObject,SAML 1.x NameIdentifier element);
DECL_STRING_ATTRIB(NameQualifier,NAMEQUALIFIER);
DECL_STRING_ATTRIB(Format,FORMAT);
- DECL_XMLOBJECT_CONTENT(Name);
+ DECL_SIMPLE_CONTENT(Name);
/** NameIdentifierType local name */
static const XMLCh TYPE_NAME[];
- /** Unspecified name format ID */\r
- static const XMLCh UNSPECIFIED[];\r
- /** Email address name format ID */\r
- static const XMLCh EMAIL[];\r
- /** X.509 subject name format ID */\r
- static const XMLCh X509_SUBJECT[];\r
- /** Windows domain qualified name format ID */\r
- static const XMLCh WIN_DOMAIN_QUALIFIED[];\r
+ /** Unspecified name format ID */
+ static const XMLCh UNSPECIFIED[];
+ /** Email address name format ID */
+ static const XMLCh EMAIL[];
+ /** X.509 subject name format ID */
+ static const XMLCh X509_SUBJECT[];
+ /** Windows domain qualified name format ID */
+ static const XMLCh WIN_DOMAIN_QUALIFIED[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT2(SAML_API,SubjectConfirmationData,xmltooling::ElementProxy,xmltooling::AttributeExtensibleXMLObject,SAML 1.x SubjectConfirmationData element);
+ BEGIN_XMLOBJECT(SAML_API,SubjectConfirmationData,xmltooling::ElementProxy,SAML 1.x SubjectConfirmationData element);
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,SubjectConfirmation,xmltooling::XMLObject,SAML 1.x SubjectConfirmation element);
/** SubjectConfirmationType local name */
static const XMLCh TYPE_NAME[];
/** Deprecated SAML 1.0 Artifact confirmation method */
- static const XMLCh ARTIFACT01[];\r
+ static const XMLCh ARTIFACT01[];
/** Artifact confirmation method */
- static const XMLCh ARTIFACT[];\r
+ static const XMLCh ARTIFACT[];
/** Bearer confirmation method */
- static const XMLCh BEARER[];\r
- /** Holder of key confirmation method */\r
- static const XMLCh HOLDER_KEY[];\r
- /** Sender vouches confirmation method */\r
- static const XMLCh SENDER_VOUCHES[];\r
+ static const XMLCh BEARER[];
+ /** Holder of key confirmation method */
+ static const XMLCh HOLDER_KEY[];
+ /** Sender vouches confirmation method */
+ static const XMLCh SENDER_VOUCHES[];
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,Subject,xmltooling::XMLObject,SAML 1.x Subject element);
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(SAML_API,Action,xmltooling::SimpleElement,SAML 1.x Action element);
+ BEGIN_XMLOBJECT(SAML_API,Action,xmltooling::XMLObject,SAML 1.x Action element);
DECL_STRING_ATTRIB(Namespace,NAMESPACE);
- DECL_XMLOBJECT_CONTENT(Action);
+ DECL_SIMPLE_CONTENT(Action);
/** ActionType local name */
static const XMLCh TYPE_NAME[];
/** Read/Write/Execute/Delete/Control Action Namespace */
- static const XMLCh RWEDC_NEG_ACTION_NAMESPACE[];\r
+ static const XMLCh RWEDC_NEG_ACTION_NAMESPACE[];
/** Read/Write/Execute/Delete/Control with Negation Action Namespace */
- static const XMLCh RWEDC_ACTION_NAMESPACE[];\r
+ static const XMLCh RWEDC_ACTION_NAMESPACE[];
/** Get/Head/Put/Post Action Namespace */
- static const XMLCh GHPP_ACTION_NAMESPACE[];\r
+ static const XMLCh GHPP_ACTION_NAMESPACE[];
/** UNIX File Permissions Action Namespace */
- static const XMLCh UNIX_ACTION_NAMESPACE[];\r
+ static const XMLCh UNIX_ACTION_NAMESPACE[];
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,Evidence,xmltooling::XMLObject,SAML 1.x Evidence element);
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT2(SAML_API,AttributeValue,xmltooling::ElementProxy,xmltooling::AttributeExtensibleXMLObject,SAML 1.x AttributeValue element);
+ BEGIN_XMLOBJECT(SAML_API,AttributeValue,xmltooling::ElementProxy,SAML 1.x AttributeValue element);
END_XMLOBJECT;
BEGIN_XMLOBJECT(SAML_API,AttributeStatement,SubjectStatement,SAML 1.x AttributeStatement element);
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(SAML_API,Advice,xmltooling::XMLObject,SAML 1.x Advice element);
+ BEGIN_XMLOBJECT(SAML_API,Advice,xmltooling::ElementExtensibleXMLObject,SAML 1.x Advice element);
DECL_TYPED_CHILDREN(AssertionIDReference);
DECL_TYPED_CHILDREN(Assertion);
- DECL_XMLOBJECT_CHILDREN(Other);
/** AdviceType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
- BEGIN_XMLOBJECT(SAML_API,Assertion,SignableObject,SAML 1.x Assertion element);
+ BEGIN_XMLOBJECT(SAML_API,Assertion,opensaml::Assertion,SAML 1.x Assertion element);
DECL_INTEGER_ATTRIB(MinorVersion,MINORVERSION);
DECL_STRING_ATTRIB(AssertionID,ASSERTIONID);
DECL_STRING_ATTRIB(Issuer,ISSUER);
- DECL_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT);
+ DECL_INHERITED_DATETIME_ATTRIB(IssueInstant,ISSUEINSTANT);
DECL_TYPED_CHILD(Conditions);
DECL_TYPED_CHILD(Advice);
DECL_TYPED_CHILDREN(Statement);
DECL_TYPED_CHILDREN(AuthenticationStatement);
DECL_TYPED_CHILDREN(AttributeStatement);
DECL_TYPED_CHILDREN(AuthorizationDecisionStatement);
- DECL_TYPED_FOREIGN_CHILD(Signature,xmlsignature);
/** AssertionType local name */
static const XMLCh TYPE_NAME[];
END_XMLOBJECT;
* Registers builders and validators for SAML 1.x Assertion classes into the runtime.
*/
void SAML_API registerAssertionClasses();
-
- /**
- * Validator suite for SAML 1.x Assertion schema validation.
- */
- extern SAML_API xmltooling::ValidatorSuite AssertionSchemaValidators;
};
};