Tidy the definition and use of the UK federation's registrar URI.

InCommon · Nov 23, 2015 · efd7f4d · efd7f4d
1 parent 92652ee
commit efd7f4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -501,6 +501,7 @@
     <bean id="pt_rctsaai_registrar"      parent="String" c:_0="https://www.fccn.pt"/>
     <bean id="se_swamid_registrar"       parent="String" c:_0="http://www.swamid.se/"/>
     <bean id="si_arnes_registrar"        parent="String" c:_0="http://aai.arnes.si"/>
+    <bean id="uk_ukf_registrar"          parent="String" c:_0="http://ukfederation.org.uk"/>
     <bean id="us_incommon_registrar"     parent="String" c:_0="https://incommon.org"/>
 
 
@@ -513,7 +514,7 @@
     <bean id="identificationStrategy" class="uk.org.ukfederation.mda.UKItemIdentificationStrategy">
         <property name="ignoredAuthorities">
             <set>
-                <value>http://ukfederation.org.uk</value>
+                <ref bean="uk_ukf_registrar"/>
             </set>
         </property>
         <property name="displayNames">
@@ -554,8 +555,8 @@
                 <entry key-ref="se_swamid_registrar"          value="SE"/>
                 <entry key-ref="ch_switchaai_registrar"       value="CH"/>
                 <entry key-ref="nl_surfconext_registrar"      value="NL"/>
+                <entry key-ref="uk_ukf_registrar"             value="UK"/>
                 <entry key-ref="us_incommon_registrar"        value="US"/>
-                <entry key="http://ukfederation.org.uk"       value="UK"/>
 
                 <!-- Joining eduGAIN -->
                 <entry key-ref="ar_mate_registrar"            value="AR"/>

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -31,13 +31,12 @@
         * as the Name attribute for the main EntitiesDescriptor in UK federation metadata
           (not always the document element)
           
-        * in mdrpi:RegistrationInfo, as the unique identifier for the UK federation registrar
-        
         * in mdrpi:PublicationInfo, as the unique identifier for the UK federation publisher
+        
+        It is the same as the URI used to indicate the UK federation as a registrar, so is made
+        an alias of that bean.
     -->
-    <bean id="uk_federation_uri" class="java.lang.String">
-        <constructor-arg value="http://ukfederation.org.uk"/>
-    </bean>
+    <alias name="uk_ukf_registrar" alias="uk_federation_uri"/>
 
 
     <!--
@@ -519,7 +518,7 @@
         p:id="uk_check_regauth">
         <property name="transformParameters">
             <map>
-                <entry key="expectedAuthority" value-ref="uk_federation_uri"/>
+                <entry key="expectedAuthority" value-ref="uk_ukf_registrar"/>
             </map>
         </property>
     </bean>
@@ -534,7 +533,7 @@
         p:id="uk_default_regauth">
         <property name="transformParameters">
             <map>
-                <entry key="defaultAuthority" value-ref="uk_federation_uri"/>
+                <entry key="defaultAuthority" value-ref="uk_ukf_registrar"/>
             </map>
         </property>
     </bean>

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
@@ -207,7 +207,7 @@
         p:id="removeUKEntities">
         <property name="designatedRegistrationAuthorities">
             <list>
-                <ref bean="uk_federation_uri"/>
+                <ref bean="uk_ukf_registrar"/>
             </list>
         </property>
         <property name="requiringRegistrationInformation" value="true"/>