X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fexceptions.h;h=a691001c6fb7884f8e08cca5c39c5f6127831a49;hb=79a4c41067afcfa75eb82aa3c49ba3573640b0bd;hp=b44102e1afb583de0b1f5bccb9343904087378cb;hpb=544c9a92232f5a33bb2ad2001ca1f17a85d44bbe;p=shibboleth%2Fopensaml2.git
diff --git a/saml/exceptions.h b/saml/exceptions.h
index b44102e..a691001 100644
--- a/saml/exceptions.h
+++ b/saml/exceptions.h
@@ -1,5 +1,5 @@
/*
- * 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.
@@ -28,30 +28,44 @@
namespace opensaml {
+ namespace saml2p {
+ class SAML_API Status;
+ };
namespace saml2md {
class SAML_API EntityDescriptor;
class SAML_API RoleDescriptor;
};
+ DECL_XMLTOOLING_EXCEPTION(SecurityPolicyException,SAML_EXCEPTIONAPI(SAML_API),opensaml,xmltooling::XMLToolingException,Exceptions in security policy processing);
DECL_XMLTOOLING_EXCEPTION(BindingException,SAML_EXCEPTIONAPI(SAML_API),opensaml,xmltooling::XMLToolingException,Exceptions in SAML binding processing);
+ DECL_XMLTOOLING_EXCEPTION(ProfileException,SAML_EXCEPTIONAPI(SAML_API),opensaml,xmltooling::ValidationException,Exceptions in SAML profile processing);
+ DECL_XMLTOOLING_EXCEPTION(FatalProfileException,SAML_EXCEPTIONAPI(SAML_API),opensaml,ProfileException,Fatal exceptions in SAML profile processing);
+ DECL_XMLTOOLING_EXCEPTION(RetryableProfileException,SAML_EXCEPTIONAPI(SAML_API),opensaml,ProfileException,Non-fatal exceptions in SAML profile processing);
/**
* Attaches metadata-derived information as exception properties and optionally
* rethrows the object. The following named properties are attached, when possible:
*
*
- * - providerId
- The unique ID of the entity
+ * - entityID
- The unique ID of the entity
* - errorURL
- The error support URL of a random role
* - contactName
- A formatted support or technical contact name
* - contactEmail
- A contact email address
+ * - statusCode
- Top-level status code from Status object
+ * - statusCode2
- Second-level status code from Status object
+ * - statusMessage
- StatusMessage from Status object
*
*
* @param e pointer to exception object
* @param entity pointer to entity
+ * @param status pointer to Status from message
* @param rethrow true iff the exception should be rethrown
*/
void SAML_API annotateException(
- xmltooling::XMLToolingException* e, const saml2md::EntityDescriptor* entity, bool rethrow=true
+ xmltooling::XMLToolingException* e,
+ const saml2md::EntityDescriptor* entity,
+ const saml2p::Status* status=NULL,
+ bool rethrow=true
);
/**
@@ -59,18 +73,24 @@ namespace opensaml {
* rethrows the object. The following named properties are attached, when possible:
*
*
- * - providerId
- The unique ID of the entity
+ * - entityID
- The unique ID of the entity
* - errorURL
- The error support URL of the role
* - contactName
- A formatted support or technical contact name
* - contactEmail
- A contact email address
+ * - statusCode
- Top-level status code from Status object
+ * - statusCode2
- Second-level status code from Status object
*
*
* @param e pointer to exception object
* @param entity pointer to role
+ * @param status pointer to Status from message
* @param rethrow true iff the exception should be rethrown
*/
void SAML_API annotateException(
- xmltooling::XMLToolingException* e, const saml2md::RoleDescriptor* role, bool rethrow=true
+ xmltooling::XMLToolingException* e,
+ const saml2md::RoleDescriptor* role,
+ const saml2p::Status* status=NULL,
+ bool rethrow=true
);
};