[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar 16 20:53:56 2014
New Revision: 5592

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5592&view=rev
Log:
Clean up persistent ID store interface and move some API classes.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdEntry.java
      - copied, changed from r5579, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/resolver/PersistentIdEntry.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdStore.java
      - copied, changed from r5579, trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/resolver/StoredIDStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/JDBCPersistentIdStore.java
      - copied, changed from r5579, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStore.java
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParser.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/resolver/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/DatabaseBackedIDStoreTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/PersistentSAML2NameIDGeneratorTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java?rev=5592&r1=5591&r2=5592&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnectorTest.java Sun Mar 16 20:53:56 2014
@@ -29,10 +29,9 @@
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
-import net.shibboleth.idp.saml.attribute.resolver.PersistentIdEntry;
-import net.shibboleth.idp.saml.attribute.resolver.StoredIDException;
 import net.shibboleth.idp.saml.impl.TestSources;
 import net.shibboleth.idp.saml.impl.attribute.resolver.StoredIDDataConnector;
+import net.shibboleth.idp.saml.nameid.PersistentIdEntry;
 import net.shibboleth.idp.testing.DatabaseTestingSupport;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -177,11 +176,11 @@
      * deactivated. The resolve again and hey presto a new value.
      * 
      * @throws ComponentInitializationException if badness happens
-     * @throws StoredIDException if badness happens
+     * @throws IOException if badness happens
      * @throws ResolutionException if badness happens
      */
     @Test(dependsOnMethods = {"storeEntry"}) void retrieveEntry() throws ComponentInitializationException,
-            StoredIDException, ResolutionException {
+            IOException, ResolutionException {
         AttributeResolver resolver = constructResolver(1);
 
         ComputedIDDataConnectorTest.connectorFromResolver(resolver).initialize();
@@ -209,7 +208,7 @@
                 (StoredIDDataConnector) ComputedIDDataConnectorTest.connectorFromResolver(resolver);
         ComponentSupport.initialize(resolver);
         connector.initialize();
-        connector.getStoredIDStore().deactivatePersistentId(ComputedIDDataConnectorTest.RESULT, null);
+        connector.getStoredIDStore().deactivate(ComputedIDDataConnectorTest.RESULT, null);
 
         context =
                 TestSources.createResolutionContext(TestSources.PRINCIPAL_ID, TestSources.IDP_ENTITY_ID,
@@ -227,7 +226,7 @@
     }
 
     @Test(dependsOnMethods = {"retrieveEntry"}) void badEntry() throws ComponentInitializationException,
-            StoredIDException, ResolutionException {
+            IOException, ResolutionException {
         StoredIDDataConnector connector = new StoredIDDataConnector();
         connector.setDataSource(testSource);
 
@@ -236,7 +235,7 @@
         ComponentSupport.initialize(resolver);

[... 1579 lines stripped ...]