From 761affc94d2bfca3638784f2107f0b94070ae1eb Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 26 Jun 2018 18:39:39 +0000
Subject: [PATCH] Console: Move servlet to new package (ticket #2265)

---
 apps/routerconsole/java/build.xml                   |  6 +++---
 .../CodedIconRendererServlet.java                   |  2 +-
 .../src/net/i2p/router/web/servlets/package.html    | 13 +++++++++++++
 apps/routerconsole/jsp/web.xml                      |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)
 rename apps/routerconsole/java/src/net/i2p/router/web/{helpers => servlets}/CodedIconRendererServlet.java (99%)
 create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/servlets/package.html
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 4697bea4f..1f68546bb 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -123,7 +123,7 @@
     <target name="jar1" depends="compile, bundle-news, bundle-countries, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.j.tr" value="" />
-        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/*">
+        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" excludes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*">
             <manifest>
                 <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
                 <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
@@ -327,14 +327,14 @@
                 <attribute name="X-Compile-Source-JDK" value="${javac.version}" />
                 <attribute name="X-Compile-Target-JDK" value="${javac.version}" />
             </manifest>
-            <classes dir="./build/obj" includes="net/i2p/router/web/helpers/*" />
+            <classes dir="./build/obj" includes="net/i2p/router/web/helpers/* net/i2p/router/web/servlets/*" />
         </war>
     </target>
 
     <target name="warUpToDate">
         <uptodate property="war.uptodate" targetfile="build/routerconsole.war" >
             <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
-            <srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class" />
+            <srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class net/i2p/router/web/servlets/*.class" />
         </uptodate>
         <condition property="shouldListChanges" >
             <and>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/CodedIconRendererServlet.java b/apps/routerconsole/java/src/net/i2p/router/web/servlets/CodedIconRendererServlet.java
similarity index 99%
rename from apps/routerconsole/java/src/net/i2p/router/web/helpers/CodedIconRendererServlet.java
rename to apps/routerconsole/java/src/net/i2p/router/web/servlets/CodedIconRendererServlet.java
index 6ea37b547..d90bd7b45 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/CodedIconRendererServlet.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/servlets/CodedIconRendererServlet.java
@@ -1,4 +1,4 @@
-package net.i2p.router.web.helpers;
+package net.i2p.router.web.servlets;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/servlets/package.html b/apps/routerconsole/java/src/net/i2p/router/web/servlets/package.html
new file mode 100644
index 000000000..1377892bc
--- /dev/null
+++ b/apps/routerconsole/java/src/net/i2p/router/web/servlets/package.html
@@ -0,0 +1,13 @@
+<html>
+<body>
+<p>
+Full servlets, mostly for static content.
+Each must be added to apps/routerconsole/jsp/web.xml.
+</p><p>
+This package was created in release 0.9.36.
+No classes contained here are part of a public API.
+Subject to change.
+Not for public use.
+</p>
+</body>
+</html>
diff --git a/apps/routerconsole/jsp/web.xml b/apps/routerconsole/jsp/web.xml
index d840c8940..d26dbdf5b 100644
--- a/apps/routerconsole/jsp/web.xml
+++ b/apps/routerconsole/jsp/web.xml
@@ -16,12 +16,12 @@
     <!-- precompiled servlets -->
 
     <servlet>
-      <servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
-      <servlet-class>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-class>
+      <servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
+      <servlet-class>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>
-      <servlet-name>net.i2p.router.web.helpers.CodedIconRendererServlet</servlet-name>
+      <servlet-name>net.i2p.router.web.servlets.CodedIconRendererServlet</servlet-name>
       <url-pattern>/Plugins/*</url-pattern>
     </servlet-mapping>
 
