[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-conf/src/mai...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  1 22:53:41 2016
New Revision: 8117

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8117&view=rev
Log:
Factor out PopulateAuditContext action into a parent bean.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.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
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/propagation/saml2-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8117&r1=8116&r2=8117&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Tue Mar  1 22:53:41 2016
@@ -311,4 +311,13 @@
         </constructor-arg>
     </bean>
     
+    <!-- Action bean templates. -->
+    
+    <bean id="shibboleth.AbstractPopulateAuditContext" abstract="true"
+        class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
+        p:formattingMap-ref="shibboleth.AuditFormattingMap"
+        p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
+        p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}"
+        p:fieldReplacements="#{getObject('shibboleth.AuditFieldReplacementMap')}" />
+    
  </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=8117&r1=8116&r2=8117&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	Tue Mar  1 22:53:41 2016
@@ -41,11 +41,7 @@
         </constructor-arg>
     </bean>
     
-    <bean id="PostDecodePopulateAuditContext"
-            class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-            p:formattingMap-ref="shibboleth.AuditFormattingMap"
-            p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
-            p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}">
+    <bean id="PostDecodePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext">
         <property name="fieldExtractors">
             <map>
                 <entry>
@@ -100,11 +96,8 @@
         class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype"
         p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
     
-    <bean id="PostLookupPopulateAuditContext"
-        class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-        p:fieldExtractors-ref="shibboleth.PostLookupAuditExtractors"
-        p:formattingMap-ref="shibboleth.AuditFormattingMap"
-        p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}" />
+    <bean id="PostLookupPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
+        p:fieldExtractors-ref="shibboleth.PostLookupAuditExtractors" />
 
     <bean id="PopulateSubjectContext"
             class="net.shibboleth.idp.profile.impl.PopulateSubjectContext" scope="prototype">
@@ -195,19 +188,11 @@
         </property>
     </bean>
     
-    <bean id="PostAssertionPopulateAuditContext"
-        class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-        p:fieldExtractors-ref="shibboleth.PostAssertionAuditExtractors"
-        p:formattingMap-ref="shibboleth.AuditFormattingMap"
-        p:dateTimeFormat="#{getObject('shibboleth.AuditDateTimeFormat')}"
-        p:useDefaultTimeZone="#{getObject('shibboleth.AuditDefaultTimeZone') ?: false}" />
-    
-    <bean id="PostResponsePopulateAuditContext"

[... 489 lines stripped ...]