Mercurial > hg > human-echolocation-java-webapp

changeset 24:97711e9cc433

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted the classes folder to its original location (WEB-INF/classes)
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Fri, 06 Dec 2013 13:14:55 +0000
parents 73a60617e1a7
children 0d53c4d80b73
files build.xml build/log4j.properties build/myapp.properties webapp/WEB-INF/classes/log4j.properties webapp/WEB-INF/classes/myapp.properties
diffstat 5 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/build.xml	Fri Dec 06 12:51:59 2013 +0000
+++ b/build.xml	Fri Dec 06 13:14:55 2013 +0000
@@ -8,7 +8,7 @@
   <property name="matlab-build" location="scratch"/>
   <property name="lib" location="webapp/WEB-INF/lib"/>
   <property name="src" location="src"/>
-  <property name="classes" location="build"/>
+  <property name="classes" location="webapp/WEB-INF/classes"/>
   <property name="web.dir" location="webapp"/>
   <property name="war.file"  location="echoapp.war"/>
 
--- a/build/log4j.properties	Fri Dec 06 12:51:59 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=${appRootPath}WEB-INF/logs/EchoWebApp.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1} - %m%n
-log4j.appender.file.append=true
-
-# log levels
-log4j.rootCategory=ALL, file
-log4j.logger.com.saral=debug
-log4j.logger.org.eclipse=debug
\ No newline at end of file
--- a/build/myapp.properties	Fri Dec 06 12:51:59 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-tmpdir=/tmp
-outdir=/tmp
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/WEB-INF/classes/log4j.properties	Fri Dec 06 13:14:55 2013 +0000
@@ -0,0 +1,10 @@
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=${appRootPath}WEB-INF/logs/EchoWebApp.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1} - %m%n
+log4j.appender.file.append=true
+
+# log levels
+log4j.rootCategory=ALL, file
+log4j.logger.com.saral=debug
+log4j.logger.org.eclipse=debug
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/WEB-INF/classes/myapp.properties	Fri Dec 06 13:14:55 2013 +0000
@@ -0,0 +1,2 @@
+tmpdir=/tmp
+outdir=/tmp
\ No newline at end of file