[java-identity-provider] branch master updated: Move naming registry into root context for use by extension jars.

[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=f3069b7431be2a03a43b516e3e301f9bdac5e9f8

The following commit(s) were added to refs/heads/master by this push:
       new  f3069b7   Move naming registry into root context for use by extension jars.
f3069b7 is described below

commit f3069b7431be2a03a43b516e3e301f9bdac5e9f8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 12:36:52 2020 -0500

    Move naming registry into root context for use by extension jars.
---
 .../system/conf/attribute-registry-system.xml         | 17 -----------------
 .../src/main/resources/system/conf/global-system.xml  | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

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 2814477..4471dd5 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,23 +34,6 @@
         class="net.shibboleth.idp.cas.attribute.transcoding.impl.CASStringAttributeTranscoder" />
     <bean id="CASScopedStringTranscoder"
         class="net.shibboleth.idp.cas.attribute.transcoding.impl.CASScopedStringAttributeTranscoder" />
-
-    <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/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 818f2ab..9e9a557 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -438,7 +438,24 @@
         p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
         p:fieldReplacements="#{getObject('shibboleth.AuditFieldReplacementMap')}" />
 
-
+    <!-- Default attribute mapping support for new registry service, exposed here for extension use. -->
+            
+    <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>
 
     <!-- Beans for user-visible metadata configuration usage -->
 

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