[java-identity-provider] branch main updated: Make two other registry wiring changes.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 21 19:06:08 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0736d0eaff778a1e7bbfd48af3bb947f0af899d7
The following commit(s) were added to refs/heads/main by this push:
new 0736d0eaf Make two other registry wiring changes.
0736d0eaf is described below
commit 0736d0eaff778a1e7bbfd48af3bb947f0af899d7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 21 15:06:05 2020 -0400
Make two other registry wiring changes.
---
.../idp/attribute/resolver/filter/service.xml | 30 ++++++++++++++--------
.../idp/attribute/resolver/spring/mapperTest.xml | 27 +++++++++++--------
2 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
index 4e83d4051..e53717819 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/filter/service.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
+ <context:annotation-config />
+
<bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
depends-on="shibboleth.VelocityEngine" p:failFast="true"
p:reloadCheckDelay="0">
@@ -14,8 +20,7 @@
value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.attribute.transcoding.impl.AttributeRegistryServiceStrategy"
- p:id="shibboleth.AttributeRegistryService"
- p:namingRegistry="DefaultNamingRegistry" />
+ p:id="shibboleth.AttributeRegistryService" />
</constructor-arg>
<property name="serviceConfigurations">
<util:list>
@@ -24,14 +29,19 @@
</property>
</bean>
- <util:map id="DefaultNamingRegistry">
- <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
+ <bean class="net.shibboleth.idp.attribute.transcoding.BasicNamingFunction"
+ c:claz="org.opensaml.saml.saml2.core.Attribute">
+ <constructor-arg name="function">
<bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
- </entry>
- <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
+ </constructor-arg>
+ </bean>
+
+ <bean class="net.shibboleth.idp.attribute.transcoding.BasicNamingFunction"
+ c:claz="org.opensaml.saml.saml1.core.AttributeDesignator">
+ <constructor-arg name="function">
<bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
- </entry>
- </util:map>
+ </constructor-arg>
+ </bean>
<bean id="shibboleth.VelocityEngine"
class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
index 4e61be066..d24021489 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize"
default-destroy-method="destroy">
+ <context:annotation-config />
+
<import resource="customBean.xml" />
<bean id="shibboleth.VelocityEngine" class="net.shibboleth.ext.spring.velocity.VelocityEngineFactoryBean">
@@ -29,12 +33,10 @@
depends-on="shibboleth.VelocityEngine" p:failFast="true"
p:reloadCheckDelay="0">
- <constructor-arg name="claz"
- value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
+ <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:id="shibboleth.AttributeRegistryService"
- p:namingRegistry="DefaultNamingRegistry" />
+ p:id="shibboleth.AttributeRegistryService" />
</constructor-arg>
<property name="serviceConfigurations">
<util:list>
@@ -43,13 +45,18 @@
</property>
</bean>
- <util:map id="DefaultNamingRegistry">
- <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
+ <bean class="net.shibboleth.idp.attribute.transcoding.BasicNamingFunction"
+ c:claz="org.opensaml.saml.saml2.core.Attribute">
+ <constructor-arg name="function">
<bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
- </entry>
- <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
+ </constructor-arg>
+ </bean>
+
+ <bean class="net.shibboleth.idp.attribute.transcoding.BasicNamingFunction"
+ c:claz="org.opensaml.saml.saml1.core.AttributeDesignator">
+ <constructor-arg name="function">
<bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
- </entry>
- </util:map>
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list