first stable version that uses OpenSAML 3.x

3 files changed, 45 insertions, 5 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2InternalErrorException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2InternalErrorException.java
new file mode 100644
index 00000000..0b69897b
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2InternalErrorException.java
@@ -0,0 +1,12 @@
+package at.gv.egiz.eaaf.modules.pvp2.exception;
+
+public class Pvp2InternalErrorException extends Pvp2Exception {
+
+  private static final long serialVersionUID = 496637421176810375L;
+
+  public Pvp2InternalErrorException(Throwable wrapped) {
+    super("internal.pvp.98", new Object[] { wrapped.getMessage() }, wrapped);
+
+  }
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMessageValidationException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMessageValidationException.java
new file mode 100644
index 00000000..774d0927
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMessageValidationException.java
@@ -0,0 +1,12 @@
+package at.gv.egiz.eaaf.modules.pvp2.exception;
+
+public class SamlMessageValidationException extends Pvp2Exception {
+
+  private static final long serialVersionUID = 2545822499416501014L;
+
+  public SamlMessageValidationException(String messageId, Object[] parameters, Throwable wrapped) {
+    super(messageId, parameters, wrapped);
+
+  }
+
+}
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMetadataSignatureException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMetadataSignatureException.java
index 711fa41f..9ef3a673 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMetadataSignatureException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SamlMetadataSignatureException.java
@@ -21,17 +21,33 @@ package at.gv.egiz.eaaf.modules.pvp2.exception;
 
 import org.opensaml.saml.saml2.core.StatusCode;
 
-public class SamlMetadataSignatureException extends Pvp2Exception {
+public class SamlMetadataSignatureException extends Pvp2MetadataException {
   private static final long serialVersionUID = 1L;
 
-  public SamlMetadataSignatureException() {
-    super("pvp2.25", null);
+  /**
+   * In case of a SAML2 metadata-signature verification error.
+   * 
+   * @param metadataUrl Path metadata that should be loaded
+   * @param reason      Details on error
+   *
+   */
+  public SamlMetadataSignatureException(String metadataUrl, String reason) {
+    super("internal.pvp.07", new Object[] { metadataUrl, reason });
     this.statusCodeValue = StatusCode.REQUESTER;
+
   }
 
-  public SamlMetadataSignatureException(final Throwable e) {
-    super("pvp2.25", null, e);
+  /**
+   * In case of a SAML2 metadata-signature verification error.
+   *
+   * @param metadataUrl Path metadata that should be loaded
+   * @param reason      Details on error
+   * @param e           Error
+   */
+  public SamlMetadataSignatureException(String metadataUrl, String reason, final Throwable e) {
+    super("internal.pvp.07", new Object[] { metadataUrl, reason }, e);
     this.statusCodeValue = StatusCode.REQUESTER;
+
   }
 
 }