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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Mar  1 00:02:18 2014
New Revision: 5500

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5500&view=rev
Log:
- Rename attribute-based name generators
- Add missing interface to legacy generators
- Add initial generators to subject-config.xml

Added:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGenerator.java
      - copied, changed from r5494, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML2NameIDGenerator.java
      - copied, changed from r5494, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML1NameIdentifierGeneratorTest.java
      - copied, changed from r5499, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/AttributeSourcedSAML2NameIDGeneratorTest.java
      - copied, changed from r5499, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java
Modified:
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacySAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java

Modified: trunk/idp-conf/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/pom.xml?rev=5500&r1=5499&r2=5500&view=diff
==============================================================================
Binary files - no diff available.

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=5500&r1=5499&r2=5500&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Sat Mar  1 00:02:18 2014
@@ -15,8 +15,43 @@
     <!--
     This file provisions the IdP with information about the configured mechanisms used for managing
     subject identity information, including canonicalizing technology-specific subject names into principal
-    names, and turning principal names back into technology-specific forms like SAML NameIDs.
+    names, and turning principal names into technology-specific forms like SAML NameIDs.
     -->
+
+    <!-- ========================= SAML NameID Generation ========================= -->
+
+    <!--
+    These beans enable legacy support for NameID generation in the Attribute Resolver.
+    If you don't need that (or this is a new install) you can remove them.
+    -->
+    <bean id="shibboleth.LegacySAML1NameIdentifierGenerator"
+        class="net.shibboleth.idp.saml.impl.nameid.LegacySAML1NameIdentifierGenerator" />
+    <bean id="shibboleth.LegacySAML2NameIDGenerator"
+        class="net.shibboleth.idp.saml.impl.nameid.LegacySAML2NameIDGenerator" />
+    
+    <!-- SAML 2 NameID Generation -->
+    <util:list id="shibboleth.SAML2NameIDGenerators">
+    
+        <!-- TODO: add transient/persistent generators -->
+    
+        <bean id="email" class="net.shibboleth.idp.saml.impl.nameid.AttributeSourcedSAML2NameIDGenerator"
+                p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+                p:attributeSourceIds="#{ {'email'} }" />
+                
+    </util:list>
+
+    <!-- SAML 1 NameIdentifier Generation -->
+    <util:list id="shibboleth.SAML1NameIdentifierGenerators">
+    
+        <!-- TODO: add transient/persistent generators -->
+
+        <bean id="email" class="net.shibboleth.idp.saml.impl.nameid.AttributeSourcedSAML1NameIdentifierGenerator"
+                p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+                p:attributeSourceIds="#{ {'email'} }" />
+                
+    </util:list>
+    
+    <!-- ========================= Java Subject -> Principal Mapping ========================= -->
 

[... 297 lines stripped ...]