[java-identity-provider] branch master updated: Rename and adjust definition of naming registry for extension later.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8a6827645f28c56515f6cede398189ed04723402

The following commit(s) were added to refs/heads/master by this push:
       new  8a68276   Rename and adjust definition of naming registry for extension later.
8a68276 is described below

commit 8a6827645f28c56515f6cede398189ed04723402
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 11:47:06 2020 -0500

    Rename and adjust definition of naming registry for extension later.
---
 .../src/main/resources/conf/services.properties    |  1 +
 .../system/conf/attribute-registry-system.xml      | 29 +++++++++++++---------
 .../main/resources/system/conf/services-system.xml |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/services.properties b/idp-conf/src/main/resources/conf/services.properties
index ff310d7..9dc3dff 100644
--- a/idp-conf/src/main/resources/conf/services.properties
+++ b/idp-conf/src/main/resources/conf/services.properties
@@ -25,6 +25,7 @@ idp.service.relyingparty.ignoreUnmappedEntityAttributes=true
 #idp.service.metadata.enableByReferenceFilters = true
 
 #idp.service.attribute.registry.resources = shibboleth.AttributeRegistryResources
+#idp.service.attribute.registry.namingRegistry = shibboleth.DefaultNamingRegistry
 #idp.service.attribute.registry.failFast = false
 idp.service.attribute.registry.checkInterval = PT15M
 # Default control of whether to encode XML attribute data with xsi:type
diff --git a/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
index a3e3be2..2814477 100644
--- a/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
+++ b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
@@ -34,18 +34,23 @@
         class="net.shibboleth.idp.cas.attribute.transcoding.impl.CASStringAttributeTranscoder" />
     <bean id="CASScopedStringTranscoder"
         class="net.shibboleth.idp.cas.attribute.transcoding.impl.CASScopedStringAttributeTranscoder" />
-    
-    <util:map id="DefaultNamingRegistry">
-        <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
-            <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
-        </entry>
-        <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
-            <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
-        </entry>
-        <entry key="#{T(net.shibboleth.idp.cas.attribute.Attribute)}">
-            <bean class="net.shibboleth.idp.cas.attribute.AbstractCASAttributeTranscoder.NamingFunction" />
-        </entry>
-    </util:map>
+
+    <bean id="shibboleth.DefaultNamingRegistry"
+            class="org.springframework.beans.factory.config.MapFactoryBean">
+        <property name="sourceMap">
+            <map>
+                <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
+                    <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
+                </entry>
+                <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
+                    <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
+                </entry>
+                <entry key="#{T(net.shibboleth.idp.cas.attribute.Attribute)}">
+                    <bean class="net.shibboleth.idp.cas.attribute.AbstractCASAttributeTranscoder.NamingFunction" />
+                </entry>
+            </map>
+        </property>
+    </bean>
     
     <bean id="shibboleth.TranscodingRule"
         class="net.shibboleth.idp.attribute.transcoding.TranscodingRule" abstract="true" />
diff --git a/idp-conf/src/main/resources/system/conf/services-system.xml b/idp-conf/src/main/resources/system/conf/services-system.xml
index 4884bb1..feaf5f9 100644
--- a/idp-conf/src/main/resources/system/conf/services-system.xml
+++ b/idp-conf/src/main/resources/system/conf/services-system.xml
@@ -66,7 +66,7 @@
 	    <constructor-arg name="claz" value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
 	    <constructor-arg name="strategy">
 	       <bean class="net.shibboleth.idp.attribute.transcoding.impl.AttributeRegistryServiceStrategy"
-	           p:namingRegistry="#{'%{idp.service.attribute.registry.namingRegistry:DefaultNamingRegistry}'.trim()}" />
+	           p:namingRegistry="#{'%{idp.service.attribute.registry.namingRegistry:shibboleth.DefaultNamingRegistry}'.trim()}" />
 	    </constructor-arg>
     </bean>
     <util:list id ="shibboleth.DefaultAttributeRegistryResources">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.