|
1
|
=== modified file 'build.xml'
|
|
2
|
--- build.xml 2017-07-17 09:41:37 +0000
|
|
3
|
+++ build.xml 2017-07-19 05:47:00 +0000
|
|
4
|
@@ -649,13 +649,18 @@
|
|
5
|
<fileset dir="${src.home}" includes="**/admin_login.html" />
|
|
6
|
</copy>
|
|
7
|
|
|
8
|
- <!-- Copy index.html file from src to a location in build -->
|
|
9
|
- <copy todir="${build.home}/classes">
|
|
10
|
- <fileset dir="${src.home}" includes="**/index.html" />
|
|
11
|
- <fileset dir="${src.home}" includes="**/web_client.html" />
|
|
12
|
- <fileset dir="${src.home}" includes="**/p2j*.js" />
|
|
13
|
- <fileset dir="${src.home}" includes="**/beep.*" />
|
|
14
|
- </copy>
|
|
15
|
+ <!-- Copy index.html file from src to a location in build -->
|
|
16
|
+ <copy todir="${build.home}/classes">
|
|
17
|
+ <fileset dir="${src.home}" includes="**/index.html" />
|
|
18
|
+ <fileset dir="${src.home}" includes="**/web_client.html" />
|
|
19
|
+ <fileset dir="${src.home}" includes="**/p2j*.js" />
|
|
20
|
+ <fileset dir="${src.home}" includes="**/beep.*" />
|
|
21
|
+ </copy>
|
|
22
|
+
|
|
23
|
+ <!-- Copy report web application from src to build -->
|
|
24
|
+ <copy todir="${build.home}/classes">
|
|
25
|
+ <fileset dir="${src.home}" includes="**/report/web/res/**/*" />
|
|
26
|
+ </copy>
|
|
27
|
|
|
28
|
<!-- Copy rules/ from src to equivalent location in build -->
|
|
29
|
<copy todir="${build.home}/classes">
|
|
30
|
|
|
31
|
=== modified file 'src/com/goldencode/p2j/report/server/ReportWebServer.java'
|
|
32
|
--- src/com/goldencode/p2j/report/server/ReportWebServer.java 2017-07-01 17:27:12 +0000
|
|
33
|
+++ src/com/goldencode/p2j/report/server/ReportWebServer.java 2017-07-19 05:47:00 +0000
|
|
34
|
@@ -63,8 +63,12 @@
|
|
35
|
package com.goldencode.p2j.report.server;
|
|
36
|
|
|
37
|
import java.util.logging.*;
|
|
38
|
+
|
|
39
|
import org.eclipse.jetty.server.handler.*;
|
|
40
|
+import org.eclipse.jetty.util.resource.Resource;
|
|
41
|
+
|
|
42
|
import com.goldencode.p2j.cfg.*;
|
|
43
|
+import com.goldencode.p2j.ui.client.driver.web.EmbeddedWebServerImpl;
|
|
44
|
import com.goldencode.p2j.web.*;
|
|
45
|
|
|
46
|
/**
|
|
47
|
@@ -102,11 +106,17 @@
|
|
48
|
|
|
49
|
// static content handler
|
|
50
|
// TODO: read from jar instead of file system
|
|
51
|
- ResourceHandler commonRes = new ResourceHandler();
|
|
52
|
- commonRes.setDirectoriesListed(true);
|
|
53
|
- commonRes.setWelcomeFiles(new String[] { "index.html" });
|
|
54
|
- commonRes.setResourceBase("../../p2j/src/com/goldencode/p2j/report/web/res/");
|
|
55
|
- addHandler(commonRes);
|
|
56
|
+
|
|
57
|
+ ResourceHandler rootHandler = new ResourceHandler();
|
|
58
|
+ rootHandler.setDirectoriesListed(false);
|
|
59
|
+ rootHandler.setWelcomeFiles(new String[] {"index.html"});
|
|
60
|
+
|
|
61
|
+ ContextHandler rootContext = new ContextHandler();
|
|
62
|
+ rootContext.setContextPath("/");
|
|
63
|
+ rootContext.setBaseResource(Resource.newClassPathResource("com/goldencode/p2j/report/web/res"));
|
|
64
|
+ rootContext.setHandler(rootHandler);
|
|
65
|
+
|
|
66
|
+ addHandler(rootContext);
|
|
67
|
|
|
68
|
addHandler(new DojoToolkitHandler());
|
|
69
|
|
|
70
|
|