[java-identity-provider COMMIT] in /trunk/idp-conf/src/test/resources/mapping/configs: attribute-filter.xml attribute...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 31 15:23:56 2014
New Revision: 6815

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6815&view=rev
Log:
IDP-502 -  Align AttributeInMetadata filter to V2

Modified:
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml

Modified: trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml?rev=6815&r1=6814&r2=6815&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml (original)
+++ trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml Fri Oct 31 15:23:56 2014
@@ -13,7 +13,7 @@
 			xsi:type="basic:ANY" />
 
 		<afp:AttributeRule attributeID="IdPRA1" id="ra1release">
-			<afp:PermitValueRule xsi:type="saml:RequestedAttributeInMetadata" />
+			<afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
 		</afp:AttributeRule>
 
 	</afp:AttributeFilterPolicy>
@@ -25,7 +25,7 @@
             xsi:type="basic:ANY" />
 
         <afp:AttributeRule attributeID="IdPEA1" id="ra2release">
-            <afp:PermitValueRule xsi:type="saml:AttributeInMetadata" />
+            <afp:PermitValueRule xsi:type="saml:MappedAttributeInMetadata" />
         </afp:AttributeRule>
 
     </afp:AttributeFilterPolicy>
@@ -33,7 +33,9 @@
 
     <!--  Release is EA map -->
 	<afp:AttributeFilterPolicy id="EAOKFILTER">
-		<afp:PolicyRequirementRule xsi:type="saml:EntityAttributeInMetadata" attributeID="IdPEA1" id="prrEA1"/>
+		<afp:PolicyRequirementRule id="prrEA1" xsi:type="saml:EntityAttributeExactMatch"
+            attributeName="http://macedir.org/entity-category"
+            attributeValue="http://refeds.org/category/research-and-scholarship" />
 
 		<afp:AttributeRule attributeID="IdPOK">
 			<afp:PermitValueRule xsi:type="basic:ANY"/>
@@ -42,7 +44,9 @@
 	</afp:AttributeFilterPolicy> 
 
     <afp:AttributeFilterPolicy id="EANOTKFILTER">
-        <afp:PolicyRequirementRule xsi:type="saml:EntityAttributeInMetadata" attributeID="IdPEA2" id="prrEA2"/>
+        <afp:PolicyRequirementRule id="prrEA2" xsi:type="saml:EntityAttributeExactMatch"
+            attributeName="http://macedir.org/entity-category"
+            attributeValue="http://example.org/category" />
 
         <afp:AttributeRule attributeID="IdPNotOK">
             <afp:PermitValueRule xsi:type="basic:ANY"/>

Modified: trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml?rev=6815&r1=6814&r2=6815&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml (original)
+++ trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml Fri Oct 31 15:23:56 2014
@@ -8,7 +8,9 @@
                                                     urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
 
  <afp:AttributeFilterPolicy id="EANOTKFILTER">
-        <afp:PolicyRequirementRule xsi:type="saml:EntityAttributeInMetadata" attributeID="IdPEA2" id="prrEA2"/>
+        <afp:PolicyRequirementRule id="prrEA2" xsi:type="saml:EntityAttributeExactMatch"
+            attributeName="http://macedir.org/entity-category"
+            attributeValue="http://example.org/category" />
 
         <afp:AttributeRule attributeID="IdPNotOK">
             <afp:PermitValueRule xsi:type="basic:ANY"/>

Modified: trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml?rev=6815&r1=6814&r2=6815&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml Fri Oct 31 15:23:56 2014
@@ -32,12 +32,6 @@
         <dc:Attribute id="ra_1">
             <dc:Value>RA1</dc:Value>
         </dc:Attribute>
-        <dc:Attribute id="ea_1">
-            <dc:Value>http://refeds.org/category/research-and-scholarship</dc:Value>
-        </dc:Attribute>
-        <dc:Attribute id="ea_2">
-            <dc:Value>http://example.org/category/category</dc:Value>
-        </dc:Attribute>
         <dc:Attribute id="OK">
             <dc:Value>OK</dc:Value>
         </dc:Attribute>
@@ -47,20 +41,6 @@
     <resolver:AttributeDefinition xsi:type="ad:Simple" id="IdPRA1" sourceAttributeID="ra_1">
         <resolver:Dependency ref="staticAttributes" />

[... 19 lines stripped ...]