[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb  3 06:51:25 2014
New Revision: 5303

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5303&view=rev
Log:
IDP265 Start to add the Legacy PrincipalConnector Support in to the AttributeResolverImpl

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockSubjectNamePrincipalConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrescopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SimpleAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PrincipalConnectorDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PrincipalConnectorDefinition.java?rev=5303&r1=5302&r2=5303&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PrincipalConnectorDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PrincipalConnectorDefinition.java Mon Feb  3 06:51:25 2014
@@ -23,25 +23,26 @@
 import org.opensaml.messaging.context.BaseContext;
 
 /**
- * Definition of a Principal Connector. <br/> This is the component which takes a context and produces the unique
- * principal. Examples are
- * <ul>
- * <li><em>BaseSubjectNamePrincipalConnectors</em> which sit at the beginning of (for instance) the AA flow and collect
- * the principal from the incoming SAML message</li>
- * <li><em>Canonicalising</em>Connectors which sit immediately after authentication.</li>
- * </ul>
+ * Definition of the legacy Principal Connectors. <br/>
+ * This is the component which takes a context and produces the unique principal.
+ * 
+ * Code will only be implemented by the legacy parsing of the &lt;PrinicipalConnector&gt; statements and will consume
+ * CanonicalizationContexts.
  * 
  * @param <ConsumedContext> The type of context which is expected.
  */
 public interface PrincipalConnectorDefinition<ConsumedContext extends BaseContext> {
 
     /**
-     * Resolve the principal with respect to the provided context.
+     * Resolve the principal with respect to the provided context. This is expected to strip out the
+     * {@link org.opensaml.saml.saml2.core.NameID} or {@link org.opensaml.saml.saml1.core.NameIdentifier} and match it
+     * against the connector definitions configured.
      * 
      * @param context what to look at.
-     * @return the IdP principal, or null if this definition wasn't applicable
-     * @throws ResolutionException if we encountered a fatal processing error.
+     * @return the IdP principal, or null if no definitions were applicable
+     * @throws ResolutionException if we recognise the definition but could not decode it (data out of date and so
+     *             forth)
      */

[... 833 lines stripped ...]