[Yanel-commits] rev 45786 - in public/yanel/trunk: conf src/build src/build/targets/webapp

[michi at wyona.com]

Author: michi
Date: 2009-12-01 21:23:43 +0100 (Tue, 01 Dec 2009)
New Revision: 45786

Modified:
   public/yanel/trunk/conf/log4j.properties
   public/yanel/trunk/src/build/build.xml
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
log4j-dir fixed

Modified: public/yanel/trunk/conf/log4j.properties
===================================================================
--- public/yanel/trunk/conf/log4j.properties	2009-12-01 20:21:42 UTC (rev 45785)
+++ public/yanel/trunk/conf/log4j.properties	2009-12-01 20:23:43 UTC (rev 45786)
@@ -20,7 +20,7 @@
 # See http://www.jguru.com/faq/view.jsp?EID=1311014
 log4j.category.Access=INFO, AA
 log4j.appender.AA=org.apache.log4j.RollingFileAppender
-log4j.appender.AA.File=@LOG4J_PATH@/access.log
+log4j.appender.AA.File=@LOG4J_DIR@/access-cnode at CNODE_ID@.log
 log4j.appender.AA.layout=org.apache.log4j.PatternLayout
 log4j.appender.AA.layout.ConversionPattern=%-4r %d [%t] %-5p %c %x - %m%n
 log4j.appender.AA.MaxFileSize=1000KB

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2009-12-01 20:21:42 UTC (rev 45785)
+++ public/yanel/trunk/src/build/build.xml	2009-12-01 20:23:43 UTC (rev 45786)
@@ -81,8 +81,15 @@
     <property name="build.dir" location="${yanel.source.home}/build"/>
     <mkdir dir="${build.dir}"/>
     <property name="classes.dir" location="${build.dir}/classes"/>
+
     <property name="log4j.path" location="${build.dir}/logs"/>
     <mkdir dir="${log4j.path}"/>
+    <path id="log4j.dir.ref">
+      <pathelement location="${log4j.path}"/>
+    </path>
+    <pathconvert targetos="unix" property="log4j.dir.forward.slashes" refid="log4j.dir.ref">
+    </pathconvert>
+
     <property name="log4j.file" location="${log4j.path}/log4j-cmdl.log"/>
     <path id="log4j.file.ref">
       <pathelement location="${log4j.file}"/>

Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-12-01 20:21:42 UTC (rev 45785)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-12-01 20:23:43 UTC (rev 45786)
@@ -136,6 +136,10 @@
     <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="${log4j.file.forward.slashes}">
       <replacetoken>@LOG4J_FILE@</replacetoken>
     </replace>
+
+    <replace file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="${log4j.dir.forward.slashes}">
+      <replacetoken>@LOG4J_DIR@</replacetoken>
+    </replace>
     <touch file="${log4j.file}"/>
   </target>