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

[noreply at shibboleth.net]

Author: lajoie
Date: Fri Sep 16 12:58:07 2011
New Revision: 4063

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4063&view=rev
Log:
Remove "anonymous" relying party special case.  This will just be represented as a relying party configuration whose activation criterion is the lack of relying party metadata
Rename RelyingPartyConfigurationSubcontext to make it clear that more than just configuration data will be associated with it
Attach security configuration to profile configurations

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartySubcontext.java   (contents, props changed)
      - copied, changed from r4057, trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationSubcontext.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/SecurityConfiguration.java   (with props)
Removed:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationSubcontext.java
Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/ProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolverTest.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java?rev=4063&r1=4062&r2=4063&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java Fri Sep 16 12:58:07 2011
@@ -25,17 +25,20 @@
 public abstract class AbstractProfileConfiguration implements ProfileConfiguration {
 
     /** ID of the profile configured. */
-    private String id;
+    private final String id;
 
     /** Whether this profile is enabled. */
     private boolean enabled;
+
+    /** The security configuration for this profile. */
+    private SecurityConfiguration securityConfiguration;
 
     /**
      * Constructor.
      * 
      * @param profileId ID of the the communication profile, never null or empty
      */
-    public AbstractProfileConfiguration(String profileId) {
+    public AbstractProfileConfiguration(final String profileId) {
         String trimmedId = StringSupport.trimOrNull(profileId);
         Assert.isNotNull(trimmedId, "Profile identifier can not be null or empty");
         id = profileId;
@@ -63,6 +66,20 @@
     }
 
     /** {@inheritDoc} */
+    public SecurityConfiguration getSecurityConfiguration() {
+        return securityConfiguration;
+    }
+
+    /**
+     * Sets the security configuration for this profile.
+     * 
+     * @param configuration security configuration for this profile
+     */
+    public void setSecurityConfiguration(SecurityConfiguration configuration) {
+        securityConfiguration = configuration;
+    }
+
+    /** {@inheritDoc} */
     public int hashCode() {
         return id.hashCode();
     }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/ProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/ProfileConfiguration.java?rev=4063&r1=4062&r2=4063&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/ProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/ProfileConfiguration.java Fri Sep 16 12:58:07 2011
@@ -19,7 +19,6 @@
 
 
 /** Represents the configuration of a particular Identity Provider communication profile. */
-//TODO probably need to allow for a profile-specific org.opensaml.xml.security.SecurityConfiguration here
 public interface ProfileConfiguration {
 
     /**
@@ -35,4 +34,11 @@
      * @return whether the this profile is enabled for use
      */
     public boolean isEnabled();
+    
+    /**
+     * Gets the security configuration to use with this profile.
+     * 
+     * @return security configuration to use with this profile, never null
+     */
+    public SecurityConfiguration getSecurityConfiguration();
 }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java

[... 240 lines stripped ...]