[java-identity-provider] branch master updated: Remove more empty collection placeholders.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 12 13:30:50 EDT 2018
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=a8f5a35a51bef689a0bc8fc1c4230339966f11b2
The following commit(s) were added to refs/heads/master by this push:
new a8f5a35 Remove more empty collection placeholders.
a8f5a35 is described below
commit a8f5a35a51bef689a0bc8fc1c4230339966f11b2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 12 13:30:47 2018 -0400
Remove more empty collection placeholders.
---
idp-conf/src/main/resources/conf/session-manager.xml | 16 ----------------
.../resources/system/conf/session-manager-system.xml | 6 +++---
.../main/resources/system/flows/logout/logout-beans.xml | 2 +-
.../system/flows/logout/logout-propagation-beans.xml | 2 +-
.../resources/system/flows/saml/saml2/slo-back-beans.xml | 2 +-
.../system/flows/saml/saml2/slo-front-abstract-beans.xml | 2 +-
idp-conf/src/test/resources/test/test-cas-beans.xml | 2 +-
7 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/idp-conf/src/main/resources/conf/session-manager.xml b/idp-conf/src/main/resources/conf/session-manager.xml
index f195014..7372029 100644
--- a/idp-conf/src/main/resources/conf/session-manager.xml
+++ b/idp-conf/src/main/resources/conf/session-manager.xml
@@ -15,22 +15,6 @@
<ref bean="logoutprop/cas" />
<ref bean="logoutprop/saml2" />
</util:list>
-
- <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
- <bean id="shibboleth.SPSessionSerializerRegistry" parent="shibboleth.DefaultSPSessionSerializerRegistry">
- <property name="mappings">
- <map merge="true">
- </map>
- </property>
- </bean>
-
- <!-- Modify only to add extension types associated with non-built-in SSO protocols. -->
- <bean id="shibboleth.SessionTypeProtocolMap" parent="shibboleth.DefaultSessionTypeProtocolMap">
- <property name="sourceMap">
- <map merge="true">
- </map>
- </property>
- </bean>
<!--
List of client-side storage service plugins. If you use server-side storage and don't need these
diff --git a/idp-conf/src/main/resources/system/conf/session-manager-system.xml b/idp-conf/src/main/resources/system/conf/session-manager-system.xml
index 54b022c..e2f152c 100644
--- a/idp-conf/src/main/resources/system/conf/session-manager-system.xml
+++ b/idp-conf/src/main/resources/system/conf/session-manager-system.xml
@@ -16,7 +16,7 @@
class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy"
c:identifierSize="%{idp.session.idSize:32}" />
- <bean id="shibboleth.DefaultSPSessionSerializerRegistry" abstract="true"
+ <bean id="shibboleth.DefaultSPSessionSerializerRegistry"
class="net.shibboleth.idp.session.SPSessionSerializerRegistry">
<property name="mappings">
<map>
@@ -42,7 +42,7 @@
</bean>
<bean id="shibboleth.DefaultSessionTypeProtocolMap"
- class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+ class="org.springframework.beans.factory.config.MapFactoryBean">
<property name="sourceMap">
<map>
<entry key="#{T(net.shibboleth.idp.saml.session.SAML1SPSession)}">
@@ -72,7 +72,7 @@
p:trackSPSessions="%{idp.session.trackSPSessions:false}"
p:secondaryServiceIndex="%{idp.session.secondaryServiceIndex:false}"
p:IDGenerator-ref="shibboleth.SessionIDGenerator"
- p:SPSessionSerializerRegistry-ref="shibboleth.SPSessionSerializerRegistry" />
+ p:SPSessionSerializerRegistry="#{getObject('shibboleth.SPSessionSerializerRegistry') ?: getObject('shibboleth.DefaultSPSessionSerializerRegistry')}" />
<!-- Built-in logout propagation flows. -->
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml b/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
index a46ec9d..854ec0c 100644
--- a/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
@@ -57,7 +57,7 @@
class="net.shibboleth.idp.session.impl.PopulateMultiRPContextFromLogoutContext" scope="prototype"
p:activationCondition="%{idp.logout.elaboration:false}"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
- p:sessionTypeProtocolMap-ref="shibboleth.SessionTypeProtocolMap" />
+ p:sessionTypeProtocolMap="#{getObject('shibboleth.SessionTypeProtocolMap') ?: getObject('shibboleth.DefaultSessionTypeProtocolMap')}" />
<bean id="SetRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml b/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
index 4403ab2..3c4bbff 100644
--- a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
@@ -33,7 +33,7 @@
<bean id="PopulateLogoutPropagationContext"
class="net.shibboleth.idp.session.impl.PopulateLogoutPropagationContext" scope="prototype"
- p:SPSessionSerializerRegistry-ref="shibboleth.SPSessionSerializerRegistry"
+ p:SPSessionSerializerRegistry="#{getObject('shibboleth.SPSessionSerializerRegistry') ?: getObject('shibboleth.DefaultSPSessionSerializerRegistry')}"
p:dataSealer="#{'%{idp.sealer.storeResource:}'.trim().length() > 0 ? getObject('shibboleth.DataSealer') : null}" />
<bean id="PopulateUserAgentContext"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
index a2fc8a8..f7e2e3e 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
@@ -54,7 +54,7 @@
<bean id="PopulateMultiRPContextFromLogoutContext"
class="net.shibboleth.idp.session.impl.PopulateMultiRPContextFromLogoutContext" scope="prototype"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
- p:sessionTypeProtocolMap-ref="shibboleth.SessionTypeProtocolMap" />
+ p:sessionTypeProtocolMap="#{getObject('shibboleth.SessionTypeProtocolMap') ?: getObject('shibboleth.DefaultSessionTypeProtocolMap')}" />
-->
<bean id="AddLogoutResponse" class="org.opensaml.saml.saml2.profile.impl.AddStatusResponseShell" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
index 077e30f..952eb89 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
@@ -80,7 +80,7 @@
class="net.shibboleth.idp.session.impl.PopulateMultiRPContextFromLogoutContext" scope="prototype"
p:activationCondition="%{idp.logout.elaboration:false}"
p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
- p:sessionTypeProtocolMap-ref="shibboleth.SessionTypeProtocolMap" />
+ p:sessionTypeProtocolMap="#{getObject('shibboleth.SessionTypeProtocolMap') ?: getObject('shibboleth.DefaultSessionTypeProtocolMap')}" />
<bean id="SetRPUIInformation"
class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
diff --git a/idp-conf/src/test/resources/test/test-cas-beans.xml b/idp-conf/src/test/resources/test/test-cas-beans.xml
index e394df3..d5d4a52 100644
--- a/idp-conf/src/test/resources/test/test-cas-beans.xml
+++ b/idp-conf/src/test/resources/test/test-cas-beans.xml
@@ -23,7 +23,7 @@
p:trackSPSessions="true"
p:secondaryServiceIndex="%{idp.session.secondaryServiceIndex:false}"
p:IDGenerator-ref="shibboleth.SessionIDGenerator"
- p:SPSessionSerializerRegistry-ref="shibboleth.SPSessionSerializerRegistry" />
+ p:SPSessionSerializerRegistry="#{getObject('shibboleth.SPSessionSerializerRegistry') ?: getObject('shibboleth.DefaultSPSessionSerializerRegistry')}" />
<util:list id="shibboleth.RelyingPartyResolverResources">
<value>classpath:/test/test-relying-party-cas.xml</value>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list