[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/conf/audit-system.xml

[noreply at shibboleth.net]

Author: serac
Date: Tue Dec  8 13:07:13 2015
New Revision: 8019

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8019&view=rev
Log:
IDP-878 Add IdP username to CAS system audit map.

https://issues.shibboleth.net/jira/browse/IDP-878

Modified:
    trunk/idp-conf/src/main/resources/system/conf/audit-system.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=8019&r1=8018&r2=8019&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	Tue Dec  8 13:07:13 2015
@@ -563,49 +563,57 @@
             <map>
                 <entry>
                     <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.SERVICE_URL"/>
-                    </key>
-                    <bean class="net.shibboleth.idp.cas.audit.impl.ServiceLookupFunction" />
-                </entry>
-                <entry>
-                    <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.GATEWAY"/>
-                    </key>
-                    <bean class="net.shibboleth.idp.cas.audit.impl.GatewayLookupFunction" />
-                </entry>
-                <entry>
-                    <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.RENEW"/>
-                    </key>
-                    <bean class="net.shibboleth.idp.cas.audit.impl.RenewLookupFunction" />
-                </entry>
-                <entry>
-                    <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.GRANTING_TICKET"/>
-                    </key>
-                    <bean class="com.google.common.base.Functions" factory-method="compose">
-                        <constructor-arg name="g">
-                            <bean class="net.shibboleth.idp.session.context.navigate.SessionContextIDLookupFunction" />
-                        </constructor-arg>
-                        <constructor-arg name="f">
-                            <ref bean="shibboleth.ChildLookup.SessionContext" />
-                        </constructor-arg>
-                    </bean>
-                </entry>
-                <entry>
-                    <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.SERVICE_TICKET"/>
-                    </key>
-                    <bean class="net.shibboleth.idp.cas.audit.impl.TicketLookupFunction" />
-                </entry>
-                <entry>
-                    <key>
-                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.USER"/>
+                        <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
                     </key>
                     <bean class="com.google.common.base.Functions" factory-method="compose"
                           c:g-ref="shibboleth.PrincipalNameLookup.Subject"
                           c:f-ref="shibboleth.ChildLookup.SubjectContext" />
                 </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.SERVICE_URL"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.cas.audit.impl.ServiceLookupFunction" />
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.GATEWAY"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.cas.audit.impl.GatewayLookupFunction" />
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.RENEW"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.cas.audit.impl.RenewLookupFunction" />
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.cas.protocol.CASAuditFields.GRANTING_TICKET"/>
+                    </key>
+                    <bean class="com.google.common.base.Functions" factory-method="compose">
+                        <constructor-arg name="g">
+                            <bean class="net.shibboleth.idp.session.context.navigate.SessionContextIDLookupFunction" />
+                        </constructor-arg>
+                        <constructor-arg name="f">
+                            <ref bean="shibboleth.ChildLookup.SessionContext" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
+                <entry>

[... 32 lines stripped ...]