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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 18 11:03:16 2014
New Revision: 5599

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5599&view=rev
Log:
IDP-277 "Enabled" makes no sense for a profile configuration any more.  Remove it.  If we need it we can always add it back in again.

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java?rev=5599&r1=5598&r2=5599&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java Tue Mar 18 11:03:16 2014
@@ -20,11 +20,11 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opensaml.messaging.handler.MessageHandler;
-
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
+import org.opensaml.messaging.handler.MessageHandler;
 
 import com.google.common.base.Objects;
 
@@ -33,9 +33,6 @@
 
     /** ID of the profile configured. */
     @Nonnull @NotEmpty private final String id;
-
-    /** Whether this profile is enabled. */
-    private boolean enabled;
 
     /** Inbound message handler. */
     @Nullable private MessageHandler inboundHandler;
@@ -53,28 +50,12 @@
      */
     public AbstractProfileConfiguration(@Nonnull @NotEmpty final String profileId) {
         id = Constraint.isNotNull(StringSupport.trimOrNull(profileId), "Profile identifier cannot be null or empty");
-        enabled = true;
     }
 
     /** {@inheritDoc} */
     @Override
     @Nonnull @NotEmpty public String getId() {
         return id;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    /**
-     * Sets whether this profile is enabled.
-     * 
-     * @param isEnabled whether this profile is enabled
-     */
-    public void setEnabled(final boolean isEnabled) {
-        enabled = isEnabled;
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java?rev=5599&r1=5598&r2=5599&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/ProfileConfiguration.java Tue Mar 18 11:03:16 2014
@@ -19,19 +19,12 @@
 
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
+
 import org.opensaml.messaging.handler.MessageHandler;
-
-import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
 
 /** Represents the configuration of a particular communication profile. */
 public interface ProfileConfiguration extends IdentifiedComponent {
-    
-    /**
-     * Get whether this profile is enabled for use.
-     * 
-     * @return whether this profile is enabled for use
-     */
-    boolean isEnabled();
     
     /**
      * Get the inbound message handler to execute at the beginning of profile processing.

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java?rev=5599&r1=5598&r2=5599&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java Tue Mar 18 11:03:16 2014
@@ -22,17 +22,15 @@
 
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.IdPEventIds;
-
-import org.opensaml.profile.ProfileException;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;

[... 22 lines stripped ...]