[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtif...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Aug 11 04:51:32 2014
New Revision: 3996

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3996&view=rev
Log:
IDP-463 SAMLAtrifactMaps do not need to be identified.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java?rev=3996&r1=3995&r2=3996&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/SAMLArtifactMap.java Mon Aug 11 04:51:32 2014
@@ -24,7 +24,6 @@
 
 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;
 
 import org.opensaml.saml.common.SAMLObject;
@@ -41,7 +40,7 @@
  * implementation of {@link SAMLArtifactMapEntryFactory}.
  * </p>
  */
-public interface SAMLArtifactMap extends InitializableComponent, DestructableComponent, IdentifiedComponent {
+public interface SAMLArtifactMap extends InitializableComponent, DestructableComponent {
 
     /**
      * Checks if a given artifact has a map entry.

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java?rev=3996&r1=3995&r2=3996&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java Mon Aug 11 04:51:32 2014
@@ -32,7 +32,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -44,7 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 /** Basic artifact map implementation. */
-public class BasicSAMLArtifactMap extends AbstractIdentifiableInitializableComponent implements
+public class BasicSAMLArtifactMap extends AbstractInitializableComponent implements
         SAMLArtifactMap {
 
     /** Class Logger. */
@@ -70,7 +70,6 @@
 
     /** Constructor. */
     public BasicSAMLArtifactMap() {
-        setId(getClass().getName());
         artifactLifetime = 60000L;
         cleanupInterval = 300;
         entryFactory = new ExpiringSAMLArtifactMapEntryFactory();

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java?rev=3996&r1=3995&r2=3996&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java Mon Aug 11 04:51:32 2014
@@ -26,7 +26,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -39,8 +39,7 @@

[... 18 lines stripped ...]