From 48cce6435b85b86bf16981436f69df2168f1916c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 1 Nov 2013 11:00:37 +0000
Subject: [PATCH] routerconsole war dies with .jsp files in a subdir

---
 apps/routerconsole/jsp/{help/legal.jsi => help-legal.jsi}   | 0
 .../jsp/{help/sidebar.jsi => help-sidebar.jsi}              | 0
 apps/routerconsole/jsp/{help => }/help.jsi                  | 0
 apps/routerconsole/jsp/help.jsp                             | 6 +++---
 .../help_ar.jsp => old-translations/help_ar.jsp.old}        | 0
 .../help_fr.jsp => old-translations/help_fr.jsp.old}        | 0
 .../help_nl.jsp => old-translations/help_nl.jsp.old}        | 0
 .../help_ru.jsp => old-translations/help_ru.jsp.old}        | 0
 router/java/src/net/i2p/router/RouterVersion.java           | 2 +-
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename apps/routerconsole/jsp/{help/legal.jsi => help-legal.jsi} (100%)
 rename apps/routerconsole/jsp/{help/sidebar.jsi => help-sidebar.jsi} (100%)
 rename apps/routerconsole/jsp/{help => }/help.jsi (100%)
 rename apps/routerconsole/jsp/{help/old-translations/help_ar.jsp => old-translations/help_ar.jsp.old} (100%)
 rename apps/routerconsole/jsp/{help/old-translations/help_fr.jsp => old-translations/help_fr.jsp.old} (100%)
 rename apps/routerconsole/jsp/{help/old-translations/help_nl.jsp => old-translations/help_nl.jsp.old} (100%)
 rename apps/routerconsole/jsp/{help/old-translations/help_ru.jsp => old-translations/help_ru.jsp.old} (100%)

diff --git a/apps/routerconsole/jsp/help/legal.jsi b/apps/routerconsole/jsp/help-legal.jsi
similarity index 100%
rename from apps/routerconsole/jsp/help/legal.jsi
rename to apps/routerconsole/jsp/help-legal.jsi
diff --git a/apps/routerconsole/jsp/help/sidebar.jsi b/apps/routerconsole/jsp/help-sidebar.jsi
similarity index 100%
rename from apps/routerconsole/jsp/help/sidebar.jsi
rename to apps/routerconsole/jsp/help-sidebar.jsi
diff --git a/apps/routerconsole/jsp/help/help.jsi b/apps/routerconsole/jsp/help.jsi
similarity index 100%
rename from apps/routerconsole/jsp/help/help.jsi
rename to apps/routerconsole/jsp/help.jsi
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 730ad86978..230c6a5571 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -16,9 +16,9 @@
 <h1>I2P Router Help &amp; Support</h1>
 <div class="main" id="main"><p>
 
-<%@include file="help/help.jsi" %>
-<%@include file="help/legal.jsi" %>
-<%@include file="help/sidebar.jsi" %>
+<%@include file="help.jsi" %>
+<%@include file="help-legal.jsi" %>
+<%@include file="help-sidebar.jsi" %>
 
 <h2>Change Log</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
diff --git a/apps/routerconsole/jsp/help/old-translations/help_ar.jsp b/apps/routerconsole/jsp/old-translations/help_ar.jsp.old
similarity index 100%
rename from apps/routerconsole/jsp/help/old-translations/help_ar.jsp
rename to apps/routerconsole/jsp/old-translations/help_ar.jsp.old
diff --git a/apps/routerconsole/jsp/help/old-translations/help_fr.jsp b/apps/routerconsole/jsp/old-translations/help_fr.jsp.old
similarity index 100%
rename from apps/routerconsole/jsp/help/old-translations/help_fr.jsp
rename to apps/routerconsole/jsp/old-translations/help_fr.jsp.old
diff --git a/apps/routerconsole/jsp/help/old-translations/help_nl.jsp b/apps/routerconsole/jsp/old-translations/help_nl.jsp.old
similarity index 100%
rename from apps/routerconsole/jsp/help/old-translations/help_nl.jsp
rename to apps/routerconsole/jsp/old-translations/help_nl.jsp.old
diff --git a/apps/routerconsole/jsp/help/old-translations/help_ru.jsp b/apps/routerconsole/jsp/old-translations/help_ru.jsp.old
similarity index 100%
rename from apps/routerconsole/jsp/help/old-translations/help_ru.jsp
rename to apps/routerconsole/jsp/old-translations/help_ru.jsp.old
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b1ba79e39..f5c9264549 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
     public final static String EXTRA = "";
-- 
GitLab