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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul  8 11:59:16 2013
New Revision: 3402

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3402&view=rev
Log:
Rename "basic" artifact map to identify its nature, adjust some interfaces.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
      - copied unchanged from r3398, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java
      - copied, changed from r3398, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMapEntryFactory.java
      - copied, changed from r3401, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryFactory.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMapEntryFactoryTest.java
      - copied, changed from r3398, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryFactoryTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMapTest.java
      - copied, changed from r3398, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapTest.java
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/BasicSAMLArtifactMap.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapTest.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=3402&r1=3401&r2=3402&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 Jul  8 11:59:16 2013
@@ -29,7 +29,6 @@
 import net.shibboleth.utilities.java.support.component.ValidatableComponent;
 
 import org.opensaml.saml.common.SAMLObject;
-import org.opensaml.storage.StorageSerializer;
 
 /**
  * Maps an artifact to a SAML message and back again.
@@ -125,7 +124,7 @@
      * A factory for producing SAMLArtifactMapEntry instances based on standard inputs,
      * and reading/writing them from/to storage.
      */
-    public interface SAMLArtifactMapEntryFactory extends StorageSerializer<SAMLArtifactMapEntry> {
+    public interface SAMLArtifactMapEntryFactory {
         
         /**
          * Factory method which produces a {@link SAMLArtifactMapEntry}.

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java (from r3398, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java&r1=3398&r2=3402&rev=3402&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/StorageServiceSAMLArtifactMap.java Mon Jul  8 11:59:16 2013
@@ -30,19 +30,20 @@
 
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.storage.StorageRecord;
+import org.opensaml.storage.StorageSerializer;
 import org.opensaml.storage.StorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Basic artifact map implementation. */
-public class BasicSAMLArtifactMap extends AbstractDestructableIdentifiableInitializableComponent
+public class StorageServiceSAMLArtifactMap extends AbstractDestructableIdentifiableInitializableComponent
     implements SAMLArtifactMap {
 
     /** Storage context label. */
-    @Nonnull @NotEmpty public static final String STORAGE_CONTEXT = BasicSAMLArtifactMap.class.getName();

[... 200 lines stripped ...]