From 88dbd7710a2e405bd23df94b1a2cfcd2bad24e62 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 21 Nov 2009 13:33:57 +0000
Subject: [PATCH]     * Routerconsole build: rename include files so they
 aren't       compiled and bundled separately (~15KB)

---
 apps/routerconsole/java/build.xml             | 36 +++++++++++++++----
 apps/routerconsole/jsp/config.jsp             |  6 ++--
 apps/routerconsole/jsp/configadvanced.jsp     |  6 ++--
 apps/routerconsole/jsp/configclients.jsp      |  6 ++--
 apps/routerconsole/jsp/configkeyring.jsp      |  6 ++--
 apps/routerconsole/jsp/configlogging.jsp      |  6 ++--
 .../jsp/{confignav.jsp => confignav.jsi}      |  0
 apps/routerconsole/jsp/configpeer.jsp         |  6 ++--
 apps/routerconsole/jsp/configservice.jsp      |  6 ++--
 apps/routerconsole/jsp/configstats.jsp        |  6 ++--
 apps/routerconsole/jsp/configtunnels.jsp      |  6 ++--
 apps/routerconsole/jsp/configui.jsp           |  6 ++--
 apps/routerconsole/jsp/configupdate.jsp       |  6 ++--
 apps/routerconsole/jsp/{css.jsp => css.jsi}   |  0
 apps/routerconsole/jsp/debug.jsp              |  4 +--
 apps/routerconsole/jsp/error.jsp              |  4 +--
 apps/routerconsole/jsp/graphs.jsp             |  4 +--
 apps/routerconsole/jsp/help.jsp               |  4 +--
 apps/routerconsole/jsp/index.jsp              |  4 +--
 apps/routerconsole/jsp/jobs.jsp               |  4 +--
 apps/routerconsole/jsp/logs.jsp               |  4 +--
 apps/routerconsole/jsp/netdb.jsp              |  4 +--
 apps/routerconsole/jsp/oldconsole.jsp         |  4 +--
 apps/routerconsole/jsp/peers.jsp              |  4 +--
 apps/routerconsole/jsp/profiles.jsp           |  4 +--
 apps/routerconsole/jsp/stats.jsp              |  4 +--
 .../jsp/{summary.jsp => summary.jsi}          |  2 +-
 apps/routerconsole/jsp/summaryframe.jsp       |  6 ++--
 ...{summarynoframe.jsp => summarynoframe.jsi} |  0
 apps/routerconsole/jsp/tunnels.jsp            |  4 +--
 30 files changed, 92 insertions(+), 70 deletions(-)
 rename apps/routerconsole/jsp/{confignav.jsp => confignav.jsi} (100%)
 rename apps/routerconsole/jsp/{css.jsp => css.jsi} (100%)
 rename apps/routerconsole/jsp/{summary.jsp => summary.jsi} (97%)
 rename apps/routerconsole/jsp/{summarynoframe.jsp => summarynoframe.jsi} (100%)

diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 3db3038ea..e5b602129 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -110,7 +110,7 @@
     <target name="war" depends="precompilejsp">
         <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
         <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
-             basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, web-fragment.xml">
+             basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml">
         </war>
     </target>
     <target name="precompilejsp" unless="precompilejsp.uptodate">
@@ -120,13 +120,35 @@
         <mkdir dir="../jsp/WEB-INF/" />
         <mkdir dir="../jsp/WEB-INF/classes" />
 
-        <!-- TODO: Don't compile the following jsps, which should be used only as includes:
-           -  summary.jsp, summarynoframe.jsp, css.jsp, confignav.jsp
-           -  Is here a JspC command line switch for that?
-           -  Or should we move them to a separate directory?
-          -->
-
         <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
