X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fexceptions.h;h=a691001c6fb7884f8e08cca5c39c5f6127831a49;hb=db648eb8d96bd4414060b4a7a59da5a78749d98b;hp=d66caf5147f17a80376047e3c5d76352e28fa4b9;hpb=1c199e2d851bf77015ce0b1d80ac2cc6ef60cda3;p=shibboleth%2Fcpp-opensaml.git
diff --git a/saml/exceptions.h b/saml/exceptions.h
index d66caf5..a691001 100644
--- a/saml/exceptions.h
+++ b/saml/exceptions.h
@@ -28,6 +28,9 @@
namespace opensaml {
+ namespace saml2p {
+ class SAML_API Status;
+ };
namespace saml2md {
class SAML_API EntityDescriptor;
class SAML_API RoleDescriptor;
@@ -44,18 +47,25 @@ 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 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
);
/**
@@ -63,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
);
};