Synch up NameID encoder and principal connector examples

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2458 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/resources/conf/attribute-resolver.xml b/resources/conf/attribute-resolver.xml
index 7407314..ef6e0df 100644 (file)
--- a/resources/conf/attribute-resolver.xml
+++ b/resources/conf/attribute-resolver.xml
@@ -20,6 +20,9 @@
     <!-- Release the Principal as an attribute and encode it as the SAML 1 and 2 name IDs -->
     <resolver:AttributeDefinition id="principalName" xsi:type="PrincipalName" xmlns="urn:mace:shibboleth:2.0:resolver:ad">
         <resolver:AttributeEncoder xsi:type="SAML1StringNameIdentifier" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
+                                   nameFormat="urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified" />
+                                   
+        <resolver:AttributeEncoder xsi:type="SAML1StringNameIdentifier" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
                                    nameFormat="urn:mace:shibboleth:1.0:nameIdentifier" />
 
         <resolver:AttributeEncoder xsi:type="SAML2StringNameID" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
@@ -141,6 +144,10 @@
                                  nameIDFormat="urn:oasis:names:tc:SAML:1.0:nameid-format:unspecified" />
                                  
     <resolver:PrincipalConnector xsi:type="Direct" xmlns="urn:mace:shibboleth:2.0:resolver:pc"
+                                 id="saml1UnspecDirect"
+                                 nameIDFormat="urn:mace:shibboleth:1.0:nameIdentifier" />
+                                 
+    <resolver:PrincipalConnector xsi:type="Direct" xmlns="urn:mace:shibboleth:2.0:resolver:pc"
                                  id="saml2UnspecDirect"
                                  nameIDFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified" />