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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan  7 10:29:49 2013
New Revision: 4258

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4258&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-18

Implement (and test) Transient Attribute Definition.

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdEntry.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinitionTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/IdPEntityIdStrategy.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RpEntityIdStrategy.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/persistence/PersistenceManager.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/IdPEntityIdStrategy.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/IdPEntityIdStrategy.java?rev=4258&r1=4257&r2=4258&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/IdPEntityIdStrategy.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/IdPEntityIdStrategy.java Mon Jan  7 10:29:49 2013
@@ -21,22 +21,14 @@
 
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 
-import org.opensaml.messaging.context.BasicMessageMetadataContext;
-
 import com.google.common.base.Function;
 
 class IdPEntityIdStrategy implements Function<AttributeResolutionContext, String> {
 
-    private BasicMessageMetadataContext context;
     static final String IDP_ENTITY_ID = "https://idp.example.org/idp";
-    
-    public IdPEntityIdStrategy() {
-        context = new BasicMessageMetadataContext();
-        context.setMessageId(IdPEntityIdStrategy.IDP_ENTITY_ID);
-    }
     
     /** {@inheritDoc} */
     @Nullable public String  apply(@Nullable AttributeResolutionContext arg0) {
-        return IdPEntityIdStrategy.IDP_ENTITY_ID;
+        return IDP_ENTITY_ID;
     }
 }

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RpEntityIdStrategy.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/RpEntityIdStrategy.java?rev=4258&r1=4257&r2=4258&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RpEntityIdStrategy.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RpEntityIdStrategy.java Mon Jan  7 10:29:49 2013
@@ -29,6 +29,6 @@
 
     /** {@inheritDoc} */
     @Nullable public String apply(@Nullable AttributeResolutionContext arg0) {
-        return RpEntityIdStrategy.SP_ENTITY_ID;
+        return SP_ENTITY_ID;
     }
 }

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/persistence/PersistenceManager.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/persistence/PersistenceManager.java?rev=4258&r1=4257&r2=4258&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/persistence/PersistenceManager.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/persistence/PersistenceManager.java Mon Jan  7 10:29:49 2013
@@ -67,11 +67,13 @@
      * implementation of this interface may return a different object or update the provided object in some way during
      * this method call.
      * 
+     * @param id the ID of the item to be persisted
+     *
      * @param item item to be persisted, maybe null
      * 
      * @return the persisted item or null if the given item was null
      */
-    public ItemType persist(ItemType item);
+    public ItemType persist(String id, ItemType item);
 
     /**
      * Removes an item with the given ID from the persistence store.