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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 14 15:16:57 2014
New Revision: 6423

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6423&view=rev
Log:
Clean up use of constants.

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=6423&r1=6422&r2=6423&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 Thu Aug 14 15:16:57 2014
@@ -19,8 +19,10 @@
             class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
         <property name="sourceMap">
             <map>
-                <!-- SAML Protocol-->
-                <entry key="p">
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.PROTOCOL"/>
+                    </key>
                     <bean class="net.shibboleth.idp.profile.audit.impl.ConstantAuditExtractor">
                         <constructor-arg>
                             <list>
@@ -29,8 +31,10 @@
                         </constructor-arg>
                     </bean>
                 </entry>
-                <!-- SAML Request Binding -->
-                <entry key="b">
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_BINDING"/>
+                    </key>
                     <bean class="net.shibboleth.idp.saml.audit.impl.SAMLBindingAuditExtractor">
                         <constructor-arg>
                             <bean class="com.google.common.base.Functions" factory-method="compose"
@@ -39,8 +43,10 @@
                         </constructor-arg>
                     </bean>
                 </entry>
-                <!-- SAML Request ID -->
-                <entry key="I">
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ID"/>
+                    </key>
                     <bean class="net.shibboleth.idp.saml.audit.impl.SAMLMessageIDAuditExtractor">
                         <constructor-arg>
                             <bean class="com.google.common.base.Functions" factory-method="compose"
@@ -50,7 +56,10 @@
                     </bean>
                 </entry>
                 <!-- SAML Request IssueInstant -->
-                <entry key="D">
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.REQUEST_ISSUE_INSTANT"/>
+                    </key>
                     <bean class="net.shibboleth.idp.saml.audit.impl.SAMLMessageInstantAuditExtractor">
                         <constructor-arg>
                             <bean class="com.google.common.base.Functions" factory-method="compose"