[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/intercept: attribute-release-beans...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  1 23:37:06 2016
New Revision: 8118

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8118&view=rev
Log:
Fix tests: override audit map properly, and include audit-system.xml to pull in additional user-defined beans.

Modified:
    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

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml?rev=8118&r1=8117&r2=8118&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml	Tue Mar  1 23:37:06 2016
@@ -14,6 +14,7 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <import resource="../../conf/audit-system.xml" />
     <import resource="../../../conf/intercept/consent-intercept-config.xml" />
 
     <bean id="AttributeReleaseConsentFunction"
@@ -101,7 +102,8 @@
 
     <bean id="PopulatePreConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors" />
+        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors"
+        p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap" />
 
     <bean id="PopulateConsentContext"
         class="net.shibboleth.idp.consent.flow.impl.PopulateConsentContext" scope="prototype"
@@ -135,7 +137,8 @@
 
     <bean id="PopulateConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors" />
+        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors"
+        p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap" />
 
     <bean id="ExtractConsent"
         class="net.shibboleth.idp.consent.flow.impl.ExtractConsent" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml?rev=8118&r1=8117&r2=8118&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml	Tue Mar  1 23:37:06 2016
@@ -14,6 +14,7 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <import resource="../../conf/audit-system.xml" />
     <import resource="../../../conf/intercept/consent-intercept-config.xml" />
 
     <bean id="TermsOfUseConsentFunction"
@@ -74,7 +75,8 @@
         
     <bean id="PopulatePreConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors" />
+        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors"
+        p:formattingMap-ref="shibboleth.consent.terms-of-use.AuditFormattingMap" />
 
     <bean id="ReadConsentFromStorage"
         class="net.shibboleth.idp.consent.flow.storage.impl.ReadConsentFromStorage" scope="prototype"
@@ -99,7 +101,8 @@
 
     <bean id="PopulateConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors" />
+        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors"
+        p:formattingMap-ref="shibboleth.consent.terms-of-use.AuditFormattingMap" />
 
     <bean id="WriteConsentAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:auditContextLookupStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"