From 470b7cc47e6a85667fab6883303acbf2e98550d4 Mon Sep 17 00:00:00 2001
From: "Eric J. Bowersox" <erbo@erbosoft.com>
Date: Tue, 20 May 2003 04:22:30 +0000
Subject: [PATCH] fixed the log directories so they're configurable

---
 .gitignore              |  1 +
 build.properties.sample |  3 +++
 build.xml               | 21 ++++++++++++++++++---
 conf-sso/sp/logging.xml |  4 ++--
 conf/logging-test.xml   |  4 ++--
 conf/logging-venice.xml |  4 ++--
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 956db13..3a70049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.log
 assembly
 build.properties
 jars
diff --git a/build.properties.sample b/build.properties.sample
index 8ed6685..181e33f 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -21,6 +21,9 @@
 # compile.optimize=on
 # build.compiler=modern
 
+# [Logging directory]
+# logfile.dir=${user.home}
+
 # [Location of Servlet API 2.3]
 servlet.base=/usr/local/jakarta/jakarta-tomcat-4.1.24-LE-jdk14
 servlet.lib=${servlet.base}/common/lib
diff --git a/build.xml b/build.xml
index e4196d4..3ae8812 100644
--- a/build.xml
+++ b/build.xml
@@ -34,6 +34,9 @@
   <property name="compile.optimize" value="off"/>
   <property name="build.compiler" value="modern"/>
 
+  <!-- [Logging directory] -->
+  <property name="logfile.dir" value="${user.home}"/>
+
   <!-- [Location of Servlet API 2.3] -->
   <property name="servlet.base" value="../servletapi"/>
   <property name="servlet.lib" value="${servlet.base}/lib"/>
@@ -290,7 +293,11 @@
     </copy>
     <copy file="jars/dynamo-test-module.jar" todir="assembly/testapp/WEB-INF/modules"/>
     <copy file="conf/dynamo-test.xml" tofile="assembly/testapp/WEB-INF/dynamo.xml"/>
-    <copy file="conf/logging-test.xml" tofile="assembly/testapp/WEB-INF/logging.xml"/>
+    <copy file="conf/logging-test.xml" tofile="assembly/testapp/WEB-INF/logging.xml">
+      <filterset>
+        <filter token="LOGDIR" value="${logfile.dir}"/>
+      </filterset>
+    </copy>
     <copy file="conf/web-test.xml" tofile="assembly/testapp/WEB-INF/web.xml"/>
     <copy todir="assembly/testapp/WEB-INF">
       <fileset dir="test-data" includes="**/*"/>
@@ -319,7 +326,11 @@
       <fileset dir="${velocity.lib}" includes="${velocity.jarfile}"/>
     </copy>
     <copy file="conf/dynamo-venice.xml" tofile="assembly/venice/WEB-INF/dynamo.xml"/>
-    <copy file="conf/logging-venice.xml" tofile="assembly/venice/WEB-INF/logging.xml"/>
+    <copy file="conf/logging-venice.xml" tofile="assembly/venice/WEB-INF/logging.xml">
+      <filterset>
+        <filter token="LOGDIR" value="${logfile.dir}"/>
+      </filterset>
+    </copy>
     <copy file="conf/web-venice.xml" tofile="assembly/venice/WEB-INF/web.xml"/>
     <copy todir="assembly/venice/WEB-INF">
       <fileset dir="venice-data" includes="**/*"/>
@@ -376,7 +387,6 @@
     </copy>
     <copy todir="assembly/venice-sp/WEB-INF">
       <fileset dir="conf-sso/sp">
-        <include name="logging.xml"/>
         <include name="dynamo.xml"/>
         <include name="web.xml"/>
         <include name="sourceid-sso.xml"/>
@@ -384,6 +394,11 @@
         <include name="venice-sp.keystore"/>
       </fileset>
     </copy>
+    <copy file="conf-sso/sp/logging.xml" todir="assembly/venice-sp/WEB-INF">
+      <filterset>
+        <filter token="LOGDIR" value="${logfile.dir}"/>
+      </filterset>
+    </copy>
     <copy file="${sourceid.base}/conf/server-config.wsdd" todir="assembly/venice-sp/WEB-INF"
           preservelastmodified="yes"/>
     <copy todir="assembly/venice-sp/WEB-INF">
diff --git a/conf-sso/sp/logging.xml b/conf-sso/sp/logging.xml
index df3b1bb..2ef6de0 100644
--- a/conf-sso/sp/logging.xml
+++ b/conf-sso/sp/logging.xml
@@ -13,7 +13,7 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-03 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
@@ -21,7 +21,7 @@
 
   <!-- Define the standard file appender. -->
   <appender name="STDLOG" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="/home/erbo/code/nvx/venice-sp.log"/>
+    <param name="File" value="@LOGDIR@/venice-sp.log"/>
     <param name="Append" value="true"/>
     <param name="MaxFileSize" value="10MB"/>
     <param name="MaxBackupIndex" value="5"/>
diff --git a/conf/logging-test.xml b/conf/logging-test.xml
index 525cb17..c37ab47 100644
--- a/conf/logging-test.xml
+++ b/conf/logging-test.xml
@@ -13,7 +13,7 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-03 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
@@ -21,7 +21,7 @@
 
   <!-- Define the standard file appender. -->
   <appender name="STDLOG" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="/home/erbo/code/nvx/testapp.log"/>
+    <param name="File" value="@LOGDIR@/testapp.log"/>
     <param name="Append" value="true"/>
     <param name="MaxFileSize" value="10MB"/>
     <param name="MaxBackupIndex" value="5"/>
diff --git a/conf/logging-venice.xml b/conf/logging-venice.xml
index e5f935b..f9940a6 100644
--- a/conf/logging-venice.xml
+++ b/conf/logging-venice.xml
@@ -13,7 +13,7 @@
 
     The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
     for Silverwrist Design Studios.  Portions created by Eric J. Bowersox are
-    Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
+    Copyright (C) 2001-03 Eric J. Bowersox/Silverwrist Design Studios.  All Rights Reserved.
 
     Contributor(s): 
 -->
@@ -21,7 +21,7 @@
 
   <!-- Define the standard file appender. -->
   <appender name="STDLOG" class="org.apache.log4j.RollingFileAppender">
-    <param name="File" value="/home/erbo/code/nvx/venice.log"/>
+    <param name="File" value="@LOGDIR@/venice.log"/>
     <param name="Append" value="true"/>
     <param name="MaxFileSize" value="10MB"/>
     <param name="MaxBackupIndex" value="5"/>