diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index bb19f3c47..a897f84e4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -146,9 +146,10 @@ public class ConfigClientsHelper extends HelperBase { .append("").append(_("Update link")).append(" "); } desc.append(""); + boolean enableStop = !Boolean.valueOf(appProps.getProperty("disableStop")).booleanValue(); renderForm(buf, app, app, false, "true".equals(val), false, desc.toString(), false, false, - updateURL != null, true, true); + updateURL != null, enableStop, true); } } buf.append("\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java index 1a4f14c67..f8e0f3aa4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java @@ -240,8 +240,6 @@ public class PluginUpdateHandler extends UpdateHandler { return; } - // todo compare sud version with property version - String minVersion = ConfigClientsHelper.stripHTML(props, "min-i2p-version"); if (minVersion != null && (new VersionComparator()).compare(CoreVersion.VERSION, minVersion) < 0) { diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 5b081b412..c0554dfa0 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -59,12 +59,14 @@ <%=intl._("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%>

<% } %> - <% if (System.getProperty("wrapper.version") != null) { %>

<%=intl._("Debugging")%>

+

<%=intl._("View the job queue")%> + <% if (System.getProperty("wrapper.version") != null) { %>

<%=intl._("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>


" > -<% } %>
+ +<% } %>

<%=intl._("Launch browser on router startup?")%>

<%=intl._("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> diff --git a/history.txt b/history.txt index 83731b0ca..439569f8e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,15 @@ +2010-03-02 zzz + * Console: + - Add link to jobs.jsp on configservice.jsp + - Add plugin disableStop support + * Context: Add boolean getProperty methods + * HTTP Proxy: + - Fix address helper conflicts caused by last checkin + - Use B32 instead of random hostname for conflict link + * LoadClientAppsJob: + - Fix unquoted arg after quoted arg + - Logging cleanup + 2010-02-27 zzz * eepsite: Add some help to index.html * HTTP Proxy: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9276ceebc..bb88f0a0a 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = "";