[java-identity-provider] branch master updated: Convert default syntax from Map to Properties.
Scott Cantor
cantor.2 at osu.edu
Wed Jul 10 10:41:45 EDT 2019
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=a4ff8d861485f38d273536e0bf90778fe38aa55e
The following commit(s) were added to refs/heads/master by this push:
new a4ff8d8 Convert default syntax from Map to Properties.
a4ff8d8 is described below
commit a4ff8d861485f38d273536e0bf90778fe38aa55e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 10 10:41:34 2019 -0400
Convert default syntax from Map to Properties.
---
.../main/resources/attributes/default-rules.xml | 88 +++++++++++-----------
.../system/conf/attribute-registry-system.xml | 12 +--
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/idp-conf/src/main/resources/attributes/default-rules.xml b/idp-conf/src/main/resources/attributes/default-rules.xml
index 1a2e9c3..79c0e15 100644
--- a/idp-conf/src/main/resources/attributes/default-rules.xml
+++ b/idp-conf/src/main/resources/attributes/default-rules.xml
@@ -19,62 +19,62 @@
<list>
<bean parent="shibboleth.TranscodingProperties">
- <property name="sourceMap">
- <map merge="true">
- <entry key="id" value="uid" />
- <entry key="transcoder" value="SAML2StringTranscoder SAML1StringTranscoder" />
- <entry key="saml2.name" value="urn:oid:0.9.2342.19200300.100.1.1" />
- <entry key="saml1.name" value="urn:mace:dir:attribute-def:uid" />
- </map>
+ <property name="properties">
+ <props merge="true">
+ <prop key="id">uid</prop>
+ <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
+ <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.1</prop>
+ <prop key="saml1.name">urn:mace:dir:attribute-def:uid</prop>
+ </props>
</property>
</bean>
<bean parent="shibboleth.TranscodingProperties">
- <property name="sourceMap">
- <map merge="true">
- <entry key="id" value="mail" />
- <entry key="transcoder" value="SAML2StringTranscoder SAML1StringTranscoder" />
- <entry key="saml2.name" value="urn:oid:0.9.2342.19200300.100.1.3" />
- <entry key="saml1.name" value="urn:mace:dir:attribute-def:mail" />
- <entry key="description.en" value="E-Mail: Preferred address for e-mail to be sent to this person" />
- <entry key="description.fr" value="Address Courriel" />
- <entry key="description.de" value="E-Mail Adresse" />
- <entry key="description.it" value="E-Mail: l'indirizzo e-mail preferito dall'utente" />
- <entry key="displayName.en" value="E-mail" />
- <entry key="displayName.de" value="E-mail" />
- <entry key="displayName.it" value="E-mail" />
- <entry key="displayName.fr" value="Email" />
- </map>
+ <property name="properties">
+ <props merge="true">
+ <prop key="id">mail</prop>
+ <prop key="transcoder">SAML2StringTranscoder SAML1StringTranscoder</prop>
+ <prop key="saml2.name">urn:oid:0.9.2342.19200300.100.1.3</prop>
+ <prop key="saml1.name">urn:mace:dir:attribute-def:mail</prop>
+ <prop key="description.en">E-Mail: Preferred address for e-mail to be sent to this person</prop>
+ <prop key="description.fr">Address Courriel</prop>
+ <prop key="description.de">E-Mail Adresse</prop>
+ <prop key="description.it">E-Mail: l'indirizzo e-mail preferito dall'utente</prop>
+ <prop key="displayName.en">E-mail</prop>
+ <prop key="displayName.de">E-mail</prop>
+ <prop key="displayName.it">E-mail</prop>
+ <prop key="displayName.fr">Email</prop>
+ </props>
</property>
</bean>
<bean parent="shibboleth.TranscodingProperties">
- <property name="sourceMap">
- <map merge="true">
- <entry key="id" value="eduPersonPrincipalName" />
- <entry key="transcoder" value="SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder" />
- <entry key="saml2.name" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" />
- <entry key="saml1.name" value="urn:mace:dir:attribute-def:eduPersonPrincipalName" />
- </map>
+ <property name="properties">
+ <props merge="true">
+ <prop key="id">eduPersonPrincipalName</prop>
+ <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder</prop>
+ <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.6</prop>
+ <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonPrincipalName</prop>
+ </props>
</property>
</bean>
<bean parent="shibboleth.TranscodingProperties">
- <property name="sourceMap">
- <map merge="true">
- <entry key="id" value="eduPersonScopedAffiliation" />
- <entry key="transcoder" value="SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder" />
- <entry key="saml2.name" value="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" />
- <entry key="saml1.name" value="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" />
- <entry key="description.en" value="Affiliation: Type of affiliation with Home Organization" />
- <entry key="description.it" value="Type d'affiliation dans l'organisation" />
- <entry key="description.de" value="Art der Zugehörigkeit zur Heimorganisation" />
- <entry key="description.it" value="Tipo di membro: Tipo di lavoro svolto per l'organizzazione" />
- <entry key="displayName.en" value="Affiliation" />
- <entry key="displayName.de" value="Zugehörigkeit" />
- <entry key="displayName.it" value="Tipo di membro" />
- <entry key="displayName.fr" value="Affiliation" />
- </map>
+ <property name="properties">
+ <props merge="true">
+ <prop key="id">eduPersonScopedAffiliation</prop>
+ <prop key="transcoder">SAML2ScopedStringTranscoder SAML1ScopedStringTranscoder</prop>
+ <prop key="saml2.name">urn:oid:1.3.6.1.4.1.5923.1.1.1.9</prop>
+ <prop key="saml1.name">urn:mace:dir:attribute-def:eduPersonScopedAffiliation</prop>
+ <prop key="description.en">Affiliation: Type of affiliation with Home Organization</prop>
+ <prop key="description.it">Type d'affiliation dans l'organisation</prop>
+ <prop key="description.de">Art der Zugehörigkeit zur Heimorganisation</prop>
+ <prop key="description.it">Tipo di membro: Tipo di lavoro svolto per l'organizzazione</prop>
+ <prop key="displayName.en">Affiliation</prop>
+ <prop key="displayName.de">Zugehörigkeit</prop>
+ <prop key="displayName.it">Tipo di membro</prop>
+ <prop key="displayName.fr">Affiliation</prop>
+ </props>
</property>
</bean>
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 434f461..a3e3be2 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
@@ -54,12 +54,12 @@
class="net.shibboleth.idp.attribute.transcoding.impl.TranscodingRuleLoader" abstract="true" />
<bean id="shibboleth.TranscodingProperties" lazy-init="true"
- class="org.springframework.beans.factory.config.MapFactoryBean">
- <property name="sourceMap">
- <map>
- <entry key="saml1.encodeType" value="%{idp.service.attribute.registry.encodeType:true}" />
- <entry key="saml2.encodeType" value="%{idp.service.attribute.registry.encodeType:true}" />
- </map>
+ class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="saml1.encodeType">%{idp.service.attribute.registry.encodeType:true}</prop>
+ <prop key="saml2.encodeType">%{idp.service.attribute.registry.encodeType:true}</prop>
+ </props>
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list