From ee6a3e9057bff6e30e6deff43100bcf2bf9bfba5 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 27 Mar 2021 14:32:52 +0000
Subject: [PATCH] Anpassungen am FielHandler, Stop-Ablauf verfeinert
---
src/de/uhilger/minsrv/App.java | 99 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 31 deletions(-)
diff --git a/src/de/uhilger/minsrv/App.java b/src/de/uhilger/minsrv/App.java
index da44463..c49f385 100644
--- a/src/de/uhilger/minsrv/App.java
+++ b/src/de/uhilger/minsrv/App.java
@@ -1,21 +1,20 @@
/*
- mc2 - Mediacenter neu
- Copyright (C) 2021 Ulrich Hilger
+ mini-server - Ein minimalistischer HTTP-Server
+ Copyright (C) 2021 Ulrich Hilger
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
package de.uhilger.minsrv;
import java.io.IOException;
@@ -24,47 +23,85 @@
import java.util.logging.Logger;
/**
+ * Die Hauptklasse des mini-server
*
- * @author ulrich
+ * @author Ulrich Hilger
* @version 0.1, 25.03.2021
*/
public class App {
private static final Logger logger = Logger.getLogger(App.class.getName());
-
+
public static final String IP_PORT = "port";
public static final String IP_WWW_DATA = "www-data";
-
- private static HashMap initParams;
-
+ public static final String IP_CTX = "ctx";
+
+ private static HashMap initParams;
+
/**
- * @param args the command line arguments
+ * Start-Methode dieser Anwendung
+ *
+ * Folgende Kommandozeilenparameter werden verarbeitet ctx - Kontext des
+ * Servers www-data - lokales Datenverzeichnis port - Port
+ *
+ * Beispiel: java -jar mini-server.jar ctx="srv" www-data="/home/fred/www"
+ * port=9090
+ *
+ * Startet den Server auf http://localhost:9090/srv und liefert Inhalte aus
+ * dem Verzeichnis /home/fred/www aus.
+ *
+ * Ein Aufruf von http://localhost:9090/srv/pfad/zum/inhalt/index.html liefert
+ * also die Datei 'index.html' aus dem Ordner /home/fred/www/pfad/zum/inhalt
+ * aus.
+ *
+ * @param args Kommandozeilenparameter
*/
public static void main(String[] args) {
initParams = new HashMap();
- for(String arg: args) {
+ for (String arg : args) {
String[] argParts = arg.split("=");
initParams.put(argParts[0], argParts[1]);
}
-
- Server server = new Server(Integer.parseInt(getInitParameter(IP_PORT)));
- try {
- server.start();
- } catch (IOException ex) {
- Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex);
+
+ String portStr = getInitParameter(IP_PORT);
+ if (portStr != null) {
+ Server server = new Server(Integer.parseInt(portStr));
+ try {
+ String ctxName = getInitParameter(IP_CTX);
+ if (ctxName != null) {
+ server.setContextName(ctxName);
+ server.start();
+ } else {
+ logger.severe("Der Parameter " + IP_CTX + " muss angegeben werden.");
+ }
+ } catch (IOException ex) {
+ Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ } else {
+ logger.severe("Der Parameter " + IP_PORT + " muss angegeben werden.");
}
}
-
+
+ /**
+ * Diese Anwendung stoppen
+ */
public static void stop() {
System.exit(0);
}
-
+
+ /**
+ * Einen Kommandozeilenparameter ermitteln
+ *
+ * @param pname Names des Parameters
+ * @return Inhalt des Parameters oder null, wenn der Parameter nicht gefunden
+ * wurde
+ */
public static String getInitParameter(String pname) {
String param = null;
Object o = initParams.get(pname);
- if(o != null) {
+ if (o != null) {
param = o.toString();
}
return param;
- }
+ }
}
--
Gitblit v1.9.3