Skip to content

Commit 69b39d2

Browse files
committed
executable JAR working!!!!!
1 parent 81df2cb commit 69b39d2

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

deploy/SelectOServer.jar

832 KB
Binary file not shown.

src/com/danlangford/selectoserve/CheckInServlet.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ protected void doGet(HttpServletRequest request,
2222
String name = request.getParameter("name");
2323
response.setContentType("text/html");
2424
response.setStatus(HttpServletResponse.SC_OK);
25-
response.getWriter().println("<h1>" + "checked in" + "</h1>");
25+
response.getWriter().println("<h1>" + "checking in" + "</h1>");
2626

2727
if (ip != null && name != null) {
2828
dataStore.addServer(new ServingComp(ip, name));
29-
response.getWriter().println(
30-
"wrote to datastore <br/> ip=" + ip + " name=" + name);
29+
String msg = "wrote to datastore <br/> ip=" + ip + " name=" + name;
30+
response.getWriter().println(msg);
31+
System.out.println(msg);
3132
} else {
3233
response.getWriter().println("<b>sorry i got some <i>NULL</i> data</b>");
3334
}

src/com/danlangford/selectoserve/HostsServlet.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ protected void doGet(HttpServletRequest request,
2121
response.setContentType("text/html");
2222
response.setStatus(HttpServletResponse.SC_OK);
2323
response.getWriter().println("<h1>" + "? hosts greeting ?" + "</h1>");
24-
response.getWriter().println("// TODO write to hosts file and redirect <br/> ip=" + ip);
24+
25+
String msg = "// TODO write to hosts file and redirect <br/> ip=" + ip;
26+
response.getWriter().println(msg);
27+
System.out.println(msg);
2528
}
2629

2730
}

src/com/danlangford/selectoserve/SelectOServe.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ public static void main(String[] args) throws Exception {
2020
MakeShiftDataStore myDataStore = MakeShiftDataStore.getInstance();
2121

2222
Server checkIn = new Server();
23-
23+
2424
SelectChannelConnector ciConn = new SelectChannelConnector();
2525
ciConn.setPort(8181);
2626
checkIn.addConnector(ciConn);
27-
27+
28+
String ciWebDir = SelectOServe.class.getClassLoader().getResource("com/danlangford/selectoserve/files/checkIn/").toExternalForm();
2829
ResourceHandler ciStaticFiles = new ResourceHandler();
2930
ciStaticFiles.setWelcomeFiles(new String[] { "index.html" });
30-
ciStaticFiles.setResourceBase("./web/checkIn"); // <- file system
31+
ciStaticFiles.setResourceBase(ciWebDir); // <- file system
3132

3233
ServletContextHandler ciServeHand = new ServletContextHandler(
3334
ServletContextHandler.SESSIONS);
35+
//ciServeHand.setContextPath("/");
3436
CheckInServlet ciServlet = new CheckInServlet(myDataStore);
3537
ciServeHand.addServlet(new ServletHolder(ciServlet), "/checkIn"); // <- url
3638

@@ -52,12 +54,14 @@ public static void main(String[] args) throws Exception {
5254
admConn.setPort(8080);
5355
admin.addConnector(admConn);
5456

57+
String admWebDir = SelectOServe.class.getClassLoader().getResource("com/danlangford/selectoserve/files/admin/").toExternalForm();
5558
ResourceHandler admResHand = new ResourceHandler();
5659
admResHand.setWelcomeFiles(new String[] { "index.html" });
57-
admResHand.setResourceBase("./web/admin"); // <- file system
60+
admResHand.setResourceBase(admWebDir); // <- file system
5861

5962
ServletContextHandler admServeHand = new ServletContextHandler(
6063
ServletContextHandler.SESSIONS);
64+
//admServeHand.setContextPath("/");
6165
HostsServlet admServlet = new HostsServlet();
6266
admServeHand.addServlet(new ServletHolder(admServlet), "/hosts"); // <- url
6367
ListDataServlet admList = new ListDataServlet(myDataStore);

0 commit comments

Comments
 (0)