[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java idp...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Jul 19 08:09:41 2012
New Revision: 4209

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4209&view=rev
Log:
add stage to selects active profile configuration
harmonize stage names

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java
      - copied, changed from r4207, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/SelectProfileConfiguration.java   (with props)
Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java?rev=4209&r1=4208&r2=4209&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/EventIds.java Thu Jul 19 08:09:41 2012
@@ -44,6 +44,9 @@
      */
     public static final String NO_RELYING_PARTY_CONFIG = "NoRelyingPartyConfiguration";
 
+    /** ID of the even when no profile configuration is associated with the request. */
+    public static final String NO_PROFILE_CONFIG = "NoProfileConfiguration";
+
     /**
      * ID of the event returned if no {@link net.shibboleth.idp.attribute.AttributeContext} is associated with the
      * {@link net.shibboleth.idp.relyingparty.RelyingPartyContext}.

Copied: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java (from r4207, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java?p2=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java&p1=trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java&r1=4207&r2=4209&rev=4209&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/AddRelyingPartyConfigurationToProfileRequestContext.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java Thu Jul 19 08:09:41 2012
@@ -52,10 +52,10 @@
         @Event(id = EventIds.NO_RELYING_PARTY_CTX, description = "No relying party context return by lookup strategy"),
         @Event(id = EventIds.NO_RELYING_PARTY_CONFIG,
                 description = "No relying party configuation can be associated with the profile request")})
-public final class AddRelyingPartyConfigurationToProfileRequestContext extends AbstractProfileAction {
+public final class SelectRelyingPartyConfiguration extends AbstractProfileAction {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AddRelyingPartyConfigurationToProfileRequestContext.class);
+    private final Logger log = LoggerFactory.getLogger(SelectRelyingPartyConfiguration.class);
 
     /** Resolver used to look up relying party configurations. */
     private final Resolver<RelyingPartyConfiguration, ProfileRequestContext> rpConfigResolver;
@@ -70,7 +70,7 @@
      * 
      * @param resolver resolver used to look up relying party configurations
      */
-    public AddRelyingPartyConfigurationToProfileRequestContext(
+    public SelectRelyingPartyConfiguration(
             @Nonnull final Resolver<RelyingPartyConfiguration, ProfileRequestContext> resolver) {
         super();