diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d04db0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+target
+docker/data
+.idea
+docker/.env
diff --git a/container/pom.xml b/container/pom.xml
index 3bdf876..352b942 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -18,21 +18,30 @@
jetty-webapp
${jetty.version}
+
org.eclipse.jetty
jetty-slf4j-impl
${jetty.version}
+
+ org.eclipse.jetty
+ jetty-jndi
+ ${jetty.version}
+
+
diff --git a/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java b/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
index 4ff8536..84c5f2e 100644
--- a/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
+++ b/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
@@ -21,6 +21,7 @@ package org.jeudego.pairgoth.container;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -54,7 +55,13 @@ public class ServerMain
{
Server server = new Server(8080);
- WebAppContext context = new WebAppContext();
+ WebAppContext context = new WebAppContext() {
+ @Override
+ public boolean isServerResource(String name, URL url)
+ {
+ return super.isServerResource(name, url) || url.getFile().contains("/WEB-INF/jetty-server/");
+ }
+ };
context.setContextPath("/");
switch (getOperationalMode())
diff --git a/container/src/main/resources/jetty-logging.properties b/container/src/main/resources/jetty-logging.properties
index f82758f..d4922ad 100644
--- a/container/src/main/resources/jetty-logging.properties
+++ b/container/src/main/resources/jetty-logging.properties
@@ -1,8 +1,2 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
org.eclipse.jetty.LEVEL=INFO
-
-# Squelch noisy logging
-org.eclipse.jetty.websocket.jsr356.JsrBasicRemote.LEVEL=WARN
-
-# org.eclipse.jetty.annotations.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.LEVEL=DEBUG
diff --git a/pom.xml b/pom.xml
index c20849e..ac18925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,8 @@
4.2
4.0.4
- 1.1.2
10.0.15
- 2.0.0-alpha3
+ 2.0.7
diff --git a/webapp/pom.xml b/webapp/pom.xml
index e22c852..9b921be 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -111,7 +111,7 @@
com.republicate
webapp-slf4j-logger
- 1.6
+ 3.0
runtime