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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov  5 16:23:35 2015
New Revision: 7950

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7950&view=rev
Log:
IDP-840 - bit of category streamlining

Modified:
    trunk/idp-conf/src/main/resources/conf/audit.xml
    trunk/idp-conf/src/main/resources/conf/logback.xml

Modified: trunk/idp-conf/src/main/resources/conf/audit.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/audit.xml?rev=7950&r1=7949&r2=7950&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml	Thu Nov  5 16:23:35 2015
@@ -16,7 +16,7 @@
     -->
     <util:map id="shibboleth.AuditFormattingMap">
         <entry key="Shibboleth-Audit" value="%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i|" />
-        <entry key="Shibboleth-Audit-FTICKS"
+        <entry key="Shibboleth-FTICKS"
             value="F-TICKS/%{idp.fticks.federation:Undefined}/1.0#TS=%T#RP=%SP#AP=%IDP#PN=%HASHEDu#AM=%ac#" />
     </util:map>
 

Modified: trunk/idp-conf/src/main/resources/conf/logback.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/logback.xml?rev=7950&r1=7949&r2=7950&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/logback.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/logback.xml	Thu Nov  5 16:23:35 2015
@@ -100,7 +100,7 @@
     </appender>
 
     <!-- F-TICKS audit log. -->
-    <appender name="IDP_FTICKS_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="IDP_FTICKS" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>${idp.home}/logs/idp-fticks.log</File>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -116,7 +116,7 @@
 
     <!-- F-TICKS syslog destination. -->
     <!--
-    <appender name="IDP_FTICKS_AUDIT_SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
+    <appender name="IDP_FTICKS_SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
         <syslogHost>localhost</syslogHost>
         <facility>AUTH</facility>
         <suffixPattern>[%thread] %logger %msg</suffixPattern>
@@ -127,9 +127,9 @@
         <appender-ref ref="IDP_AUDIT"/>
     </logger>
 
-    <logger name="Shibboleth-Audit-FTICKS" level="ALL">
-        <appender-ref ref="IDP_FTICKS_AUDIT"/>
-        <!-- <appender-ref ref="IDP_FTICKS_AUDIT_SYSLOG"/> -->
+    <logger name="Shibboleth-FTICKS" level="ALL">
+        <appender-ref ref="IDP_FTICKS"/>
+        <!-- <appender-ref ref="IDP_FTICKS_SYSLOG"/> -->
     </logger>
 
     <logger name="Shibboleth-Consent-Audit" level="ALL">