[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/installer/resources/conf-tmpl/attribute-filter....

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Oct  9 15:45:28 2011
New Revision: 3070

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3070&view=rev
Log:
Remove use of EntitiesDescriptor names from example config files - SIDP-522
Fix up XML formatting that was undone when doing SVN mime-type and line ending conversion

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/installer/resources/conf-tmpl/attribute-filter.xml
    branches/REL_2/src/installer/resources/conf-tmpl/attribute-resolver.xml
    branches/REL_2/src/installer/resources/conf-tmpl/handler.xml
    branches/REL_2/src/installer/resources/conf-tmpl/internal.xml
    branches/REL_2/src/installer/resources/conf-tmpl/relying-party.xml
    branches/REL_2/src/installer/resources/conf-tmpl/service.xml

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3070&r1=3069&r2=3070&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Sun Oct  9 15:45:28 2011
@@ -1,8 +1,9 @@
 Changes in Release 2.3.4
 =============================================
-[SIDP-516] Example login.jsp / Usage of label tag
-[SIDP-513] idpui taglib could look for more languages matches
-[SIDP-514] Alt text for IdP Logos is not esapiEncoder.encodeForHTMLAttribute
+[SIDP-516] - Example login.jsp / Usage of label tag
+[SIDP-513] - idpui taglib could look for more languages matches
+[SIDP-514] - Alt text for IdP Logos is not esapiEncoder.encodeForHTMLAttribute
+[SIDP-522] - supplied examples shouldn't promote federation URIs as relying parties
 
 Changes in Release 2.3.3
 =============================================

Modified: branches/REL_2/src/installer/resources/conf-tmpl/attribute-filter.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/installer/resources/conf-tmpl/attribute-filter.xml?rev=3070&r1=3069&r2=3070&view=diff
==============================================================================
--- branches/REL_2/src/installer/resources/conf-tmpl/attribute-filter.xml (original)
+++ branches/REL_2/src/installer/resources/conf-tmpl/attribute-filter.xml Sun Oct  9 15:45:28 2011
@@ -6,7 +6,12 @@
     Deployers should refer to the Shibboleth 2 documentation for a complete list of components 
     and their options.
 -->
-<afp:AttributeFilterPolicyGroup 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="ShibbolethFilterPolicy" xsi:schemaLocation="urn:mace:shibboleth:2.0:afp classpath:/schema/shibboleth-2.0-afp.xsd                                                 urn:mace:shibboleth:2.0:afp:mf:basic classpath:/schema/shibboleth-2.0-afp-mf-basic.xsd                                                 urn:mace:shibboleth:2.0:afp:mf:saml classpath:/schema/shibboleth-2.0-afp-mf-saml.xsd">
+<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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+                                xsi:schemaLocation="urn:mace:shibboleth:2.0:afp classpath:/schema/shibboleth-2.0-afp.xsd
+                                                    urn:mace:shibboleth:2.0:afp:mf:basic classpath:/schema/shibboleth-2.0-afp-mf-basic.xsd
+                                                    urn:mace:shibboleth:2.0:afp:mf:saml classpath:/schema/shibboleth-2.0-afp-mf-saml.xsd">
 
     <!--  Release the transient ID to anyone -->
     <afp:AttributeFilterPolicy id="releaseTransientIdToAnyone">
@@ -21,14 +26,14 @@
 
     <!-- 
         Release eduPersonEntitlement and the permissible values of eduPersonAffiliation
-        to any SP that is a member of InCommon, UK federation, or SWITCHaai
+        to three specific SPs
     -->
     <!--
     <afp:AttributeFilterPolicy>
         <afp:PolicyRequirementRule xsi:type="basic:OR">
-            <basic:Rule xsi:type="saml:AttributeRequesterInEntityGroup" groupID="urn:mace:incommon" />
-            <basic:Rule xsi:type="saml:AttributeRequesterInEntityGroup" groupID="http://ukfederation.org.uk" />
-            <basic:Rule xsi:type="saml:AttributeRequesterInEntityGroup" groupID="urn:mace:switch.ch:SWITCHaai" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:Portal" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:SIS" />
+            <basic:Rule xsi:type="basic:AttributeRequesterString" value="urn:example.org:sp:LMS" />
         </afp:PolicyRequirementRule>
 
         <afp:AttributeRule attributeID="eduPersonAffiliation">

Modified: branches/REL_2/src/installer/resources/conf-tmpl/attribute-resolver.xml

[... 253 lines stripped ...]