rename to reflect logger use

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1608 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/conf/sp-conf.include b/conf/sp-conf.include
index 1aeaa90..86eb2c3 100644 (file)
--- a/conf/sp-conf.include
+++ b/conf/sp-conf.include
@@ -4,4 +4,4 @@ dist.sp.xml
 sp-example.crt
 sp-example.key
 AAP.xml
-sp-init.logger
\ No newline at end of file
+sp-config.logger
\ No newline at end of file

diff --git a/src/conf/sp-config.logger b/src/conf/sp-config.logger
new file mode 100644 (file)
index 0000000..dce2892
--- /dev/null
+++ b/src/conf/sp-config.logger
@@ -0,0 +1,10 @@
+# You can override the log4j configuration by specifying a logger
+# attribute for the SPConfig element in the SP configuration file
+# (if the normal logging isn't adequate)
+
+log4j.logger.edu.internet2.middleware=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-5p %-36X{serviceId} %d{ISO8601} (%c:%L) - %m%n
+

diff --git a/src/conf/sp-init.logger b/src/conf/sp-init.logger
deleted file mode 100644 (file)
index 4dc328f..0000000
--- a/src/conf/sp-init.logger
+++ /dev/null
@@ -1,12 +0,0 @@
-# A log4j configuration file for initialization
-# This configuration file starts logging when the only available information
-# comes from the Servlet context parameter. It does not depend on XML parsing
-# or any other configuration file. However, its location must have been 
-# correctly installed in WEB-INF/web.xml for the SP
-
-log4j.logger.edu.internet2.middleware=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p %-36X{serviceId} %d{ISO8601} (%c:%L) - %m%n
-