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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan 16 04:59:18 2014
New Revision: 5204

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5204&view=rev
Log:
IDP-359 Move TransientAttribute parameterization to saml-impl for better sharing between attribute encoders and NameID->Principal decoding

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/TransientIdParameters.java
      - copied, changed from r5199, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdParameters.java
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/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdParameters.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/package-info.java

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=5204&r1=5203&r2=5204&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Thu Jan 16 04:59:18 2014
@@ -25,6 +25,11 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-resolver-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         

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=5204&r1=5203&r2=5204&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 Jan 16 04:59:18 2014
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
+import net.shibboleth.idp.saml.nameid.TransientIdParameters;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -48,9 +49,6 @@
  */
 public class TransientIdAttributeDefinition extends AbstractAttributeDefinition {
 
-    /** Context label for storage of IDs. */
-    @Nonnull @NotEmpty public static final String CONTEXT = "TransientId";
-
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(TransientIdAttributeDefinition.class);
 
@@ -216,7 +214,7 @@
         int collisions = 0;
         while (collisions < 5) {
             try {
-                if (idStore.create(CONTEXT, id, principalTokenId, expiration)) {
+                if (idStore.create(TransientIdParameters.CONTEXT, id, principalTokenId, expiration)) {
                     // TODO: think we want this to be a NameID-valued attribute now. Or maybe we're keeping this,
                     // but adding a parallel version. I'm thinking maybe we could handle compatibility with the old
                     // String-based encoders by special-casing them to handle NameID-valued attributes?

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=5204&r1=5203&r2=5204&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 Jan 16 04:59:18 2014
@@ -21,12 +21,12 @@
 import java.util.Collections;
 import java.util.Set;
 
-

[... 59 lines stripped ...]