[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul  8 11:44:31 2014
New Revision: 6243

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6243&view=rev
Log:
Bit of cleanup.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml?rev=6243&r1=6242&r2=6243&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Tue Jul  8 11:44:31 2014
@@ -27,19 +27,19 @@
     <!--      Attribute Definitions                 -->
     <!-- ========================================== -->
 
-    <resolver:AttributeDefinition id="eduPersonAffiliation" sourceAttributeID="staticEpA" xsi:type="Simple" xmlns="urn:mace:shibboleth:2.0:resolver:ad">
+    <resolver:AttributeDefinition id="eduPersonAffiliation" xsi:type="ad:Simple" sourceAttributeID="staticEpA">
         <resolver:Dependency ref="staticAttributes" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" />
     </resolver:AttributeDefinition>
 
     <!-- Static examples -->
-    <resolver:AttributeDefinition xsi:type="ad:PrincipalName" id="uid">
+    <resolver:AttributeDefinition id="uid" xsi:type="ad:PrincipalName">
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
     </resolver:AttributeDefinition>
 
-    <resolver:AttributeDefinition xsi:type="ad:Template" id="email" sourceAttributeID="mail">
+    <resolver:AttributeDefinition id="email" xsi:type="ad:Template" sourceAttributeID="mail">
         <resolver:Dependency ref="uid" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
@@ -53,13 +53,13 @@
     
     <!-- LDAP-dependent examples -->
     <!--
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="uid">
+    <resolver:AttributeDefinition id="uid" xsi:type="ad:Simple" sourceAttributeID="uid">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" />
     </resolver:AttributeDefinition>
 
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="email" sourceAttributeID="mail">
+    <resolver:AttributeDefinition id="email" xsi:type="ad:Simple" sourceAttributeID="mail">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />