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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 18 19:30:11 2014
New Revision: 5209

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5209&view=rev
Log:
Revamp of subject c14n management and config.

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/SubjectCanonicalizationFlowDescriptor.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContext.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlow.java   (with props)
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java   (with props)
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectSubjectCanonicalizationFlowTest.java   (with props)
    trunk/idp-conf/src/main/resources/conf/subject-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/
    trunk/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-beans.xml
      - copied, changed from r5207, trunk/idp-conf/src/main/resources/system/flows/authn/simple-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-flow.xml
      - copied, changed from r5207, trunk/idp-conf/src/main/resources/system/flows/authn/simple-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-flow.xml   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthnEventIds.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/SubjectCanonicalizationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SimpleSubjectCanonicalization.java
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-subflow-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/simple-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/simple-subject-c14n-flow.xml

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java?rev=5209&r1=5208&r2=5209&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java Sat Jan 18 19:30:11 2014
@@ -39,7 +39,6 @@
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,7 +54,7 @@
  * Authentication action implementations should override
  * {@link #doExecute(ProfileRequestContext, SubjectCanonicalizationContext)}
  * 
- * @event {@link EventIds#INVALID_PROFILE_CTX}
+ * @event {@link AuthnEventIds#INVALID_SUBJECT_C14N_CTX}
  */
 public abstract class AbstractSubjectCanonicalizationAction extends AbstractProfileAction {
 
@@ -68,7 +67,7 @@
      */
     @Nonnull private Function<ProfileRequestContext, SubjectCanonicalizationContext> scCtxLookupStrategy;
     
-    /** SubjectCanonicalizationContext to operate on. */
+    /** {@link SubjectCanonicalizationContext} to operate on. */
     @Nullable private SubjectCanonicalizationContext scContext;
     
     /** Match patterns and replacement strings to apply. */
@@ -85,9 +84,7 @@
     
     /** Constructor. */
     public AbstractSubjectCanonicalizationAction() {
-        super();
-        

[... 740 lines stripped ...]