From 63937d0fbab871aa9e2e480a2a2753000ee0f74f Mon Sep 17 00:00:00 2001 From: jrandom Date: Fri, 3 Sep 2004 19:46:07 +0000 Subject: [PATCH] 2004-09-03 jrandom * Updated default wrapper.config to deal with the hard restart option * Include the history.txt in the /help.jsp page * HTML updates (wrapper.log, and no more unix scripts) * Updated VERSION constants to 0.4 --- .../i2p/router/web/ConfigServiceHandler.java | 2 +- apps/routerconsole/jsp/configservice.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 6 +++ core/java/src/net/i2p/CoreVersion.java | 4 +- history.txt | 10 +++- installer/install.xml | 47 +------------------ installer/resources/wrapper.conf | 2 + readme.html | 6 +-- .../src/net/i2p/router/RouterVersion.java | 6 +-- 9 files changed, 28 insertions(+), 57 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index 0d39c0465a..986a195f15 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -50,7 +50,7 @@ public class ConfigServiceHandler extends FormHandler { } catch (Throwable t) { addFormError("Warning: unable to contact the service manager - " + t.getMessage()); } - addFormNotice("Threads dumped to logs/wrapper.log"); + addFormNotice("Threads dumped to wrapper.log"); } else if ("Show systray icon".equals(_action)) { try { SysTray tray = SysTray.getInstance(); diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index d3ad2ee4e5..148e19170d 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -54,7 +54,7 @@

Debugging

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 -logs/wrapper.log.
+wrapper.log.
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 6e91fcf2d5..00e56fe716 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -42,6 +42,12 @@ details on other applications available, as well as their licenses, please see t license policy. Source for the I2P code and most bundled client applications can be found on our download page, and is in cvs.

+ +

Release history

+ + + + diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 22b831b046..99d0c47886 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.17 $ $Date: 2004/08/12 21:15:54 $"; - public final static String VERSION = "0.3.4.3"; + public final static String ID = "$Revision: 1.18 $ $Date: 2004/08/20 14:56:35 $"; + public final static String VERSION = "0.4"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index 7f679bb453..36d0d181d8 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,12 @@ -$Id: history.txt,v 1.3 2004/09/03 02:22:24 jrandom Exp $ +$Id: history.txt,v 1.4 2004/09/03 11:52:27 hypercubus Exp $ + +* 2004-09-03 0.4 released + +2004-09-03 jrandom + * Updated default wrapper.config to deal with the hard restart option + * Include the history.txt in the /help.jsp page + * HTML updates (wrapper.log, and no more unix scripts) + * Updated VERSION constants to 0.4 2004-09-03 hypercubus * Bugfix: Installer launches postinstall.bat on WinNT/2K properly. diff --git a/installer/install.xml b/installer/install.xml index dcdbf2680e..23dabd1fa3 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -1,46 +1 @@ - - - - - - I2P - 0.3.5 - - - - http://www.i2p.net - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Base installation files - - - - - + I2P 0.4 http://www.i2p.net Base installation files \ No newline at end of file diff --git a/installer/resources/wrapper.conf b/installer/resources/wrapper.conf index a724b8f47b..494fa17ef4 100644 --- a/installer/resources/wrapper.conf +++ b/installer/resources/wrapper.conf @@ -90,6 +90,8 @@ wrapper.on_exit.10=RESTART wrapper.on_exit.2=SHUTDOWN # hard shutdown wrapper.on_exit.3=SHUTDOWN +# hard restart +wrapper.on_exit.4=RESTART # the router may take a few seconds to save state, etc wrapper.jvm_exit.timeout=60 diff --git a/readme.html b/readme.html index 775a4a4511..865244afa5 100644 --- a/readme.html +++ b/readme.html @@ -24,9 +24,9 @@ linked together).

run I2P as a service on windows machines (a daemon, for you *nix geeks). Windows users can add or remove the I2P service on the service control page, or through the install_i2p_service_winnt.bat and uninstall_i2p_service_winnt.bat scripts. *nix -users can use the install_i2p_service_unix and uninstall_i2p_service_unix scripts included, but -they must be run as root. To uninstall I2P altogether, simply wipe the I2P installation -directory.

+users can script up something to call ./i2prouter start with the appropriate +environment ($PATH, $JAVA_HOME, etc) and user id (I2P does not require root). To uninstall +I2P altogether, simply wipe the I2P installation directory.

What next?

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0a1277d700..7a7e7b4097 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.19 $ $Date: 2004/09/02 16:26:03 $"; - public final static String VERSION = "0.3.4.3"; - public final static long BUILD = 2; + public final static String ID = "$Revision: 1.20 $ $Date: 2004/09/03 02:22:24 $"; + public final static String VERSION = "0.4"; + public final static long BUILD = 3; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION); System.out.println("Router ID: " + RouterVersion.ID);