Merge branch 'main' into lang_de

3 years ago · c25316d268
6 changed files with 42 additions and 4 deletions
--- a/21
+++ b/21
@ -0,0 +1,21 @@
				@@ -0,0 +1,21 @@
+FROM alpine:3.15
+MAINTAINER Stephan Richter <s.richter@srsoftware.de>
+
+RUN apk add --no-cache --update bash git maven openjdk17
+
+# get the sources
+RUN git clone https://git.srsoftware.de/StephanRichter/Widerhall.git
+WORKDIR Widerhall
+
+# compile
+RUN mvn --no-transfer-progress clean test compile assembly:single
+RUN ln -s target/*.jar widerhall.jar
+
+# configure
+RUN mkdir /data
+RUN echo '{"locations":{"database":"/data/widerhall.sqlite3","configuration":"/data/widerhall.config.json","archive":"/data/archive","base":"/Widerhall"}}' > config/config.json
+
+# get JQUERY
+RUN wget https://code.jquery.com/jquery-3.6.0.min.js -O static/jquery-3.6.0.min.js
+
+CMD java -jar widerhall.jar
--- a/pom.xml
+++ b/pom.xml
@ -6,17 +6,32 @@
				@@ -6,17 +6,32 @@

    <groupId>org.example</groupId>
    <artifactId>Widerhall</artifactId>
-    <version>0.2.3</version>
+    <version>0.2.8</version>
    <build>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
                <configuration>
                    <source>16</source>
                    <target>16</target>
                </configuration>
            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>de.srsoftware.widerhall.Application</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
        </plugins>
    </build>

--- a/src/main/java/de/srsoftware/widerhall/Configuration.java
+++ b/src/main/java/de/srsoftware/widerhall/Configuration.java
@ -33,6 +33,7 @@ public class Configuration {
				@@ -33,6 +33,7 @@ public class Configuration {
    public Configuration load(File file) {
        this.file = file;
        if (file.exists()) try {
+            LOG.info("Loading configuration from {}",file);
            var newVals = (JSONObject) new JSONParser().parse(Files.readString(file.toPath()));
            data.putAll(newVals);
        } catch (ParseException | IOException e){
--- a/src/test/java/de/srsoftware/widerhall/data/DatabaseTest.java
+++ b/src/test/java/de/srsoftware/widerhall/data/DatabaseTest.java
@ -54,4 +54,4 @@ public class DatabaseTest extends TestCase {
				@@ -54,4 +54,4 @@ public class DatabaseTest extends TestCase {
        assertEquals("UPDATE Test SET x = 5",Database.open().update("Test").set("x",5).compile().toString());
        assertEquals("UPDATE Test SET x = 5, y = 6",Database.open().update("Test").set("x",5).set("y",6).compile().toString());
    }
-}
+}
--- a/static/templates/css.st
+++ b/static/templates/css.st
@ -3,7 +3,8 @@ label {
				@@ -3,7 +3,8 @@ label {
    margin: 5px 0;
 }

-#login form {
+#login form,
+#register form{
    width: 450px;
    margin: 0 auto;
 }
--- a/static/templates/register.st
+++ b/static/templates/register.st
@ -6,7 +6,7 @@
				@@ -6,7 +6,7 @@
        <script src="js"></script>
        <link rel="stylesheet" href="css" />
    </head>
-    <body>
+    <body id="register">
        «navigation()»
        «userinfo()»
        <h1>Widerhall Nutzer-Registrierung</h1>