[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/subject-config.xml idp-saml-api/src/main/...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb 25 23:31:55 2014
New Revision: 5481

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5481&view=rev
Log:
Doc and method cleanup during code review.

Modified:
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrincipalConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrinicpalConnectorCanonicalizer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientNameIdentifierDecoder.java

Modified: trunk/idp-conf/src/main/resources/conf/subject-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-config.xml?rev=5481&r1=5480&r2=5481&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Tue Feb 25 23:31:55 2014
@@ -116,5 +116,6 @@
             </property>
         </bean>
 
-    </util:list>   
+    </util:list>
+    
 </beans>

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java?rev=5481&r1=5480&r2=5481&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java Tue Feb 25 23:31:55 2014
@@ -21,25 +21,29 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.authn.SubjectCanonicalizationException;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 import org.opensaml.saml.saml2.core.NameID;
 
-/** Interface for converting back a {@link NameID} into a single Principal. */
+/** Interface for converting a {@link NameID} back into a principal name. */
 public interface NameIDDecoder {
 
     /**
      * Decode the provided {@link NameID}, testing or otherwise using either or both of the issuer and requester.
      * 
-     * @param nameID {@link org.opensaml.saml.saml2.core.NameID}
-     * @param responderId the entityID of the which issued (and is looking at and responding to) the value
-     * @param requesterId the entityID of the which is providing the and which asking for information based on it.
+     * <p>If relevant, the implementation is expected to test the {@link NameID#getNameQualifier()} and
+     * {@link NameID#getSPNameQualifier()} against the responder and requester, as well as any stored or
+     * decrypted values.</p>
+     * 
+     * @param nameID the object to decode
+     * @param responderId the entityID that issued (and is looking at and responding to) the value
+     * @param requesterId the entityID that provided the name and is asking for information based on it
+     * 
      * @return the principal decoded from the value
-     * @throws SubjectCanonicalizationException if match conditions failed.
-     * @throws NameDecoderException if an error occurred during translation. <br>
-     *             If relevant, the implementation is expected to test the {@link NameID#getNameQualifier()} against the
-     *             responder, and the {@link NameID#getSPNameQualifier()} as well as any stored or decrypted values.,
+     * @throws SubjectCanonicalizationException if match conditions failed
+     * @throws NameDecoderException if an error occurred during translation
      */

[... 1418 lines stripped ...]