[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/pom.xml idp-attribute-resolver-impl/src/main/j...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun 13 12:30:29 2013
New Revision: 4533

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4533&view=rev
Log:
Move storage classes into their own modules.

Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore2.xml

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4533&r1=4532&r2=4533&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Thu Jun 13 12:30:29 2013
@@ -78,6 +78,13 @@
         </dependency>
 
         <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-impl</artifactId>
+            <version>${opensaml.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java?rev=4533&r1=4532&r2=4533&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java Thu Jun 13 12:30:29 2013
@@ -40,7 +40,7 @@
 import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
 import net.shibboleth.utilities.java.support.security.RandomIdentifierGenerationStrategy;
 
-import org.opensaml.util.storage.StorageService;
+import org.opensaml.storage.StorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java?rev=4533&r1=4532&r2=4533&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java Thu Jun 13 12:30:29 2013
@@ -29,9 +29,9 @@
 import net.shibboleth.idp.attribute.resolver.impl.TestSources;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
-import org.opensaml.util.storage.StorageRecord;
-import org.opensaml.util.storage.StorageService;
-import org.opensaml.util.storage.impl.MemoryStorageService;
+import org.opensaml.storage.StorageRecord;
+import org.opensaml.storage.StorageService;
+import org.opensaml.storage.impl.MemoryStorageService;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

Modified: trunk/idp-attribute-resolver-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/pom.xml?rev=4533&r1=4532&r2=4533&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml (original)
+++ trunk/idp-attribute-resolver-spring/pom.xml Thu Jun 13 12:30:29 2013
@@ -87,6 +87,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-impl</artifactId>
+            <version>${opensaml.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Managed Dependencies -->
     </dependencies>
 

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/idStore.xml

[... 25 lines stripped ...]