From 10b7ba78afcff5873152b5eac13bfe1657585c41 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 8 Apr 2010 18:50:22 +0000
Subject: [PATCH] NIHVIVO-324 merge revision 4690 into trunk

---
 webapp/build.xml                       | 9 ---------
 webapp/config/default.log4j.properties | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/webapp/build.xml b/webapp/build.xml
index 298f72ac5..0e2314611 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -27,15 +27,6 @@
 	<dirname property="vitroCore.basedir" file="${ant.file.vitroCore}" />
 	<property name="webapp.dir" location="${vitroCore.basedir}" />
 
-	<!--
-		The log file names will be prefixed with the project name, if this is
-		called from a Product build script.
-	-->
-	<condition property="logfile.prefix" value="">
-		<equals arg1="${ant.file.vitroCore}" arg2="${ant.file}" />
-	</condition>
-	<property name="logfile.prefix" value="${ant.project.name}." />
-
 
 
 	<!-- - - - - - - - - - - - - - - - - - 
diff --git a/webapp/config/default.log4j.properties b/webapp/config/default.log4j.properties
index b6402ee20..802c5c656 100644
--- a/webapp/config/default.log4j.properties
+++ b/webapp/config/default.log4j.properties
@@ -21,7 +21,7 @@
 # http://logging.apache.org/log4j/1.2/manual.html
  
 log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender 
-log4j.appender.AllAppender.File= ${tomcat.home}/logs/${logfile.prefix}vitro.all.log
+log4j.appender.AllAppender.File= ${tomcat.home}/logs/${webapp.name}.all.log
 log4j.appender.AllAppender.MaxFileSize=10MB 
 log4j.appender.AllAppender.MaxBackupIndex=10 
 log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout