first steps in openSAML3 refactoring

9 files changed, 20 insertions, 20 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/BindingNotSupportedException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/BindingNotSupportedException.java
index 2273d343..cc01aa43 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/BindingNotSupportedException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/BindingNotSupportedException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class BindingNotSupportedException extends Pvp2Exception {
 
@@ -27,7 +27,7 @@ public class BindingNotSupportedException extends Pvp2Exception {
 
   public BindingNotSupportedException(final String binding) {
     super("pvp2.11", new Object[] { binding });
-    this.statusCodeValue = StatusCode.UNSUPPORTED_BINDING_URI;
+    this.statusCodeValue = StatusCode.UNSUPPORTED_BINDING;
   }
 
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/InvalidDateFormatException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/InvalidDateFormatException.java
index 538279b5..b71ab2c6 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/InvalidDateFormatException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/InvalidDateFormatException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class InvalidDateFormatException extends Pvp2Exception {
 
@@ -27,7 +27,7 @@ public class InvalidDateFormatException extends Pvp2Exception {
 
   public InvalidDateFormatException() {
     super("pvp2.02", null);
-    this.statusCodeValue = StatusCode.REQUESTER_URI;
+    this.statusCodeValue = StatusCode.REQUESTER;
   }
 
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NameIdFormatNotSupportedException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NameIdFormatNotSupportedException.java
index a5b5ed33..57f40e8f 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NameIdFormatNotSupportedException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NameIdFormatNotSupportedException.java
@@ -19,10 +19,10 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
-
 import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException;
 
+import org.opensaml.saml.saml2.core.StatusCode;
+
 public class NameIdFormatNotSupportedException extends AuthnRequestValidatorException {
 
   private static final long serialVersionUID = -2270762519437873336L;
@@ -34,7 +34,7 @@ public class NameIdFormatNotSupportedException extends AuthnRequestValidatorExce
    */
   public NameIdFormatNotSupportedException(final String nameIdFormat) {
     super("pvp2.12", new Object[] { nameIdFormat });
-    statusCodeValue = StatusCode.INVALID_NAMEID_POLICY_URI;
+    statusCodeValue = StatusCode.INVALID_NAMEID_POLICY;
 
   }
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NoMetadataInformationException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NoMetadataInformationException.java
index 002a946c..16dfa09f 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NoMetadataInformationException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/NoMetadataInformationException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class NoMetadataInformationException extends Pvp2Exception {
 
@@ -27,7 +27,7 @@ public class NoMetadataInformationException extends Pvp2Exception {
 
   public NoMetadataInformationException() {
     super("pvp2.15", null);
-    this.statusCodeValue = StatusCode.UNKNOWN_PRINCIPAL_URI;
+    this.statusCodeValue = StatusCode.UNKNOWN_PRINCIPAL;
   }
 
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2Exception.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2Exception.java
index dcbda8b5..54d0c5ef 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2Exception.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/Pvp2Exception.java
@@ -19,14 +19,14 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
-
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
+import org.opensaml.saml.saml2.core.StatusCode;
+
 public abstract class Pvp2Exception extends EaafException {
   private static final long serialVersionUID = 7669537952484421069L;
 
-  protected String statusCodeValue = StatusCode.RESPONDER_URI;
+  protected String statusCodeValue = StatusCode.RESPONDER;
   protected String statusMessageValue = null;
 
   public Pvp2Exception(final String messageId, final Object[] parameters, final Throwable wrapped) {
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotAllowedException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotAllowedException.java
index 9620a5ea..5f109b67 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotAllowedException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotAllowedException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class QaaNotAllowedException extends Pvp2Exception {
 
@@ -27,6 +27,6 @@ public class QaaNotAllowedException extends Pvp2Exception {
 
   public QaaNotAllowedException(final String qaaAuth, final String qaaRequest, final String mode) {
     super("pvp2.17", new Object[] { qaaAuth, qaaRequest, mode });
-    this.statusCodeValue = StatusCode.REQUESTER_URI;
+    this.statusCodeValue = StatusCode.REQUESTER;
   }
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotSupportedException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotSupportedException.java
index 8824ca63..fce44542 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotSupportedException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/QaaNotSupportedException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class QaaNotSupportedException extends Pvp2Exception {
 
@@ -27,7 +27,7 @@ public class QaaNotSupportedException extends Pvp2Exception {
 
   public QaaNotSupportedException(final String qaa) {
     super("pvp2.05", new Object[] { qaa });
-    this.statusCodeValue = StatusCode.REQUESTER_URI;
+    this.statusCodeValue = StatusCode.REQUESTER;
   }
 
 }
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 e27c5b1d..711fa41f 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
@@ -19,19 +19,19 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusCode;
 
 public class SamlMetadataSignatureException extends Pvp2Exception {
   private static final long serialVersionUID = 1L;
 
   public SamlMetadataSignatureException() {
     super("pvp2.25", null);
-    this.statusCodeValue = StatusCode.REQUESTER_URI;
+    this.statusCodeValue = StatusCode.REQUESTER;
   }
 
   public SamlMetadataSignatureException(final Throwable e) {
     super("pvp2.25", null, e);
-    this.statusCodeValue = StatusCode.REQUESTER_URI;
+    this.statusCodeValue = StatusCode.REQUESTER;
   }
 
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SignatureValidationException.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SignatureValidationException.java
index 0abfa5b2..6a39336c 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SignatureValidationException.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/exception/SignatureValidationException.java
@@ -19,7 +19,7 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.exception;
 
-import org.opensaml.saml2.metadata.provider.FilterException;
+import org.opensaml.saml.metadata.resolver.filter.FilterException;
 
 public class SignatureValidationException extends FilterException {