changeset 51:ebfb3b91fb06

Various invocation fixes, plus updated isvr.jar

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebContent/WEB-INF/classes/HumanEcho.properties	Fri Feb 28 16:13:29 2014 +0000
@@ -0,0 +1,1 @@
+outdir=/tmp/wav

--- a/WebContent/WEB-INF/classes/log4j.properties	Fri Feb 28 15:45:47 2014 +0000
+++ b/WebContent/WEB-INF/classes/log4j.properties	Fri Feb 28 16:13:29 2014 +0000
@@ -1,5 +1,5 @@
 log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=${appRootPath}WEB-INF/logs/EchoWebApp.log
+log4j.appender.file.File=/var/log/tomcat7/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

--- a/WebContent/WEB-INF/classes/myapp.properties	Fri Feb 28 15:45:47 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-outdir=/tmp/wav

Binary file WebContent/WEB-INF/lib/isvr.jar has changed

--- a/src/HumanEchoServlet.java	Fri Feb 28 15:45:47 2014 +0000
+++ b/src/HumanEchoServlet.java	Fri Feb 28 16:13:29 2014 +0000
@@ -37,9 +37,9 @@
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
 
-	System.err.println("In init");
+	logger.info("In init");
 
-	logger.error("java.library.path is " + 
+	logger.info("java.library.path is " + 
 		     System.getProperty("java.library.path"));
 
         try {
@@ -47,13 +47,14 @@
             Properties properties = new Properties();
             properties.load
 		(Thread.currentThread().getContextClassLoader().
-		 getResourceAsStream("myapp.properties"));
+		 getResourceAsStream("HumanEcho.properties"));
 
             wavdir = properties.getProperty("outdir");
 
-	    System.err.println("WAV file directory is " + wavdir);
+	    logger.info("WAV file directory is " + wavdir);
 
-        } catch (IOException e) {
+        } catch (Exception e) {
+	    logger.error("Failed to load app properties: " + e.getMessage());
             e.printStackTrace();
         }
 
@@ -63,10 +64,13 @@
 	    long before = System.currentTimeMillis();
             echo = new HumanEcho();
 	    long after = System.currentTimeMillis();
-	    System.err.println("Created a HumanEcho object: it took " + (after - before) + " ms");
+	    logger.info("Created a HumanEcho object: it took " + (after - before) + " ms");
         } catch (MWException e) {
+	    logger.error("Failed to construct HumanEcho object: " + e.getMessage());
             e.printStackTrace();
         }
+
+	logger.info("Init completed");
     }
 
     public void destroy() {
@@ -79,7 +83,7 @@
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 
-	System.err.println("In doGet");
+	logger.info("In doGet");
 
         // todo: validate/normalise distance
         int dist = Integer.parseInt(request.getParameter("dist"));
@@ -92,17 +96,13 @@
 
         String outputfname = new String();
 
-	System.err.println("Got dist and azim");
+	logger.info("Got dist and azim");
 
         try {
 	    //!!! erch, shouldn't be creating a new one on each request as well as a global one
             echo = new HumanEcho();
 
-            logger.error("We are logging!");
-            logger.warn(System.getProperty("catalina.base"));
-
-	    System.err.println("Done some logging");
-            System.err.println(System.getProperty("catalina.base"));
+            logger.info("Property catalina.base is " + System.getProperty("catalina.base"));
 
             // Matlab structure:
             // Input = struct('dist', 0.9, 'azim', 0, 'orient', 'horz', 'dirweight', 0.2, 'outdir', '/tmp/wav', 'outname', 'foo.wav')
@@ -130,6 +130,7 @@
             Object[] result = echo.simulateBinauralSignals(Input);
         }
         catch(MWException e) {
+	    logger.error("Failed to calculate simulateBinauralSignals: " + e.getMessage());
             e.printStackTrace();
         }
 
@@ -155,6 +156,7 @@
                 stream.write(readBytes);
 
         } catch (IOException ioe){
+	    logger.error("Failed to read wav data: " + ioe.getMessage());
             throw new ServletException(ioe.getMessage( ));
         } finally {
             //close the input/output streams
@@ -165,6 +167,6 @@
                 buf.close( );
           }
 
-        logger.info("Wrote file:" + outputfname);
+        logger.info("Wrote file: " + outputfname);
     }
 }