=== modified file 'build.xml'
--- build.xml	2017-07-17 09:41:37 +0000
+++ build.xml	2017-07-19 05:47:00 +0000
@@ -649,13 +649,18 @@
       <fileset dir="${src.home}" includes="**/admin_login.html" />
     </copy>
    
-    <!-- Copy index.html file from src to a location in build -->
-    <copy todir="${build.home}/classes">
-      <fileset dir="${src.home}" includes="**/index.html" />
-      <fileset dir="${src.home}" includes="**/web_client.html" />
-      <fileset dir="${src.home}" includes="**/p2j*.js" />
-      <fileset dir="${src.home}" includes="**/beep.*" />
-    </copy>
+     <!-- Copy index.html file from src to a location in build -->
+     <copy todir="${build.home}/classes">
+       <fileset dir="${src.home}" includes="**/index.html" />
+       <fileset dir="${src.home}" includes="**/web_client.html" />
+       <fileset dir="${src.home}" includes="**/p2j*.js" />
+       <fileset dir="${src.home}" includes="**/beep.*" />
+     </copy>
+     
+     <!-- Copy report web application from src to build -->
+     <copy todir="${build.home}/classes">
+       <fileset dir="${src.home}" includes="**/report/web/res/**/*" />
+     </copy>
     
     <!-- Copy rules/ from src to equivalent location in build -->
     <copy todir="${build.home}/classes">

=== modified file 'src/com/goldencode/p2j/report/server/ReportWebServer.java'
--- src/com/goldencode/p2j/report/server/ReportWebServer.java	2017-07-01 17:27:12 +0000
+++ src/com/goldencode/p2j/report/server/ReportWebServer.java	2017-07-19 05:47:00 +0000
@@ -63,8 +63,12 @@
 package com.goldencode.p2j.report.server;
 
 import java.util.logging.*;
+
 import org.eclipse.jetty.server.handler.*;
+import org.eclipse.jetty.util.resource.Resource;
+
 import com.goldencode.p2j.cfg.*;
+import com.goldencode.p2j.ui.client.driver.web.EmbeddedWebServerImpl;
 import com.goldencode.p2j.web.*;
 
 /**
@@ -102,11 +106,17 @@
       
       // static content handler
       // TODO: read from jar instead of file system
-      ResourceHandler commonRes = new ResourceHandler();
-      commonRes.setDirectoriesListed(true);
-      commonRes.setWelcomeFiles(new String[] { "index.html" });
-      commonRes.setResourceBase("../../p2j/src/com/goldencode/p2j/report/web/res/");
-      addHandler(commonRes);
+      
+      ResourceHandler rootHandler = new ResourceHandler();
+      rootHandler.setDirectoriesListed(false);
+      rootHandler.setWelcomeFiles(new String[] {"index.html"});
+      
+      ContextHandler rootContext = new ContextHandler();
+      rootContext.setContextPath("/");
+      rootContext.setBaseResource(Resource.newClassPathResource("com/goldencode/p2j/report/web/res"));
+      rootContext.setHandler(rootHandler);
+      
+      addHandler(rootContext);
       
       addHandler(new DojoToolkitHandler());