+        <!--
+           **     Usage: jspc <options> <jsp files>
+           **     where jsp files is
+           **         -webapp <dir>      A directory containing a web-app, whose JSP pages
+           **                            will be processed recursively
+           **     or any number of
+           **         <file>             A file to be parsed as a JSP page
+           **     where options include:
+           **         -help              Print this help message
+           **         -v                 Verbose mode
+           **         -d <dir>           Output Directory (default -Djava.io.tmpdir)
+           **         -l                 Outputs the name of the JSP page upon failure
+           **         -s                 Outputs the name of the JSP page upon success
+           **         -p <name>          Name of target package (default org.apache.jsp)
+           **         -c <name>          Name of target class name (only applies to first JSP page)
+           **         -mapped            Generates separate write() calls for each HTML line in the JSP
+           **         -die[#]            Generates an error return code (#) on fatal errors (default 1)
+           **         -uribase <dir>     The uri directory compilations should be relative to
+           **                            (default "/")
+           **         -uriroot <dir>     Same as -webapp
+           **         -compile           Compiles generated servlets
+           **         -webinc <file>     Creates a partial servlet mappings in the file
+           **         -webxml <file>     Creates a complete web.xml in the file
+           **         -ieplugin <clsid>  Java Plugin classid for Internet Explorer
+           **         -classpath <path>  Overrides java.class.path system property
+           **         -xpoweredBy        Add X-Powered-By response header
+           **         -trimSpaces        Trim spaces in template text between actions, directives
+        -->
         <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 1013653c1..c422e1016 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -3,17 +3,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config networking")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
 <jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <h1><%=intl._("I2P Network Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigNetHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index 2b506cd78..d015df0b3 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -3,11 +3,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config advanced")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
 <jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
@@ -15,7 +15,7 @@
 <h1><%=intl._("I2P Advanced Configuration")%></h1>
 <div class="main" id="main">
 
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index bff2fc590..974673b31 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config clients")%>
 <style type='text/css'>
 button span.hide{
@@ -11,13 +11,13 @@ button span.hide{
 }
 </style></head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <h1><%=intl._("I2P Client Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index e7b835455..038b2c778 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -3,14 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config keyring")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Keyring Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigKeyringHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index 39ac2b7f6..c2f3a7ba5 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -3,16 +3,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config logging")%>
 </head><body>
 <jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" />
 <jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Logging Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsi
similarity index 100%
rename from apps/routerconsole/jsp/confignav.jsp
rename to apps/routerconsole/jsp/confignav.jsi
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index 6b4d90cde..8b61f274d 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/apps/routerconsole/jsp/configpeer.jsp
@@ -3,14 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config peers")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Peer Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigPeerHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 96e6175f9..e76e03623 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -3,14 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config service")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Service Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigServiceHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 05989dab0..1c1158407 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config stats")%>
 <script type="text/javascript">
 function init()
@@ -52,10 +52,10 @@ function toggleAll(category)
 }
 </script>
 </head><body onLoad="init();">
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Stats Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index 94c26f2c3..269f2186e 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -3,17 +3,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config tunnels")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
 <jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <h1><%=intl._("I2P Tunnel Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
  <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:setProperty name="formhandler" property="shouldsave" value="<%=request.getParameter("shouldsave")%>" />
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 6ca14cede..7484880ce 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -3,11 +3,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config UI")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 
 <jsp:useBean class="net.i2p.router.web.ConfigUIHelper" id="uihelper" scope="request" />
 <jsp:setProperty name="uihelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
@@ -15,7 +15,7 @@
 <h1><%=uihelper._("I2P UI Configuration")%></h1>
 <div class="main" id="main">
 
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigUIHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index c538a6c9f..efc138b82 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -3,14 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("config update")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Update Configuration")%></h1>
 <div class="main" id="main">
- <%@include file="confignav.jsp" %>
+ <%@include file="confignav.jsi" %>
 
  <jsp:useBean class="net.i2p.router.web.ConfigUpdateHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsi
similarity index 100%
rename from apps/routerconsole/jsp/css.jsp
rename to apps/routerconsole/jsp/css.jsi
diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp
index 9ee937097..9f6aae574 100644
--- a/apps/routerconsole/jsp/debug.jsp
+++ b/apps/routerconsole/jsp/debug.jsp
@@ -7,9 +7,9 @@
    */
 %>
 <html><head><title>I2P Router Console - Debug</title>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1>Router SKM</h1>
 <div class="main" id="main">
 <%
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index cfb2fe99b..7bcfc3318 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -13,10 +13,10 @@
     // If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
 %>
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("Page Not Found")%>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=ERROR_CODE%> <%=ERROR_MESSAGE%></h1>
 <div class="sorry" id="warning">
 <%=intl._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%><hr>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index 1ad873041..d472d5457 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -3,11 +3,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("graphs")%>
 </head><body>
 
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Performance Graphs")%></h1>
 <div class="main" id="main">
  <div class="graphspanel">
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 35e4dd05b..50c430f02 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -7,9 +7,9 @@
    */
 %>
 <html><head><title>I2P Router Console - help</title>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1>I2P Router Help & Support</h1>
 <div class="main" id="main"><p>
 If you'd like to help improve or translate the documentation, or
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 2fbfb6dc1..9cc79ca49 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("home")%>
 </head><body>
 <%
@@ -12,7 +12,7 @@ if (System.getProperty("router.consoleNonce") == null) {
 }
 %>
 
-<%@include file="summary.jsp" %><h1><%=intl._("I2P Router Console")%></h1>
+<%@include file="summary.jsi" %><h1><%=intl._("I2P Router Console")%></h1>
 <div class="news" id="news">
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %>
diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp
index c53ea0a44..ef84c8f8c 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("job queue")%>
 </head><body>
-<%@include file="summary.jsp" %><h1><%=intl._("I2P Router Job Queue")%></h1>
+<%@include file="summary.jsi" %><h1><%=intl._("I2P Router Job Queue")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
  <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 859aba705..5af8b6afd 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("logs")%>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Router Logs")%></h1>
 <div class="main" id="main">
  <div class="joblog"><h3><%=intl._("I2P Version & Running Environment")%></h3><a name="version"> </a>
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index bc954d2bf..9cbac25e7 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/apps/routerconsole/jsp/netdb.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("network database summary")%>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
  <h1><%=intl._("I2P Network Database Summary")%></h1>
 <div class="main" id="main">
  <div class="wideload">
diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp
index 10394fb50..701d70f7d 100644
--- a/apps/routerconsole/jsp/oldconsole.jsp
+++ b/apps/routerconsole/jsp/oldconsole.jsp
@@ -7,9 +7,9 @@
    */
 %>
 <html><head><title>I2P Router Console - internals</title>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
 <jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <jsp:setProperty name="conhelper" property="writer" value="<%=out%>" />
diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp
index 351ad10b6..14a919d62 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/apps/routerconsole/jsp/peers.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("peer connections")%>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Network Peers")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index dc3a0a59d..035f50b5b 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -3,9 +3,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("peer profiles")%>
-</head><body><%@include file="summary.jsp" %>
+</head><body><%@include file="summary.jsi" %>
 <h1><%=intl._("I2P Network Peer Profiles")%></h1>
 <div class="main" id="main"><div class="wideload">
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp
index 7617ec565..d140d7c2c 100644
--- a/apps/routerconsole/jsp/stats.jsp
+++ b/apps/routerconsole/jsp/stats.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("statistics")%>
 </head><body>
-<%@include file="summary.jsp" %>
+<%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
 <jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsi
similarity index 97%
rename from apps/routerconsole/jsp/summary.jsp
rename to apps/routerconsole/jsp/summary.jsi
index 33c5919eb..10b71ae2c 100644
--- a/apps/routerconsole/jsp/summary.jsp
+++ b/apps/routerconsole/jsp/summary.jsi
@@ -14,7 +14,7 @@
         out.print("<iframe src=\"summaryframe.jsp" + newDelay + "\" height=\"1500\" width=\"200\" scrolling=\"auto\" frameborder=\"0\" title=\"sidepanel\">\n");
 %>
 <div class="routersummary">
-<%@include file="summarynoframe.jsp" %>
+<%@include file="summarynoframe.jsi" %>
 <%
     // d defined above
     if (!"0".equals(d)) {
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 4383b3b68..a0123fe6f 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -8,7 +8,7 @@
  */
 %>
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <title>Summary Bar</title>
 <%
     // try hard to avoid an error page in the iframe after shutdown
@@ -25,7 +25,7 @@
         } else {
             System.setProperty("routerconsole.summaryRefresh", d);
         }
-        // we probably don't get here if d == "0" since caught in summary.jsp, but just
+        // we probably don't get here if d == "0" since caught in summary.jsi, but just
         // to be sure...
         if (!"0".equals(d)) {
             // doesn't work for restart or shutdown with no expl. tunnels,
@@ -49,7 +49,7 @@
     }
 %>
 </head><body style="margin: 0;"><div class="routersummary">
-<%@include file="summarynoframe.jsp" %>
+<%@include file="summarynoframe.jsi" %>
 <%
     // d and shutdownSoon defined above
     if (!shutdownSoon) {
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsi
similarity index 100%
rename from apps/routerconsole/jsp/summarynoframe.jsp
rename to apps/routerconsole/jsp/summarynoframe.jsi
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp
index 9c126be70..63045519c 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@@ -3,10 +3,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<%@include file="css.jsp" %>
+<%@include file="css.jsi" %>
 <%=intl.title("tunnel summary")%>
 </head><body>
-<%@include file="summary.jsp" %><h1><%=intl._("I2P Tunnel Summary")%></h1>
+<%@include file="summary.jsi" %><h1><%=intl._("I2P Tunnel Summary")%></h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
  <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />