From dfd3cff5a2f00fbbaadcc104d6402970fc3c00e2 Mon Sep 17 00:00:00 2001 From: Lukas-Heiligenbrunner Date: Fri, 11 Oct 2019 11:17:06 +0200 Subject: [PATCH] moved website folder --- .idea/$PRODUCT_WORKSPACE_FILE$ | 41 ++++++ .idea/.gitignore | 4 + .idea/artifacts/WasteinformationServer.xml | 11 ++ .../mysql_connector_java_5_1_44_bin.xml | 9 ++ .../org_eclipse_paho_client_mqttv3_1_2_1.xml | 9 ++ .idea/misc.xml | 6 + .idea/modules.xml | 8 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++++ .idea/vcs.xml | 6 + UniquedeviceID-tcp19216864151883/.lck | 0 UniquedeviceID-tcp19216865151883/.lck | 0 WasteInformationServer.iml | 1 + lib/mysql-connector-java-5.1.44-bin.jar | Bin 999635 -> 997970 bytes lib/org.eclipse.paho.client.mqttv3-1.2.1.jar | Bin 237778 -> 224076 bytes .../wwwroot}/css/general.css | 0 {wwwroot => resources/wwwroot}/css/index.css | 0 .../wwwroot}/css/profile.css | 0 .../wwwroot}/css/register.css | 0 .../wwwroot}/css/settings.css | 0 {wwwroot => resources/wwwroot}/index.html | 0 {wwwroot => resources/wwwroot}/js/index.js | 0 {wwwroot => resources/wwwroot}/js/profile.js | 0 {wwwroot => resources/wwwroot}/js/register.js | 0 {wwwroot => resources/wwwroot}/js/settings.js | 0 .../wwwroot}/lib/bootstrap.min.css | 0 .../wwwroot}/lib/bootstrap.min.js | 0 .../wwwroot}/lib/jquery.min.js | 0 .../wwwroot}/lib/popper.min.js | 0 {wwwroot => resources/wwwroot}/profile.html | 0 {wwwroot => resources/wwwroot}/register.html | 0 {wwwroot => resources/wwwroot}/rsc/login.jpg | Bin {wwwroot => resources/wwwroot}/rsc/login2.jpg | Bin {wwwroot => resources/wwwroot}/settings.html | 0 src/com/wasteinformationserver/db/jdcb.java | 2 - src/com/wasteinformationserver/main.java | 12 +- .../website/CheckLoginState.java | 1 - .../website/LoginRequest.java | 1 - .../website/MainPage.java | 17 ++- .../{db => website}/PostRequest.java | 2 +- .../website/RegisterRequest.java | 1 - .../website/Webserver.java | 3 - 41 files changed, 237 insertions(+), 21 deletions(-) create mode 100644 .idea/$PRODUCT_WORKSPACE_FILE$ create mode 100644 .idea/.gitignore create mode 100644 .idea/artifacts/WasteinformationServer.xml create mode 100644 .idea/libraries/mysql_connector_java_5_1_44_bin.xml create mode 100644 .idea/libraries/org_eclipse_paho_client_mqttv3_1_2_1.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml delete mode 100644 UniquedeviceID-tcp19216864151883/.lck delete mode 100644 UniquedeviceID-tcp19216865151883/.lck mode change 100755 => 100644 lib/mysql-connector-java-5.1.44-bin.jar rename {wwwroot => resources/wwwroot}/css/general.css (100%) rename {wwwroot => resources/wwwroot}/css/index.css (100%) rename {wwwroot => resources/wwwroot}/css/profile.css (100%) rename {wwwroot => resources/wwwroot}/css/register.css (100%) rename {wwwroot => resources/wwwroot}/css/settings.css (100%) rename {wwwroot => resources/wwwroot}/index.html (100%) rename {wwwroot => resources/wwwroot}/js/index.js (100%) rename {wwwroot => resources/wwwroot}/js/profile.js (100%) rename {wwwroot => resources/wwwroot}/js/register.js (100%) rename {wwwroot => resources/wwwroot}/js/settings.js (100%) rename {wwwroot => resources/wwwroot}/lib/bootstrap.min.css (100%) rename {wwwroot => resources/wwwroot}/lib/bootstrap.min.js (100%) rename {wwwroot => resources/wwwroot}/lib/jquery.min.js (100%) rename {wwwroot => resources/wwwroot}/lib/popper.min.js (100%) rename {wwwroot => resources/wwwroot}/profile.html (100%) rename {wwwroot => resources/wwwroot}/register.html (100%) rename {wwwroot => resources/wwwroot}/rsc/login.jpg (100%) rename {wwwroot => resources/wwwroot}/rsc/login2.jpg (100%) rename {wwwroot => resources/wwwroot}/settings.html (100%) rename src/com/wasteinformationserver/{db => website}/PostRequest.java (96%) diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$ new file mode 100644 index 0000000..d4d7d1e --- /dev/null +++ b/.idea/$PRODUCT_WORKSPACE_FILE$ @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + 1.8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..f22d961 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,4 @@ +# Default ignored files +/workspace.xml +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/artifacts/WasteinformationServer.xml b/.idea/artifacts/WasteinformationServer.xml new file mode 100644 index 0000000..99a538f --- /dev/null +++ b/.idea/artifacts/WasteinformationServer.xml @@ -0,0 +1,11 @@ + + + $PROJECT_DIR$/out/artifacts/WasteinformationServer + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/mysql_connector_java_5_1_44_bin.xml b/.idea/libraries/mysql_connector_java_5_1_44_bin.xml new file mode 100644 index 0000000..6bd402f --- /dev/null +++ b/.idea/libraries/mysql_connector_java_5_1_44_bin.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/org_eclipse_paho_client_mqttv3_1_2_1.xml b/.idea/libraries/org_eclipse_paho_client_mqttv3_1_2_1.xml new file mode 100644 index 0000000..17e7282 --- /dev/null +++ b/.idea/libraries/org_eclipse_paho_client_mqttv3_1_2_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5d79e0 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..08a8ba5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/UniquedeviceID-tcp19216864151883/.lck b/UniquedeviceID-tcp19216864151883/.lck deleted file mode 100644 index e69de29..0000000 diff --git a/UniquedeviceID-tcp19216865151883/.lck b/UniquedeviceID-tcp19216865151883/.lck deleted file mode 100644 index e69de29..0000000 diff --git a/WasteInformationServer.iml b/WasteInformationServer.iml index 8bd06b5..5c65772 100644 --- a/WasteInformationServer.iml +++ b/WasteInformationServer.iml @@ -4,6 +4,7 @@ + diff --git a/lib/mysql-connector-java-5.1.44-bin.jar b/lib/mysql-connector-java-5.1.44-bin.jar old mode 100755 new mode 100644 index 2f2e32d51be8f2a3a97e64ef38a1864e97dc4645..cf69f4d24441687a01168051b6017e87f7380d25 GIT binary patch delta 6650 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 Qf*e8K8a+MBA{NpA0rna&?EnA( diff --git a/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar b/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar index fe620738d611782e06ab63dd72caeb47930a712f..e0174839917b4638e021efbeb7f1709b959b2bac 100644 GIT binary patch delta 15371 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 A6951J delta 30227 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 diff --git a/wwwroot/css/general.css b/resources/wwwroot/css/general.css similarity index 100% rename from wwwroot/css/general.css rename to resources/wwwroot/css/general.css diff --git a/wwwroot/css/index.css b/resources/wwwroot/css/index.css similarity index 100% rename from wwwroot/css/index.css rename to resources/wwwroot/css/index.css diff --git a/wwwroot/css/profile.css b/resources/wwwroot/css/profile.css similarity index 100% rename from wwwroot/css/profile.css rename to resources/wwwroot/css/profile.css diff --git a/wwwroot/css/register.css b/resources/wwwroot/css/register.css similarity index 100% rename from wwwroot/css/register.css rename to resources/wwwroot/css/register.css diff --git a/wwwroot/css/settings.css b/resources/wwwroot/css/settings.css similarity index 100% rename from wwwroot/css/settings.css rename to resources/wwwroot/css/settings.css diff --git a/wwwroot/index.html b/resources/wwwroot/index.html similarity index 100% rename from wwwroot/index.html rename to resources/wwwroot/index.html diff --git a/wwwroot/js/index.js b/resources/wwwroot/js/index.js similarity index 100% rename from wwwroot/js/index.js rename to resources/wwwroot/js/index.js diff --git a/wwwroot/js/profile.js b/resources/wwwroot/js/profile.js similarity index 100% rename from wwwroot/js/profile.js rename to resources/wwwroot/js/profile.js diff --git a/wwwroot/js/register.js b/resources/wwwroot/js/register.js similarity index 100% rename from wwwroot/js/register.js rename to resources/wwwroot/js/register.js diff --git a/wwwroot/js/settings.js b/resources/wwwroot/js/settings.js similarity index 100% rename from wwwroot/js/settings.js rename to resources/wwwroot/js/settings.js diff --git a/wwwroot/lib/bootstrap.min.css b/resources/wwwroot/lib/bootstrap.min.css similarity index 100% rename from wwwroot/lib/bootstrap.min.css rename to resources/wwwroot/lib/bootstrap.min.css diff --git a/wwwroot/lib/bootstrap.min.js b/resources/wwwroot/lib/bootstrap.min.js similarity index 100% rename from wwwroot/lib/bootstrap.min.js rename to resources/wwwroot/lib/bootstrap.min.js diff --git a/wwwroot/lib/jquery.min.js b/resources/wwwroot/lib/jquery.min.js similarity index 100% rename from wwwroot/lib/jquery.min.js rename to resources/wwwroot/lib/jquery.min.js diff --git a/wwwroot/lib/popper.min.js b/resources/wwwroot/lib/popper.min.js similarity index 100% rename from wwwroot/lib/popper.min.js rename to resources/wwwroot/lib/popper.min.js diff --git a/wwwroot/profile.html b/resources/wwwroot/profile.html similarity index 100% rename from wwwroot/profile.html rename to resources/wwwroot/profile.html diff --git a/wwwroot/register.html b/resources/wwwroot/register.html similarity index 100% rename from wwwroot/register.html rename to resources/wwwroot/register.html diff --git a/wwwroot/rsc/login.jpg b/resources/wwwroot/rsc/login.jpg similarity index 100% rename from wwwroot/rsc/login.jpg rename to resources/wwwroot/rsc/login.jpg diff --git a/wwwroot/rsc/login2.jpg b/resources/wwwroot/rsc/login2.jpg similarity index 100% rename from wwwroot/rsc/login2.jpg rename to resources/wwwroot/rsc/login2.jpg diff --git a/wwwroot/settings.html b/resources/wwwroot/settings.html similarity index 100% rename from wwwroot/settings.html rename to resources/wwwroot/settings.html diff --git a/src/com/wasteinformationserver/db/jdcb.java b/src/com/wasteinformationserver/db/jdcb.java index 20617d3..3d73113 100644 --- a/src/com/wasteinformationserver/db/jdcb.java +++ b/src/com/wasteinformationserver/db/jdcb.java @@ -1,8 +1,6 @@ package com.wasteinformationserver.db; import com.wasteinformationserver.basicutils.Log; -import com.wasteinformationserver.db.Database; -import com.wasteinformationserver.db.MySQLConnector; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/com/wasteinformationserver/main.java b/src/com/wasteinformationserver/main.java index c98a265..8f2bfbc 100644 --- a/src/com/wasteinformationserver/main.java +++ b/src/com/wasteinformationserver/main.java @@ -1,6 +1,8 @@ package com.wasteinformationserver; +import com.wasteinformationserver.basicutils.Log; import com.wasteinformationserver.mqtt.*; +import com.wasteinformationserver.website.Webserver; public class main { public static void main(String[] args) { @@ -10,7 +12,7 @@ public class main { D.printList(); */ - /* Runtime.getRuntime().addShutdownHook(new Thread(() -> { + Runtime.getRuntime().addShutdownHook(new Thread(() -> { try { Thread.sleep(200); Log.warning("Shutting down ..."); @@ -24,11 +26,11 @@ public class main { Thread mythread = new Thread(() -> new Webserver().startserver()); mythread.start(); - Log.message("thread started");*/ + Log.message("thread started"); - mqtt m = new mqtt(); - m.notifymessage(); - m.getDatabasedata(); +// mqtt m = new mqtt(); +// m.notifymessage(); +// m.getDatabasedata(); } } diff --git a/src/com/wasteinformationserver/website/CheckLoginState.java b/src/com/wasteinformationserver/website/CheckLoginState.java index 8021dba..0f299a1 100644 --- a/src/com/wasteinformationserver/website/CheckLoginState.java +++ b/src/com/wasteinformationserver/website/CheckLoginState.java @@ -1,7 +1,6 @@ package com.wasteinformationserver.website; import com.wasteinformationserver.basicutils.Log; -import com.wasteinformationserver.db.PostRequest; import java.util.HashMap; diff --git a/src/com/wasteinformationserver/website/LoginRequest.java b/src/com/wasteinformationserver/website/LoginRequest.java index 44aac5c..93b0fea 100644 --- a/src/com/wasteinformationserver/website/LoginRequest.java +++ b/src/com/wasteinformationserver/website/LoginRequest.java @@ -1,6 +1,5 @@ package com.wasteinformationserver.website; -import com.wasteinformationserver.db.PostRequest; import com.wasteinformationserver.db.jdcb; import java.sql.ResultSet; diff --git a/src/com/wasteinformationserver/website/MainPage.java b/src/com/wasteinformationserver/website/MainPage.java index c727ab8..3597c4c 100644 --- a/src/com/wasteinformationserver/website/MainPage.java +++ b/src/com/wasteinformationserver/website/MainPage.java @@ -5,11 +5,10 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.wasteinformationserver.basicutils.Log; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.awt.*; +import java.io.*; import java.net.URI; +import java.net.URL; public class MainPage implements HttpHandler { @Override @@ -25,9 +24,13 @@ public class MainPage implements HttpHandler { } Log.message("looking for: " + root + path); - File file = new File(root + path).getCanonicalFile(); - if (!file.isFile()) { +// File file = new File(getClass().getResource("/wwwroot"+path).getFile()).getCanonicalFile(); + InputStream fs = getClass().getResourceAsStream("/wwwroot"+path); + +// File file = new File(root + path).getCanonicalFile(); + + if (fs.available() < 1) { // Object does not exist or is not a file: reject with 404 error. String response = "404 (Not Found)\n"; t.sendResponseHeaders(404, response.length()); @@ -45,7 +48,7 @@ public class MainPage implements HttpHandler { t.sendResponseHeaders(200, 0); OutputStream os = t.getResponseBody(); - FileInputStream fs = new FileInputStream(file); +// FileInputStream fs = new FileInputStream(file); final byte[] buffer = new byte[0x10000]; int count; while ((count = fs.read(buffer)) >= 0) { diff --git a/src/com/wasteinformationserver/db/PostRequest.java b/src/com/wasteinformationserver/website/PostRequest.java similarity index 96% rename from src/com/wasteinformationserver/db/PostRequest.java rename to src/com/wasteinformationserver/website/PostRequest.java index 35331d1..9ad4e46 100644 --- a/src/com/wasteinformationserver/db/PostRequest.java +++ b/src/com/wasteinformationserver/website/PostRequest.java @@ -1,4 +1,4 @@ -package com.wasteinformationserver.db; +package com.wasteinformationserver.website; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/src/com/wasteinformationserver/website/RegisterRequest.java b/src/com/wasteinformationserver/website/RegisterRequest.java index dc00441..ff36055 100644 --- a/src/com/wasteinformationserver/website/RegisterRequest.java +++ b/src/com/wasteinformationserver/website/RegisterRequest.java @@ -1,6 +1,5 @@ package com.wasteinformationserver.website; -import com.wasteinformationserver.db.PostRequest; import com.wasteinformationserver.db.jdcb; import java.util.HashMap; diff --git a/src/com/wasteinformationserver/website/Webserver.java b/src/com/wasteinformationserver/website/Webserver.java index fd052da..3180afb 100644 --- a/src/com/wasteinformationserver/website/Webserver.java +++ b/src/com/wasteinformationserver/website/Webserver.java @@ -4,7 +4,6 @@ import com.sun.net.httpserver.HttpServer; import com.wasteinformationserver.basicutils.Log; import java.io.IOException; - import java.net.InetSocketAddress; @@ -28,6 +27,4 @@ public class Webserver { Log.info("Server available at http://127.0.0.1:8000 now"); } - - }