Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.i2p

2021-07-14 15:34:45 -04:00
parent 187ebf4c4a 1e7b13db66
commit f40eff6b7e
10 changed files with 22 additions and 311 deletions
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -31,6 +31,7 @@ import java.util.Properties;
 import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import static net.i2p.app.ClientAppState.*;
+import net.i2p.servlet.filters.XI2PLocationFilter;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.PortMapper;
--- a/apps/jetty/java/src/net/i2p/servlet/filters/XI2PLocationFilter.java
+++ b/apps/jetty/java/src/net/i2p/servlet/filters/XI2PLocationFilter.java
@@ -1,4 +1,4 @@
-package net.i2p.jetty;
+package net.i2p.servlet.filters;

 import java.io.IOException;
 import java.io.File;