Rename httpd log to "native"

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1542 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 23d7898..3d3fc91 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -18,7 +18,7 @@ pkgsysconf_DATA = \
 # the config files will not overwrite existing versions.
 BUILTCONFIGFILES = \
        shibboleth.xml \
-       httpd.logger \
+       native.logger \
        shibd.logger \
        AAP.xml \
        IQ-sites.xml \
@@ -60,7 +60,7 @@ apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.stat
 shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-httpd.logger: ${srcdir}/httpd.logger.in Makefile ${top_builddir}/config.status
+native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
@@ -101,7 +101,7 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        shibd.logger \
-       httpd.logger \
+       native.logger \
        shibboleth.xml \
        AAP.xml \
        IQ-sites.xml \
@@ -109,7 +109,7 @@ CLEANFILES = \
 
 EXTRA_DIST = .cvsignore \
        shibboleth.xml.in \
-       httpd.logger.in \
+       native.logger.in \
        shibd.logger.in \
        apache.config.in \
        apache2.config.in \

diff --git a/configs/httpd.logger.in b/configs/httpd.logger.in
deleted file mode 100644 (file)
index e5e05c7..0000000
--- a/configs/httpd.logger.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# set overall behavior
-log4j.rootCategory=INFO, httpd_log
-
-# these are fairly verbose for DEBUG, so generally leave at INFO
-log4j.category.SAML.XML=INFO
-log4j.category.shibtarget.XMLApplication=INFO
-
-# shut off transaction log from this end
-log4j.category.Shibboleth-TRANSACTION=WARN
-
-# define the appenders
-
-log4j.appender.httpd_log=org.apache.log4j.RollingFileAppender
-log4j.appender.httpd_log.fileName=@-SHIRELOGDIR-@/httpd.log
-log4j.appender.httpd_log.maxFileSize=1000000e
-log4j.appender.httpd_log.maxBackupIndex=10
-#log4j.appender.httpd_log.layout=org.apache.log4j.BasicLayout
-log4j.appender.httpd_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.httpd_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

diff --git a/configs/native.logger.in b/configs/native.logger.in
new file mode 100644 (file)
index 0000000..0e6769b
--- /dev/null
+++ b/configs/native.logger.in
@@ -0,0 +1,19 @@
+# set overall behavior
+log4j.rootCategory=INFO, native_log
+
+# these are fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.SAML.XML=INFO
+log4j.category.shibtarget.XMLApplication=INFO
+
+# shut off transaction log from this end
+log4j.category.Shibboleth-TRANSACTION=WARN
+
+# define the appenders
+
+log4j.appender.native_log=org.apache.log4j.RollingFileAppender
+log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
+log4j.appender.native_log.maxFileSize=1000000e
+log4j.appender.native_log.maxBackupIndex=10
+#log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
+log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
+log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index 1d78e1d..cde317e 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -54,7 +54,7 @@
     </Global>
     
        <!-- The Local section pertains to resource-serving processes (often process pools) like web servers. -->
-    <Local logger="@-PKGSYSCONFDIR-@/httpd.logger" localRelayState="true">
+    <Local logger="@-PKGSYSCONFDIR-@/native.logger" localRelayState="true">
         <!--
         To customize behavior, map hostnames and path components to applicationId and other settings.
         The following provider types are available with the delivered code:
@@ -106,7 +106,7 @@
                and those requests will map to sp.example.org for configuration settings.
                -->
                 <Site id="1" name="sp.example.org">
-                       <Alias>spalso.example.org</Alias>
+                       <Alias>spalias.example.org</Alias>
                 </Site>
             </ISAPI>
         </Implementation>