[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/audit-system.xml flows/cas/login/l...

[noreply at shibboleth.net]

Author: serac
Date: Mon Jul 20 13:47:46 2015
New Revision: 7644

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7644&view=rev
Log:
IDP-679 Use default beans if no userspace beans exist.

https://issues.shibboleth.net/jira/browse/IDP-679
Use default CAS audit extractors if no userspace equivalents exist.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/audit-system.xml?rev=7644&r1=7643&r2=7644&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/audit-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/audit-system.xml	Mon Jul 20 13:47:46 2015
@@ -430,7 +430,7 @@
     </bean>
 
     <bean id="shibboleth.DefaultCASLoginAuditExtractors"
-          class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+          class="org.springframework.beans.factory.config.MapFactoryBean">
         <property name="sourceMap">
             <map>
                 <entry>
@@ -483,7 +483,7 @@
     </bean>
 
     <bean id="shibboleth.DefaultCASValidationAuditExtractors"
-          class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+          class="org.springframework.beans.factory.config.MapFactoryBean">
         <property name="sourceMap">
             <map>
                 <entry>
@@ -543,7 +543,7 @@
 
     <bean id="shibboleth.DefaultCASProxyAuditExtractors"
           class="org.springframework.beans.factory.config.MapFactoryBean"
-          parent="shibboleth.DefaultCASValidationAuditExtractors" abstract="true">
+          parent="shibboleth.DefaultCASValidationAuditExtractors">
         <property name="sourceMap">
             <map merge="true">
                 <entry>

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml?rev=7644&r1=7643&r2=7644&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml	Mon Jul 20 13:47:46 2015
@@ -56,7 +56,10 @@
 
     <bean id="PopulateAuditContext"
           class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-          p:fieldExtractors-ref="shibboleth.CASLoginAuditExtractors"
+          p:fieldExtractors-ref="#{
+            getObject('shibboleth.CASLoginAuditExtractors') != null
+                ? 'shibboleth.CASLoginAuditExtractors'
+                : 'shibboleth.DefaultCASLoginAuditExtractors' }"
           p:formattingMap-ref="shibboleth.AuditFormattingMap" />
 
     <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml?rev=7644&r1=7643&r2=7644&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml	Mon Jul 20 13:47:46 2015
@@ -25,7 +25,10 @@
 
     <bean id="PopulateAuditContext"
           class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-          p:fieldExtractors-ref="shibboleth.CASProxyAuditExtractors"
+          p:fieldExtractors-ref="#{
+            getObject('shibboleth.CASProxyAuditExtractors') != null
+                ? 'shibboleth.CASProxyAuditExtractors'
+                : 'shibboleth.DefaultCASProxyAuditExtractors'}"
           p:formattingMap-ref="shibboleth.AuditFormattingMap" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml?rev=7644&r1=7643&r2=7644&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml	Mon Jul 20 13:47:46 2015
@@ -42,6 +42,9 @@
 
     <bean id="PopulateAuditContext"
           class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"

[... 8 lines stripped ...]