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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Feb 10 23:57:14 2014
New Revision: 5363

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5363&view=rev
Log:
Set the ID of profile actions via a bean post processor.
No longer set the ID to the profile action's class name by default.

Modified:
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/InitializeProfileRequestContextTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/RecordResponseCompleteTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/SignAssertionsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAuthnStatementToAssertionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddStatusToResponseTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/DecryptNameIDsTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/ProcessRequestedAuthnContextTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/SignAssertionsTest.java

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java?rev=5363&r1=5362&r2=5363&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java Mon Feb 10 23:57:14 2014
@@ -35,7 +35,6 @@
 
     @Test public void testActionId() {
         MockProfileAction action = new MockProfileAction();
-        Assert.assertEquals(action.getId(), MockProfileAction.class.getName());
 
         action.setId(" mock");
         Assert.assertEquals(action.getId(), "mock");
@@ -141,18 +140,21 @@
             thrownException = null;
             newEvent = null;
             prevEvent = null;
+            setId("test");
         }
         
         public MockProfileAction(ProfileException exception) {
             thrownException = exception;
             newEvent = null;
             prevEvent = null;
+            setId("test");
         }
 
         public MockProfileAction(String newEvent, String prevEvent) {
             this.newEvent = newEvent;
             this.prevEvent = prevEvent;
             thrownException = null;
+            setId("test");
         }
         
         public boolean isExecuted() {

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java?rev=5363&r1=5362&r2=5363&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ProfileActionBeanPostProcessor.java Mon Feb 10 23:57:14 2014
@@ -19,18 +19,26 @@
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.action.ProfileAction;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.webflow.execution.Action;
 
 /**
+ * Pre-processes {@link AbstractProfileAction} beans by setting their ID to their bean name.
+ * <p>

[... 265 lines stripped ...]