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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Sep 23 05:50:43 2015
New Revision: 7774

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7774&view=rev
Log:
IDP-808 Collapse namespaces

https://issues.shibboleth.net/jira/browse/IDP-808

Change example to stop using the legacy namespaces.

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

Modified: trunk/idp-conf/src/main/resources/conf/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-filter.xml?rev=7774&r1=7773&r2=7774&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-filter.xml	Wed Sep 23 05:50:43 2015
@@ -8,42 +8,40 @@
     Deployers should refer to the documentation for a complete list of components
     and their options.
 -->
-<afp:AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
-        xmlns:afp="urn:mace:shibboleth:2.0:afp"
-        xmlns:basic="urn:mace:shibboleth:2.0:afp:mf:basic"
-        xmlns:saml="urn:mace:shibboleth:2.0:afp:mf:saml"
+<AttributeFilterPolicyGroup id="ShibbolethFilterPolicy"
+        xmlns="urn:mace:shibboleth:2.0:afp"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:mace:shibboleth:2.0:afp http://shibboleth.net/schema/idp/shibboleth-afp.xsd
                             urn:mace:shibboleth:2.0:afp:mf:basic http://shibboleth.net/schema/idp/shibboleth-afp-mf-basic.xsd
                             urn:mace:shibboleth:2.0:afp:mf:saml http://shibboleth.net/schema/idp/shibboleth-afp-mf-saml.xsd">
 
     <!-- Release some attributes to an SP. -->
-    <afp:AttributeFilterPolicy id="example1">
-        <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
+    <AttributeFilterPolicy id="example1">
+        <PolicyRequirementRule xsi:type="Requester" value="https://sp.example.org" />
 
-        <afp:AttributeRule attributeID="eduPersonPrincipalName">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="eduPersonPrincipalName">
+            <PermitValueRule xsi:type="ANY" />
+        </AttributeRule>
 
-        <afp:AttributeRule attributeID="uid">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
+        <AttributeRule attributeID="uid">
+            <PermitValueRule xsi:type="ANY" />
+        </AttributeRule>
 
-        <afp:AttributeRule attributeID="mail">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
-    </afp:AttributeFilterPolicy>
+        <AttributeRule attributeID="mail">
+            <PermitValueRule xsi:type="ANY" />
+        </AttributeRule>
+    </AttributeFilterPolicy>
 
     <!-- Release eduPersonAffiliation to two specific SPs. -->
-    <afp:AttributeFilterPolicy id="example2">
-        <afp:PolicyRequirementRule xsi:type="basic:OR">
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://sp.example.org" />
-            <basic:Rule xsi:type="basic:AttributeRequesterString" value="https://another.example.org/shibboleth" />
-        </afp:PolicyRequirementRule>
+    <AttributeFilterPolicy id="example2">
+        <PolicyRequirementRule xsi:type="OR">
+            <Rule xsi:type="Requester" value="https://sp.example.org" />
+            <Rule xsi:type="Requester" value="https://another.example.org/shibboleth" />
+        </PolicyRequirementRule>
 
-        <afp:AttributeRule attributeID="eduPersonScopedAffiliation">
-            <afp:PermitValueRule xsi:type="basic:ANY" />
-        </afp:AttributeRule>
-    </afp:AttributeFilterPolicy>
+        <AttributeRule attributeID="eduPersonScopedAffiliation">
+            <PermitValueRule xsi:type="ANY" />
+        </AttributeRule>
+    </AttributeFilterPolicy>
 
-</afp:AttributeFilterPolicyGroup>
+</AttributeFilterPolicyGroup>