Use $IDP_SCOPE$ to populate IdP scope in conf-tmpl\attribute-resolver.xml - SIDP-285

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2837 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index 8bea164..97e75d0 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -5,6 +5,7 @@ Changes in Release 2.1.3
 [SIDP-276] - Example RDB Connector, quote principal
 [SIDP-277] - Incorrect null check for request context in UsernamePasswordServlet
 [SIDP-280] - when an Idp has no outside (WAN) access Idp fails to collect or release attributes
+[SIDP-285] - Use $IDP_SCOPE$ to populate IdP scope in conf-tmpl\attribute-resolver.xml
 
 Changes in Release 2.1.2
 =============================================

diff --git a/src/installer/resources/conf-tmpl/attribute-resolver.xml b/src/installer/resources/conf-tmpl/attribute-resolver.xml
index 0fd125b..48b9209 100644 (file)
--- a/src/installer/resources/conf-tmpl/attribute-resolver.xml
+++ b/src/installer/resources/conf-tmpl/attribute-resolver.xml
@@ -387,7 +387,7 @@
     </resolver:AttributeDefinition>
 
     <resolver:AttributeDefinition id="eduPersonPrincipalName" xsi:type="Scoped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
-        scope="example.org" sourceAttributeID="uid">
+        scope="$IDP_SCOPE$" sourceAttributeID="uid">
         <resolver:Dependency ref="myLDAP" />
 
         <resolver:AttributeEncoder xsi:type="SAML1ScopedString" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
@@ -398,7 +398,7 @@
     </resolver:AttributeDefinition>
 
     <resolver:AttributeDefinition id="eduPersonScopedAffiliation" xsi:type="Scoped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
-        scope="example.org" sourceAttributeID="eduPersonAffiliation">
+        scope="$IDP_SCOPE$" sourceAttributeID="eduPersonAffiliation">
         <resolver:Dependency ref="myLDAP" />
 
         <resolver:AttributeEncoder xsi:type="SAML1ScopedString" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"
@@ -409,7 +409,7 @@
     </resolver:AttributeDefinition>
         
     <resolver:AttributeDefinition id="eduPersonTargetedID.old" xsi:type="Scoped" xmlns="urn:mace:shibboleth:2.0:resolver:ad"
-        scope="example.org" sourceAttributeID="computedID">
+        scope="$IDP_SCOPE$" sourceAttributeID="computedID">
         <resolver:Dependency ref="computedID" />
 
         <resolver:AttributeEncoder xsi:type="SAML1ScopedString" xmlns="urn:mace:shibboleth:2.0:attribute:encoder"