[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl: Encryp...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Oct 21 23:19:02 2015
New Revision: 7855

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7855&view=rev
Log:
Revert change to IdP signing and encryption credentials resolvers.

Can't have an IdP module depend on an OpenSAML impl module.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java?rev=7855&r1=7854&r2=7855&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java	Wed Oct 21 23:19:02 2015
@@ -32,15 +32,14 @@
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
 import org.opensaml.security.credential.Credential;
-import org.opensaml.security.credential.impl.AbstractCriteriaFilteringCredentialResolver;
+import org.opensaml.security.credential.CredentialResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Credential resolver whose purpose is to resolve configured IdP encryption credentials.
  */
-public class EncryptionCredentialsResolver extends AbstractCriteriaFilteringCredentialResolver 
-        implements IdentifiableComponent {
+public class EncryptionCredentialsResolver implements CredentialResolver, IdentifiableComponent {
     
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(EncryptionCredentialsResolver.class);
@@ -82,7 +81,7 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull public Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteria) 
+    @Nonnull public Iterable<Credential> resolve(@Nullable final CriteriaSet criteria) 
             throws ResolverException {
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;
         try {

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java?rev=7855&r1=7854&r2=7855&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	Wed Oct 21 23:19:02 2015
@@ -32,15 +32,14 @@
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
 import org.opensaml.security.credential.Credential;
-import org.opensaml.security.credential.impl.AbstractCriteriaFilteringCredentialResolver;
+import org.opensaml.security.credential.CredentialResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Credential resolver whose purpose is to resolve configured IdP signing credentials.
  */
-public class SigningCredentialsResolver extends AbstractCriteriaFilteringCredentialResolver 
-        implements IdentifiableComponent {
+public class SigningCredentialsResolver implements CredentialResolver, IdentifiableComponent {
     
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(SigningCredentialsResolver.class);
@@ -82,7 +81,7 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull public Iterable<Credential> resolveFromSource(@Nullable final CriteriaSet criteria) 
+    @Nonnull public Iterable<Credential> resolve(@Nullable final CriteriaSet criteria) 
             throws ResolverException {
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;
         try {