a lot of more OpenSAML3 refactoring staff

This version is also NOT stable!

1 files changed, 20 insertions, 20 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
index f8a39b61..f86fd883 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
@@ -39,7 +39,8 @@ import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractController;
 import at.gv.egiz.eaaf.modules.pvp2.PvpEventConstants;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.binding.IEncoder;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.api.credential.EaafX509Credential;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvp2MetadataProvider;
 import at.gv.egiz.eaaf.modules.pvp2.api.validation.IAuthnRequestPostProcessor;
 import at.gv.egiz.eaaf.modules.pvp2.exception.InvalidPvpRequestException;
 import at.gv.egiz.eaaf.modules.pvp2.exception.NameIdFormatNotSupportedException;
@@ -60,20 +61,19 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
-import org.opensaml.common.xml.SAMLConstants;
-import org.opensaml.saml2.core.AuthnRequest;
-import org.opensaml.saml2.core.Issuer;
-import org.opensaml.saml2.core.NameIDType;
-import org.opensaml.saml2.core.Response;
-import org.opensaml.saml2.core.Status;
-import org.opensaml.saml2.core.StatusCode;
-import org.opensaml.saml2.core.StatusMessage;
-import org.opensaml.saml2.metadata.AssertionConsumerService;
-import org.opensaml.saml2.metadata.EntityDescriptor;
-import org.opensaml.saml2.metadata.SPSSODescriptor;
+import org.opensaml.saml.common.xml.SAMLConstants;
+import org.opensaml.saml.saml2.core.AuthnRequest;
+import org.opensaml.saml.saml2.core.Issuer;
+import org.opensaml.saml.saml2.core.NameIDType;
+import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml2.core.Status;
+import org.opensaml.saml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.StatusMessage;
+import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.ws.security.SecurityPolicyException;
-import org.opensaml.xml.security.x509.X509Credential;
-import org.opensaml.xml.signature.SignableXMLObject;
+import org.opensaml.xmlsec.signature.SignableXMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +84,7 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
   @Autowired(required = true)
   protected IPvp2BasicConfiguration pvpBasicConfiguration;
   @Autowired(required = true)
-  protected IPvpMetadataProvider metadataProvider;
+  protected IPvp2MetadataProvider metadataProvider;
   @Autowired(required = true)
   protected SamlVerificationEngine samlVerificationEngine;
   @Autowired(required = false)
@@ -125,11 +125,11 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
     String moaError = null;
 
     if (e instanceof NoPassivAuthenticationException) {
-      statusCode.setValue(StatusCode.NO_PASSIVE_URI);
+      statusCode.setValue(StatusCode.NO_PASSIVE);
       statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));
 
     } else if (e instanceof NameIdFormatNotSupportedException) {
-      statusCode.setValue(StatusCode.INVALID_NAMEID_POLICY_URI);
+      statusCode.setValue(StatusCode.INVALID_NAMEID_POLICY);
       statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));
 
     } else if (e instanceof SloException) {
@@ -146,7 +146,7 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
       moaError = statusMessager.mapInternalErrorToExternalError(ex.getErrorId());
 
     } else {
-      statusCode.setValue(StatusCode.RESPONDER_URI);
+      statusCode.setValue(StatusCode.RESPONDER);
       statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));
       moaError = statusMessager.getResponseErrorCode(e);
     }
@@ -194,9 +194,9 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
       relayState = pvpRequest.getRequest().getRelayState();
     }
 
-    final X509Credential signCred = pvpIdpCredentials.getIdpAssertionSigningCredential();
+    final EaafX509Credential signCred = pvpIdpCredentials.getIdpAssertionSigningCredential();
 
-    encoder.encodeRespone(request, response, samlResponse, pvpRequest.getConsumerUrl(), relayState,
+    encoder.encodeResponse(request, response, samlResponse, pvpRequest.getConsumerUrl(), relayState,
         signCred, protocolRequest);
     return true;
   }