[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/pom.xml idp-attribute-resolver-impl/pom.xml id...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Feb  2 11:01:57 2014
New Revision: 5299

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5299&view=rev
Log:
IDP-363 Juggle more dependencies around

PrincipalConnectors are still TBD

Added:
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks
      - copied unchanged from r5295, trunk/idp-saml-impl/src/test/resources/SealerKeyStore.jks
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
      - copied unchanged from r5295, trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIdStore.sql
Modified:
    trunk/idp-attribute-filter-spring/pom.xml
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/test/resources/data/SealerKeyStore.jks
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-saml-impl/pom.xml
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.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/CryptoTransientDecoderTest.java
    trunk/idp-saml-impl/src/test/resources/SealerKeyStore.jks

Modified: trunk/idp-attribute-filter-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/pom.xml?rev=5299&r1=5298&r2=5299&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/pom.xml (original)
+++ trunk/idp-attribute-filter-spring/pom.xml Sun Feb  2 11:01:57 2014
@@ -102,6 +102,13 @@
             <version>${opensaml.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-impl</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

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=5299&r1=5298&r2=5299&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Sun Feb  2 11:01:57 2014
@@ -54,12 +54,6 @@
 		<!-- Provided Dependencies -->
 
 		<!-- Runtime Dependencies -->
-		<dependency>
-			<groupId>org.glassfish</groupId>
-			<artifactId>javax.json</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
 		<!-- Test Dependencies -->
 
         <dependency>

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=5299&r1=5298&r2=5299&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml (original)
+++ trunk/idp-attribute-resolver-spring/pom.xml Sun Feb  2 11:01:57 2014
@@ -86,6 +86,20 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-impl</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-mapper-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: trunk/idp-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/pom.xml?rev=5299&r1=5298&r2=5299&view=diff
==============================================================================
--- trunk/idp-saml-impl/pom.xml (original)
+++ trunk/idp-saml-impl/pom.xml Sun Feb  2 11:01:57 2014
@@ -100,6 +100,11 @@
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java

[... 44 lines stripped ...]