echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Routerconsole build: rename include files so they aren't

Browse Source 
compiled and bundled separately (~15KB)
This commit is contained in:
zzz
2009-11-21 13:33:57 +00:00
parent 26a71232f0
commit 88dbd7710a
30 changed files with 92 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/routerconsole/java/build.xml
View File

@ -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" />

6
apps/routerconsole/jsp/config.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configadvanced.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configclients.jsp
View File

@ -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")%>" />

6
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configlogging.jsp
View File

@ -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="*" />

0
apps/routerconsole/jsp/confignav.jsp → apps/routerconsole/jsp/confignav.jsi
View File

6
apps/routerconsole/jsp/configpeer.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configservice.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configstats.jsp
View File

@ -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")%>" />

6
apps/routerconsole/jsp/configtunnels.jsp
View File

@ -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")%>" />

6
apps/routerconsole/jsp/configui.jsp
View File

@ -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="*" />

6
apps/routerconsole/jsp/configupdate.jsp
View File

@ -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="*" />

0
apps/routerconsole/jsp/css.jsp → apps/routerconsole/jsp/css.jsi
View File

4
apps/routerconsole/jsp/debug.jsp
View File

@ -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">
<%

4
apps/routerconsole/jsp/error.jsp
View File

@ -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>

4
apps/routerconsole/jsp/graphs.jsp
View File

@ -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">

4
apps/routerconsole/jsp/help.jsp
View File

@ -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

4
apps/routerconsole/jsp/index.jsp
View File

@ -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"); %>

4
apps/routerconsole/jsp/jobs.jsp
View File

@ -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")%>" />

4
apps/routerconsole/jsp/logs.jsp
View File

@ -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>

4
apps/routerconsole/jsp/netdb.jsp
View File

@ -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">

4
apps/routerconsole/jsp/oldconsole.jsp
View File

@ -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%>" />

4
apps/routerconsole/jsp/peers.jsp
View File

@ -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" />

4
apps/routerconsole/jsp/profiles.jsp
View File

@ -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" />

4
apps/routerconsole/jsp/stats.jsp
View File

@ -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%>" />

2
apps/routerconsole/jsp/summary.jsp → apps/routerconsole/jsp/summary.jsi
View File

@ -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)) {

6
apps/routerconsole/jsp/summaryframe.jsp
View File

@ -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) {

0
apps/routerconsole/jsp/summarynoframe.jsp → apps/routerconsole/jsp/summarynoframe.jsi
View File

4
apps/routerconsole/jsp/tunnels.jsp
View File

@ -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")%>" />