Merge branch 'master' of https://github.com/matte21/CalcM.git

diriki · diriki · commit 48329ef0c38a · 2018-11-12T02:35:33.000+01:00
Conflicts:
	QueryWebServer/src/main/java/query/server/handlers/IndexHandler.java
	QueryWebServer/src/main/java/query/server/launcher/Main.java
diff --git a/QueryWebServer/src/main/java/query/server/handlers/IndexHandler.java b/QueryWebServer/src/main/java/query/server/handlers/IndexHandler.java
@@ -36,7 +36,7 @@ public class IndexHandler extends SIBFacingHandler {
 	// its execution environment, which might change in the future. It should be the opposite: the src code
 	// should make an assumption on how the files will be organized in its execution environment, and the
 	// build/deploy scripts should make those assumptions true. Currently the opposite is happening. 
-	private final static String HTML_TEMPLATE_PATH = "../QueryWebServer/src/main/resources/indexTemplate.html";
+	private final static String HTML_TEMPLATE_PATH = "../QueryWebServer/src/main/resources/indexTemplate.html".replace('/',File.separatorChar);
 	private final static String OPEN_ROOMS_DISPLAYER_ID = "open_rooms_table";
 	private final static String CLOSED_ROOMS_DISPLAYER_ID = "closed_rooms_table";
 	
diff --git a/QueryWebServer/src/main/java/query/server/launcher/Main.java b/QueryWebServer/src/main/java/query/server/launcher/Main.java
@@ -1,19 +1,14 @@
 package query.server.launcher;
 
 import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.studyroom.web.WebServer;
-
-import fi.iki.elonen.router.RouterNanoHTTPD.StaticPageHandler;
-import query.server.handlers.FiltersHandler;
+import java.util.*;
+import fi.iki.elonen.router.RouterNanoHTTPD.*;
+import org.apache.logging.log4j.*;
+import org.studyroom.web.*;
+import query.server.handlers.*;
 import query.server.handlers.IndexHandler;
-import query.server.handlers.WsFiltersHandler;
-import query.server.utils.SibConnectionFactory;
-import query.server.utils.query.PrefixedQueryUtilsFactory;
+import query.server.utils.*;
+import query.server.utils.query.*;
 
 
 public class Main {
diff --git a/QueryWebServer/src/main/resources/indexTemplate.html b/QueryWebServer/src/main/resources/indexTemplate.html
@@ -4,8 +4,8 @@
 <head>
   <meta charset="utf-8">
   <meta name="description" content="All study rooms divided by state (open vs closed).">
-  <link rel="stylesheet" href="queryWebServer/src/main/resources/styles.css">
-  <script type="text/javascript" src="queryWebServer/src/main/resources/script.js"></script>
+  <link rel="stylesheet" href="../QueryWebServer/src/main/resources/styles.css">
+  <script type="text/javascript" src="../QueryWebServer/src/main/resources/script.js"></script>
   <title>Study rooms</title>
 </head>
 
diff --git a/RoomStateManager/build/libs/RoomStateManager.jar b/RoomStateManager/build/libs/RoomStateManager.jar
