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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Feb 12 10:11:26 2017
New Revision: 8617

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8617&view=rev
Log:
IDP-680 Deprecate Dependency

https://issues.shibboleth.net/jira/browse/IDP-680?

replace with <InputDataConnector> and <InoutAttributeDefinition>

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver2.xml

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=8617&r1=8616&r2=8617&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml	Sun Feb 12 10:11:26 2017
@@ -26,116 +26,117 @@
 
     <!-- Schema: Core schema attributes-->
 <!--
-    <AttributeDefinition xsi:type="Simple" id="uid" sourceAttributeID="uid">
-        <Dependency ref="myLDAP" />
+
+    <AttributeDefinition xsi:type="Simple" id="uid">
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:uid" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mail" sourceAttributeID="mail">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mail">
+        <InputDataConnector ref="myLDAP" attributeNames="mail"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePhone" sourceAttributeID="homePhone">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePhone">
+        <InputDataConnector ref="myLDAP" attributeNames="homePhone"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePhone" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.20" friendlyName="homePhone" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePostalAddress" sourceAttributeID="homePostalAddress">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePostalAddress">
+        <InputDataConnector ref="myLDAP" attributeNames="homePostalAddress"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePostalAddress" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.39" friendlyName="homePostalAddress" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mobileNumber" sourceAttributeID="mobile">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mobileNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="mobile"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mobile" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.41" friendlyName="mobile" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="pagerNumber" sourceAttributeID="pager">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="pagerNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="pager"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:pager" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.42" friendlyName="pager" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="surname" sourceAttributeID="sn">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="surname">
+        <InputDataConnector ref="myLDAP" attributeNames="sn"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:sn" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.4" friendlyName="sn" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="locality" sourceAttributeID="l">
-        <Dependency ref="myLDAP" />

[... 449 lines stripped ...]