[java-identity-provider] branch master updated: Parent bean reorg.

[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=1569d65ba0df6e62733b402b072104369873ce1c

The following commit(s) were added to refs/heads/master by this push:
       new  1569d65   Parent bean reorg.
1569d65 is described below

commit 1569d65ba0df6e62733b402b072104369873ce1c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 15 19:56:17 2019 -0500

    Parent bean reorg.
---
 .../main/resources/system/conf/general-authn-system.xml   |  9 ---------
 idp-conf/src/main/resources/system/conf/utilities.xml     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/general-authn-system.xml b/idp-conf/src/main/resources/system/conf/general-authn-system.xml
index b485916..73ee553 100644
--- a/idp-conf/src/main/resources/system/conf/general-authn-system.xml
+++ b/idp-conf/src/main/resources/system/conf/general-authn-system.xml
@@ -15,15 +15,6 @@
 	<import resource="../../conf/authn/authn-comparison.xml" />
 	<import resource="../../conf/authn/general-authn.xml" />
 
-    <!-- Parent beans for custom principal types. -->
-    
-    <bean id="shibboleth.SAML2AuthnContextClassRef"
-        class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal" abstract="true" />
-    <bean id="shibboleth.SAML2AuthnContextDeclRef"
-        class="net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal" abstract="true" />
-    <bean id="shibboleth.SAML1AuthenticationMethod"
-        class="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal" abstract="true" />
-
     <!-- A parent bean to default some of the flow boilerplate. -->
 
     <bean id="shibboleth.AuthenticationFlow" abstract="true"
diff --git a/idp-conf/src/main/resources/system/conf/utilities.xml b/idp-conf/src/main/resources/system/conf/utilities.xml
index e15e525..9594f96 100644
--- a/idp-conf/src/main/resources/system/conf/utilities.xml
+++ b/idp-conf/src/main/resources/system/conf/utilities.xml
@@ -46,6 +46,21 @@
     <bean id="shibboleth.Functions.Expression"
         class="net.shibboleth.ext.spring.util.SpringExpressionFunction"  abstract="true" />
     
+    <!-- Parent bean for indirecting a lookup into a managed/reloadable bean. -->
+    
+    <bean id="shibboleth.ManagedBean" abstract="true"
+        class="net.shibboleth.ext.spring.factory.ProxiedFactoryBean"
+        c:service-ref="shibboleth.ManagedBeanService" />
+    
+    <!-- Parent beans for custom principal types. -->
+    
+    <bean id="shibboleth.SAML2AuthnContextClassRef"
+        class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal" abstract="true" />
+    <bean id="shibboleth.SAML2AuthnContextDeclRef"
+        class="net.shibboleth.idp.saml.authn.principal.AuthnContextDeclRefPrincipal" abstract="true" />
+    <bean id="shibboleth.SAML1AuthenticationMethod"
+        class="net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal" abstract="true" />
+   
     <!-- Parent bean for building custom predicates that act on a RP's EntityDescriptor. -->
     <bean id="shibboleth.Conditions.EntityDescriptor" abstract="true"
             class="net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate">

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