# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1386186482 0
# Node ID 33d7bd3c09909c531c4ac7a7ac3d2f24ddf28d67
# Parent  08262829d456d6413a33185837ed775d3b9cf105
Adding logging capabilities with log4j to the servlet; adding the log4j 1.2 class as well

diff -r 08262829d456 -r 33d7bd3c0990 build.xml
--- a/build.xml	Tue Dec 03 12:19:31 2013 +0000
+++ b/build.xml	Wed Dec 04 19:48:02 2013 +0000
@@ -45,7 +45,7 @@
   </target>
 
   <target name="build" depends="compile-matlab">
-    <javac srcdir="${src}" destdir="${classes}" classpath="servlet-api.jar:${lib}/javabuilder.jar:${lib}/isvr.jar" includeantruntime="false"/>
+    <javac srcdir="${src}" destdir="${classes}" classpath="servlet-api.jar:${lib}/javabuilder.jar:${lib}/isvr.jar:${lib}/log4j-1.2.17.jar" includeantruntime="false"/>
   </target>
 
   <target name="build-war" depends="build"
diff -r 08262829d456 -r 33d7bd3c0990 webapp/WEB-INF/classes/log4j.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/WEB-INF/classes/log4j.properties	Wed Dec 04 19:48:02 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
diff -r 08262829d456 -r 33d7bd3c0990 webapp/WEB-INF/lib/log4j-1.2.17.jar
Binary file webapp/WEB-INF/lib/log4j-1.2.17.jar has changed
diff -r 08262829d456 -r 33d7bd3c0990 webapp/WEB-INF/src/HumanEchoServlet.java
--- a/webapp/WEB-INF/src/HumanEchoServlet.java	Tue Dec 03 12:19:31 2013 +0000
+++ b/webapp/WEB-INF/src/HumanEchoServlet.java	Wed Dec 04 19:48:02 2013 +0000
@@ -1,7 +1,18 @@
+/*
+ * Classname
+ *
+ * Version information
+ *
+ * 3 December 2013
+ *
+ * Copyright notice
+ */
 
 import java.util.Properties;
 import java.io.IOException;
 
+import org.apache.log4j.*;
+
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -19,6 +30,8 @@
 public class HumanEchoServlet extends HttpServlet {
     private HumanEcho echo;
 
+    private static Logger logger = Logger.getLogger(HumanEchoServlet.class);
+
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
 
@@ -61,6 +74,8 @@
         try {
             echo = new HumanEcho();
 
+            logger.error("We are logging!");
+
             // Matlab structure:
             // Input = struct('dist', 0.9, 'azim', 0, 'orient', 'horz', 'dirweight', 0.2, 'outputfname', 'foo.wav')
 
diff -r 08262829d456 -r 33d7bd3c0990 webapp/WEB-INF/web.xml
--- a/webapp/WEB-INF/web.xml	Tue Dec 03 12:19:31 2013 +0000
+++ b/webapp/WEB-INF/web.xml	Wed Dec 04 19:48:02 2013 +0000
@@ -4,13 +4,26 @@
            xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
 		  http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
            version="2.5">
-
     <servlet>
         <servlet-name>HumanEchoServlet</servlet-name>
         <servlet-class>HumanEchoServlet</servlet-class>
     </servlet>
+
+    <servlet>
+      <servlet-name>log4j-init</servlet-name>
+      <servlet-class>com.AppName.servlets.Log4jInit</servlet-class>
+      <init-param>
+        <param-name>log4j-init-file</param-name>
+        <param-value>WEB-INF/classes/log4j.properties</param-value>
+      </init-param>
+      <load-on-startup>1</load-on-startup>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>HumanEchoServlet</servlet-name>
         <url-pattern>/HumanEcho</url-pattern>
     </servlet-mapping>
 </web-app>
+
+
+