[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/intercept/consent-intercept-config.xml sy...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 16 16:04:19 2014
New Revision: 7120

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7120&view=rev
Log:
IDP-523 - align formatting of different consent events to avoid non-uniform parsing

Modified:
    trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml?rev=7120&r1=7119&r2=7120&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml Tue Dec 16 16:04:19 2014
@@ -71,37 +71,21 @@
 
     <!--
     For terms-of-use acceptance, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsAccepted|jdoe|example-tou-1|rHo...rrw='
+     'YYYYMMDDTHHMMSSZ|TermsAccepted|jdoe|example-tou-1|rHo...rrw=|true'
 
     For terms-of-use refusal, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsRejected|jdoe|example-tou-1|rHo...rrw='
+     'YYYYMMDDTHHMMSSZ|TermsRejected|jdoe|example-tou-1|rHo...rrw=|false'
     -->
     <util:map id="shibboleth.consent.terms-of-use.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV" />
+        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV|%CCA" />
     </util:map>
 
     <!--
     For attribute-release consent, the default entry is :
      'YYYYMMDDTHHMMSSZ|https://sp.example.org|AttributeReleaseConsent|jdoe|email,eduPersonAffiliation|false,false'
-     -->
+    -->
     <util:map id="shibboleth.consent.attribute-release.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCA" />
-    </util:map>
-
-    <!--
-    For revocation of attribute-release consent, the default entry is :
-     'YYYYMMDDTHHMMSSZ|https://sp.example.org|ClearAttributeReleaseConsent|jdoe'
-     -->
-    <util:map id="shibboleth.consent.attribute-release.revoke.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u" />
-    </util:map>
-
-    <!--
-    For global attribute-release consent, the default entry is :
-     'YYYYMMDDTHHMMSSZ|GlobalAttributeReleaseConsent|jdoe'
-     -->
-    <util:map id="shibboleth.consent.attribute-release.global.AuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%e|%u" />
+        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV|%CCA" />
     </util:map>
 
     <!--

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=7120&r1=7119&r2=7120&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 Dec 16 16:04:19 2014
@@ -144,16 +144,9 @@
     <bean id="ReleaseAttributes"
         class="net.shibboleth.idp.consent.flow.ar.ReleaseAttributes" scope="prototype" />
 
-    <bean id="WriteAttributeReleaseConsentAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
+    <bean id="WriteAttributeReleaseConsentAuditLog"
+        class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:auditContextLookupStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
         p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap" />
 
-    <bean id="WriteGlobalAttributeReleaseConsentAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
-        p:auditContextLookupStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:formattingMap-ref="shibboleth.consent.attribute-release.global.AuditFormattingMap" />
-
-    <bean id="WriteRevokeAttributeReleaseConsentAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
-        p:auditContextLookupStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:formattingMap-ref="shibboleth.consent.attribute-release.revoke.AuditFormattingMap" />
-
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml?rev=7120&r1=7119&r2=7120&view=diff
==============================================================================

[... 89 lines stripped ...]