[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec  5 16:34:59 2014
New Revision: 7047

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7047&view=rev
Log:
Stop exposing init/destroy interfaces as a core part of API

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionResolver.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java?rev=7047&r1=7046&r2=7047&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java Fri Dec  5 16:34:59 2014
@@ -25,9 +25,7 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
 import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
 
 /**
  * A component that resolves the attributes for a particular subject.
@@ -39,7 +37,7 @@
  * net.shibboleth.utilities.java.support.resolver.Criterion.</p>
  * */
 @ThreadSafe
-public interface AttributeResolver extends DestructableComponent, IdentifiedComponent, UnmodifiableComponent {
+public interface AttributeResolver extends IdentifiedComponent {
 
     /**
      * Gets the collection of attribute definitions for this resolver.

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java?rev=7047&r1=7046&r2=7047&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java Fri Dec  5 16:34:59 2014
@@ -31,7 +31,6 @@
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.saml.criterion.EntityRoleCriterion;
 import org.opensaml.saml.criterion.ProtocolCriterion;
-import org.opensaml.saml.metadata.resolver.RoleDescriptorResolver;
 import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
 import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter;
 import org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver;
@@ -328,7 +327,7 @@
         mdProvider.setId("Test");
         mdProvider.initialize();
         
-        RoleDescriptorResolver roleResolver = new BasicRoleDescriptorResolver(mdProvider);
+        BasicRoleDescriptorResolver roleResolver = new BasicRoleDescriptorResolver(mdProvider);
         roleResolver.initialize();
         
         MetadataPKIXValidationInformationResolver resolver = new MetadataPKIXValidationInformationResolver(roleResolver);

Modified: trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java?rev=7047&r1=7046&r2=7047&view=diff
==============================================================================
--- trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java (original)
+++ trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/SessionManager.java Fri Dec  5 16:34:59 2014
@@ -21,16 +21,12 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.DestructableComponent;
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
 
 /**
  * Component that manages sessions between the IdP and client devices.
  */
 @ThreadSafe
-public interface SessionManager extends
-    InitializableComponent, DestructableComponent, IdentifiedComponent {
+public interface SessionManager {
 

[... 45 lines stripped ...]