From 14baa3d66139d96ace578e4bb0112f7b412eebf1 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 04 Apr 2021 14:47:07 +0000
Subject: [PATCH] UI weiter in Arbeit
---
www/ui/hamburger.css | 0
www/ui/app-menu.css | 0
www/ui/data/menu/hauptmenue.json | 0
www/ui/data/tpl/app-menu.tpl | 0
www/ui/js/app.js | 0
www/ui/index.html | 0
www/ui/data/menu/untermenue-1.json | 0
www/ui/app.css | 0
src/mediaz_de_DE.properties | 10 +++++-----
www/ui/data/tpl/dlg-info.tpl | 0
src/de/uhilger/mediaz/Server.java | 13 +++++++------
www/ui/data/menu/untermenue-2.json | 0
www/ui/js/app-menu.js | 0
13 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/de/uhilger/mediaz/Server.java b/src/de/uhilger/mediaz/Server.java
index 4bc3286..7fbef25 100644
--- a/src/de/uhilger/mediaz/Server.java
+++ b/src/de/uhilger/mediaz/Server.java
@@ -42,7 +42,7 @@
public static final String RB_SERVER_START_MSG = "msgServerStart";
public static final String RB_WEBROOT = "webroot";
- public static final String RB_UI_ROOT = "uiroot";
+ //public static final String RB_UI_ROOT = "uiroot";
public static final String RB_STOP_SERVER = "stopServer";
public static final String RB_ABLAGE_TEST = "testAblage";
public static final String RB_STORE_TEST = "testStore";
@@ -93,13 +93,14 @@
public void start() throws IOException {
logger.log(Level.INFO, App.getRs(RB_SERVER_START_MSG), Integer.toString(port));
- String ui = App.getInitParameter(App.getRs(App.RB_AP_UI));
-
- File uiDir = new File(ui);
+ String wwwData = App.getInitParameter(App.getRs(App.RB_AP_WWW_DATA));
+ File wwwDir = new File(wwwData);
+ //String ui = App.getInitParameter(App.getRs(App.RB_AP_UI));
+ //File uiDir = new File(ui);
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
- server.createContext(ctx + App.getRs(RB_WEBROOT), new FileHandler(App.getInitParameter(App.getRs(App.RB_AP_WWW_DATA))));
- server.createContext(ctx + App.getRs(RB_UI_ROOT), new FileHandler(uiDir.getAbsolutePath()));
+ server.createContext(ctx + App.getRs(RB_WEBROOT), new FileHandler(wwwDir.getAbsolutePath()));
+ //server.createContext(ctx + App.getRs(RB_UI_ROOT), new FileHandler(uiDir.getAbsolutePath()));
server.createContext(ctx + App.getRs(RB_STOP_SERVER), new StopServerHandler());
server.createContext(ctx + App.getRs(RB_ABLAGE_TEST), new AblageTestHandler());
server.createContext(ctx + App.getRs(RB_STORE_TEST), new StoreTestHandler());
diff --git a/src/mediaz_de_DE.properties b/src/mediaz_de_DE.properties
index 5f0d59a..b8e6f6f 100644
--- a/src/mediaz_de_DE.properties
+++ b/src/mediaz_de_DE.properties
@@ -6,12 +6,12 @@
appParamCtx=ctx
appParamUi=ui
-# API-Endpunkte
+# HTTP-Endpunkte
webroot=/
-uiroot=/ui
-stopServer=/server/stop
-testAblage=/test/ablage
-testStore=/test/store
+# uiroot=/ui
+stopServer=/api/server/stop
+testAblage=/api/test/ablage
+testStore=/api/test/store
slash=/
dash=-
diff --git a/ui/app-menu.css b/www/ui/app-menu.css
similarity index 100%
rename from ui/app-menu.css
rename to www/ui/app-menu.css
diff --git a/ui/app.css b/www/ui/app.css
similarity index 100%
rename from ui/app.css
rename to www/ui/app.css
diff --git a/ui/data/menu/hauptmenue.json b/www/ui/data/menu/hauptmenue.json
similarity index 100%
rename from ui/data/menu/hauptmenue.json
rename to www/ui/data/menu/hauptmenue.json
diff --git a/ui/data/menu/untermenue-1.json b/www/ui/data/menu/untermenue-1.json
similarity index 100%
rename from ui/data/menu/untermenue-1.json
rename to www/ui/data/menu/untermenue-1.json
diff --git a/ui/data/menu/untermenue-2.json b/www/ui/data/menu/untermenue-2.json
similarity index 100%
rename from ui/data/menu/untermenue-2.json
rename to www/ui/data/menu/untermenue-2.json
diff --git a/ui/data/tpl/app-menu.tpl b/www/ui/data/tpl/app-menu.tpl
similarity index 100%
rename from ui/data/tpl/app-menu.tpl
rename to www/ui/data/tpl/app-menu.tpl
diff --git a/ui/data/tpl/dlg-info.tpl b/www/ui/data/tpl/dlg-info.tpl
similarity index 100%
rename from ui/data/tpl/dlg-info.tpl
rename to www/ui/data/tpl/dlg-info.tpl
diff --git a/ui/hamburger.css b/www/ui/hamburger.css
similarity index 100%
rename from ui/hamburger.css
rename to www/ui/hamburger.css
diff --git a/ui/index.html b/www/ui/index.html
similarity index 100%
rename from ui/index.html
rename to www/ui/index.html
diff --git a/ui/js/app-menu.js b/www/ui/js/app-menu.js
similarity index 100%
rename from ui/js/app-menu.js
rename to www/ui/js/app-menu.js
diff --git a/ui/js/app.js b/www/ui/js/app.js
similarity index 100%
rename from ui/js/app.js
rename to www/ui/js/app.js
--
Gitblit v1.9.3