0.9.5

graphs.jsp: Fix saving settings (ticket #857 )
merge of '4482eec8563d6ed220c2042b18fc09164aaa4404'
2013-03-08 13:03:50 +00:00 · 2013-03-03 20:32:02 +00:00 · 2013-03-03 18:42:46 +00:00 · 2013-03-03 17:22:09 +00:00 · 2013-03-03 17:15:06 +00:00 · 2013-03-03 17:08:26 +00:00
2249 changed files with 436933 additions and 116343 deletions
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -0,0 +1,31 @@
+# Just to try and prevent some noob disasters.
+# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
+_jsp\.java$
+\.bz2$
+\.tar$
+\.class$
+\.diff$
+\.exe$
+\.fba$
+\.gz$
+\.jar$
+\.out$
+\.patch$
+\.sig$
+\.sud$
+\.su2$
+\.tar$
+\.war$
+.\deb$
+\.zip$
+^\.
+^build
+^pkg-temp/
+~$
+/build
+/classes/
+^debian/copyright
+^debian/changelog
+override.properties
+sloccount.sc
+^reports/
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,147 @@
+[I2P.i2ptunnel]
+source_file = apps/i2ptunnel/locale/messages_en.po
+source_lang = en
+trans.ar = apps/i2ptunnel/locale/messages_ar.po
+trans.cs = apps/i2ptunnel/locale/messages_cs.po
+trans.da = apps/i2ptunnel/locale/messages_da.po
+trans.de = apps/i2ptunnel/locale/messages_de.po
+trans.es = apps/i2ptunnel/locale/messages_es.po
+trans.fr = apps/i2ptunnel/locale/messages_fr.po
+trans.hu = apps/i2ptunnel/locale/messages_hu.po
+trans.it = apps/i2ptunnel/locale/messages_it.po
+trans.nb = apps/i2ptunnel/locale/messages_nb.po
+trans.nl = apps/i2ptunnel/locale/messages_nl.po
+trans.pl = apps/i2ptunnel/locale/messages_pl.po
+trans.pt = apps/i2ptunnel/locale/messages_pt.po
+trans.ru = apps/i2ptunnel/locale/messages_ru.po
+trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
+trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
+trans.vi = apps/i2ptunnel/locale/messages_vi.po
+trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po
+
+[I2P.routerconsole]
+source_file = apps/routerconsole/locale/messages_en.po
+source_lang = en
+trans.ar = apps/routerconsole/locale/messages_ar.po
+trans.cs = apps/routerconsole/locale/messages_cs.po
+trans.da = apps/routerconsole/locale/messages_da.po
+trans.de = apps/routerconsole/locale/messages_de.po
+trans.el = apps/routerconsole/locale/messages_el.po
+trans.es = apps/routerconsole/locale/messages_es.po
+trans.et_EE = apps/routerconsole/locale/messages_et.po
+trans.fi = apps/routerconsole/locale/messages_fi.po
+trans.fr = apps/routerconsole/locale/messages_fr.po
+trans.hu = apps/routerconsole/locale/messages_hu.po
+trans.it = apps/routerconsole/locale/messages_it.po
+trans.nb = apps/routerconsole/locale/messages_nb.po
+trans.nl = apps/routerconsole/locale/messages_nl.po
+trans.pl = apps/routerconsole/locale/messages_pl.po
+trans.pt = apps/routerconsole/locale/messages_pt.po
+trans.ru = apps/routerconsole/locale/messages_ru.po
+trans.sv_SE = apps/routerconsole/locale/messages_sv.po
+trans.uk_UA = apps/routerconsole/locale/messages_uk.po
+trans.vi = apps/routerconsole/locale/messages_vi.po
+trans.zh_CN = apps/routerconsole/locale/messages_zh.po
+
+[I2P.i2psnark]
+source_file = apps/i2psnark/locale/messages_en.po
+source_lang = en
+trans.ar = apps/i2psnark/locale/messages_ar.po
+trans.cs = apps/i2psnark/locale/messages_cs.po
+trans.de = apps/i2psnark/locale/messages_de.po
+trans.es = apps/i2psnark/locale/messages_es.po
+trans.fr = apps/i2psnark/locale/messages_fr.po
+trans.hu = apps/i2psnark/locale/messages_hu.po
+trans.it = apps/i2psnark/locale/messages_it.po
+trans.nb = apps/i2psnark/locale/messages_nb.po
+trans.nl = apps/i2psnark/locale/messages_nl.po
+trans.pl = apps/i2psnark/locale/messages_pl.po
+trans.pt = apps/i2psnark/locale/messages_pt.po
+trans.ru = apps/i2psnark/locale/messages_ru.po
+trans.sv_SE = apps/i2psnark/locale/messages_sv.po
+trans.vi = apps/i2psnark/locale/messages_vi.po
+trans.zh_CN = apps/i2psnark/locale/messages_zh.po
+
+[I2P.susidns]
+source_file = apps/susidns/locale/messages_en.po
+source_lang = en
+trans.ar = apps/susidns/locale/messages_ar.po
+trans.cs = apps/susidns/locale/messages_cs.po
+trans.da = apps/susidns/locale/messages_da.po
+trans.de = apps/susidns/locale/messages_de.po
+trans.el = apps/susidns/locale/messages_el.po
+trans.es = apps/susidns/locale/messages_es.po
+trans.fr = apps/susidns/locale/messages_fr.po
+trans.hu = apps/susidns/locale/messages_hu.po
+trans.it = apps/susidns/locale/messages_it.po
+trans.nl = apps/susidns/locale/messages_nl.po
+trans.pl = apps/susidns/locale/messages_pl.po
+trans.pt = apps/susidns/locale/messages_pt.po
+trans.ru = apps/susidns/locale/messages_ru.po
+trans.sv_SE = apps/susidns/locale/messages_sv.po
+trans.uk_UA = apps/susidns/locale/messages_uk.po
+trans.vi = apps/susidns/locale/messages_vi.po
+trans.zh_CN = apps/susidns/locale/messages_zh.po
+
+[I2P.desktopgui]
+source_file = apps/desktopgui/locale/messages_en.po
+source_lang = en
+trans.ar = apps/desktopgui/locale/messages_ar.po
+trans.cs = apps/desktopgui/locale/messages_cs.po
+trans.da = apps/desktopgui/locale/messages_da.po
+trans.de = apps/desktopgui/locale/messages_de.po
+trans.el = apps/desktopgui/locale/messages_el.po
+trans.es = apps/desktopgui/locale/messages_es.po
+trans.fr = apps/desktopgui/locale/messages_fr.po
+trans.hu = apps/desktopgui/locale/messages_hu.po
+trans.it = apps/desktopgui/locale/messages_it.po
+trans.nl = apps/desktopgui/locale/messages_nl.po
+trans.pl = apps/desktopgui/locale/messages_pl.po
+trans.ru = apps/desktopgui/locale/messages_ru.po
+trans.sv_SE = apps/desktopgui/locale/messages_sv.po
+trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.vi = apps/desktopgui/locale/messages_vi.po
+trans.zh_CN = apps/desktopgui/locale/messages_zh.po
+
+[I2P.susimail]
+source_file = apps/susimail/locale/messages_en.po
+source_lang = en
+trans.cs = apps/susimail/locale/messages_cs.po
+trans.de = apps/susimail/locale/messages_de.po
+trans.es = apps/susimail/locale/messages_es.po
+trans.fr = apps/susimail/locale/messages_fr.po
+trans.hu = apps/susimail/locale/messages_hu.po
+trans.it = apps/susimail/locale/messages_it.po
+trans.nl = apps/susimail/locale/messages_nl.po
+trans.ru = apps/susimail/locale/messages_ru.po
+trans.sv_SE = apps/susimail/locale/messages_sv.po
+trans.pl = apps/susimail/locale/messages_pl.po
+trans.uk_UA = apps/susimail/locale/messages_uk.po
+trans.vi = apps/susimail/locale/messages_vi.po
+trans.zh_CN = apps/susimail/locale/messages_zh.po
+
+[I2P.debconf]
+source_file = debian/po/templates.pot
+source_lang = en
+trans.cs = debian/po/cs.po
+trans.de = debian/po/de.po
+trans.el = debian/po/el.po
+trans.es = debian/po/es.po
+trans.fr = debian/po/fr.po
+trans.it = debian/po/it.po
+trans.hu = debian/po/hu.po
+trans.pl = debian/po/pl.po
+trans.ru = debian/po/ru.po
+trans.sv_SE = debian/po/sv.po
+trans.uk_UA = debian/po/uk.po
+
+[I2P.i2prouter-script]
+source_file = installer/resources/locale/messages_en.po
+source_lang = en
+trans.de = installer/resources/locale/po/messages_de.po
+trans.fr = installer/resources/locale/po/messages_fr.po
+trans.it = installer/resources/locale/po/messages_it.po
+
+[main]
+host = http://www.transifex.net
+
--- a/INSTALL-headless.txt
+++ b/INSTALL-headless.txt
@@ -1,4 +1,4 @@
-Headless I2P installation instructions
+Headless (console mode) I2P installation instructions

 1) java -jar i2pinstall.exe -console       (you've already done this)

@@ -6,12 +6,12 @@ This will run the installer in text mode, including running the postinstall.sh
 script. After that, you may run 'sh i2prouter start'
 which will start the router and attempt to launch a browser.

-If you do not have an X server running, the browser launch will probably fail, and
+If you do not have an X server running, the browser launch may fail, and
 you may use:
-  lynx http://localhost:7657/index.jsp
+  lynx http://localhost:7657/
 to configure the router.

-If you're having trouble, swing by http://forum.i2p2.de/, check the
+If you're having trouble, swing by http://forum.i2p/, check the
 website at http://www.i2p2.de/, or get on irc://irc.freenode.net/#i2p

 I2P will create and store files and configuration data in the user directory
@@ -24,22 +24,22 @@ edit the files i2prouter (Linux) and wrapper.config (Linux and Windows)
 where there are comments labeled "PORTABLE". Do this before you
 run I2P for the first time.

-To run I2P explicitly:
+To start I2P:
   (*nix): sh i2prouter start
   (win*): I2P.exe
-   (Platforms unsupported by the wrapper - PPC, ARM, etc): sh runplain.sh
+   (non-x86 platforms PPC, ARM, etc): sh runplain.sh

-To stop the router (gracefully):
-   lynx http://localhost:7657/configservice.jsp ("Shutdown gracefully")
+To stop I2P (gracefully):
+   lynx http://localhost:7657/summaryframe (click "Shutdown")

-To stop the router (immediately):
+To stop I2P immediately:
   sh i2prouter stop

 To uninstall I2P:
-   rm -rf $i2pInstallDir
+   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.sun.com/ (1.5+ supported)
-  Linux:   Latest available from http://java.sun.com/ (1.5+ supported)
-  FreeBSD: Sun 1.5-compatible (NIO required)
-  various: http://www.kaffe.org/ Sun 1.5-compatible (NIO required)
+  Windows: Latest available from http://java.com/download (1.5+ supported)
+  Linux:   Latest available from http://java.com/download (1.5+ supported)
+  FreeBSD: 1.5-compatible (NIO required)
+  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,33 +1,68 @@
 I2P source installation instructions

 Prerequisites to build from source:
-	Java SDK (preferably Sun) 1.5.0 or higher (1.6 recommended)
-	The SDK must have Pack200 support (java.util.jar.Pack200)
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
-	Optional, For multilanguage support: The xgettext, msgfmt, and msgmerge tools installed
+	The xgettext, msgfmt, and msgmerge tools installed
 	from the GNU gettext package http://www.gnu.org/software/gettext/

 To build and install I2P from source, you must first build
 and package up the appropriate installer by running:

-  ant pkg
+  	ant pkg
+
+On non-x86, use one of the following instead:
+	ant installer-linux
+	ant installer-freebsd
+	ant installer-osx
+


 This will produce a few key files:
 * install.jar:    the GUI and console installer
 * i2pinstall.exe: the GUI and console installer wrapped for cross-platform execution
+                  (only created with ant pkg)
 * i2pupdate.zip:  the update package
+                  (only created with ant pkg)

 From there, you can run the headless (console mode) installer:
  java -jar i2pinstall.exe -console
+or
+  java -jar i2pinstall.jar -console

 Or run the GUI installer:
  java -jar i2pinstall.exe
+or
+  java -jar i2pinstall.jar
+or on Windows, just double-click on i2pinstall.exe.

-Or move the update file into an existing installation directory and restart.
+Or move the i2pupdate.zip file into an existing installation directory and restart.
+
+To start I2P:
+   (*nix): sh i2prouter start
+   (win*): I2P.exe or i2prouter.bat
+   (non-x86 platforms PPC, ARM, etc): sh runplain.sh
+
+To install I2P as a system service:
+   (*nix) sh i2prouter install
+   (win*) install_i2p_service_winnt.bat
+
+To uninstall I2P as a system service:
+   (*nix) sh i2prouter remove
+   (win*) uninstall_i2p-service_winnt.bat
+
+To stop I2P (gracefully):
+   lynx http://localhost:7657/summaryframe (click "Shutdown")
+
+To stop I2P immediately:
+   sh i2prouter stop
+
+To uninstall I2P:
+   rm -rf $I2PInstallDir ~/.i2p

 Supported JVMs:
-  Windows: Latest available from http://java.sun.com/ (1.5+ supported)
-  Linux:   Latest available from http://java.sun.com/ (1.5+ supported)
-  FreeBSD: Sun 1.5-compatible (NIO required)
-  various: http://www.kaffe.org/ Sun 1.5-compatible (NIO required)
+  Windows: Latest available from http://java.com/download (1.5+ supported)
+  Linux:   Latest available from http://java.com/download (1.5+ supported)
+  FreeBSD: 1.5-compatible (NIO required)
+  Other operating systems and JVMs: See http://trac.i2p2.de/wiki/java
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2,7 +2,7 @@ This product includes both public domain code and licensed code as described bel
 For all code, unless otherwise stated in the appropriate license, the following applies:


-			    NO WARRANTY
+                            NO WARRANTY

  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGES.
 LICENSES
 --------

-Core:
+Core (i2p.jar):
 Public domain except as listed below:

   ElGamal and DSA code:
@@ -41,8 +41,8 @@ Public domain except as listed below:
   See licenses/LICENSE-SHA256.txt

   AES code:
-   Under the Cryptix (MIT) license, written by the Cryptix team
-   (That's what our website says but all our AES code looks like it is public domain)
+   Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+   See licenses/LICENSE-Cryptix.txt

   Crypto filters:
   From the xlattice app - http://xlattice.sourceforge.net/
@@ -56,10 +56,6 @@ Public domain except as listed below:
   Copyright (C) 2001, 2002, Free Software Foundation, Inc.
   See licenses/LICENSE-LGPLv2.1.txt

-   GMP 4.1.3:
-   Copyright 1991, 1996, 1999, 2000 Free Software Foundation, Inc.
-   See licenses/LICENSE-LGPLv2.1.txt
-
   HashCash code:
   Copyright 2006 Gregory Rubin grrubin@gmail.com
   See licenses/LICENSE-HashCash.txt
@@ -68,18 +64,31 @@ Public domain except as listed below:
   Copyright (C) 2001, 2007 Free Software Foundation, Inc.
   See licenses/LICENSE-LGPLv2.1.txt

+   SSLEepGet:
+   Contains some code Copyright 2006 Sun Microsystems, Inc.
+   See licenses/LICENSE-InstallCert.txt

-Router:
+   BlockFile:
+   Copyright (c) 2006, Matthew Estes
+   See licenses/LICENSE-BlockFile.txt
+
+   SipHashInline:
+   Copyright 2012  Hiroshi Nakamura <nahi@ruby-lang.org>
+   See licenses/LICENSE-Apache2.0.txt
+
+Router (router.jar):
 Public domain except as listed below:
   UPnP.java:
   From freenet
   See licenses/LICENSE-GPLv2.txt

-   UPnP subsystem 1.7:
-   Copyright (C) 2003-2006 Satoshi Konno
+   UPnP subsystem (CyberLink) 2.1:
+   Copyright (C) 2003-2010 Satoshi Konno
   See licenses/LICENSE-UPnP.txt

-   GeoIP data free to use, courtesy http://ip-to-country.webhosting.info/
+   GeoIP: GeoLite databases are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+   http://creativecommons.org/licenses/by-sa/3.0/
+   This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/


 Installer:
@@ -88,34 +97,34 @@ Installer:
   See licenses/LICENSE-Launch4j.txt (in binary packages)
   See installer/lib/launch4j/LICENSE.txt (in source packages)
   The following projects are used by Launch4j...
-	MinGW binutils (http://www.mingw.org/)
+        MinGW binutils (http://www.mingw.org/)

-	Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)
+        Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)

- 	Commons Logging (http://jakarta.apache.org/commons/logging/)
-        See licenses/LICENSE-Apache1.1.txt
+        Commons Logging (http://jakarta.apache.org/commons/logging/)
+        See licenses/LICENSE-Apache2.0.txt
        See licenses/NOTICE-Commons-Logging.txt

-	XStream (http://xstream.codehaus.org/)
+        XStream (http://xstream.codehaus.org/)
        Copyright (c) 2003-2004, Joe Walnes
        See licenses/LICENSE-XStream.txt

-	JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
+        JGoodies Forms (http://www.jgoodies.com/freeware/forms/)
        Copyright (c) 2002-2004 JGoodies Karsten Lentzsch. All rights reserved.
        See licenses/LICENSE-JGoodies-Forms.txt

-	JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
+        JGoodies Looks (http://www.jgoodies.com/freeware/looks/)
        Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
        See licenses/LICENSE-JGoodies-Looks.txt

-	Foxtrot (http://foxtrot.sourceforge.net/)
+        Foxtrot (http://foxtrot.sourceforge.net/)
        Copyright (c) 2002, Simone Bordet & Marco Cravero. All rights reserved.
        See licenses/LICENSE-Foxtrot.txt

-	Nuvola Icon Theme (http://www.icon-king.com)
+        Nuvola Icon Theme (http://www.icon-king.com)
        See licenses/LICENSE-LGPLv2.1.txt

-	Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)
+        Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)

   Izpack 4.3.0:
   Copyright (c) 2001-2008 Julien Ponge
@@ -123,11 +132,18 @@ Installer:



-Wrapper 3.1.1:
-   Copyright (c) 1999, 2004 Tanuki Software
+Java Service Wrapper Community Edition 32-bit 3.5.13:
+   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
   See licenses/LICENSE-Wrapper.txt


+Jbigi Libraries (jbigi.jar):
+   JNI code public domain.
+
+   GMP 4.3.2 / 5.0.2:
+   Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv3.txt
+

 Applications:

@@ -137,22 +153,23 @@ Applications:

   BOB:
   Copyright (C) sponge
-   DWTFYWTPL
+   See licenses/COPYING-BOB.txt

   I2PSnark:
   Copyright (C) 2003 Mark J. Wielaard
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt
       Silk icons: See licenses/LICENSE-SilkIcons.txt

   I2PTunnel:
   (c) 2003 - 2004 mihi
-   GPLv2 with exception.
+   GPLv2 (or any later version) with exception.
   See licenses/LICENSE-I2PTunnel.txt
   See licenses/LICENSE-GPLv2.txt

   I2PTunnel SOCKS Proxy:
   Copyright (c) 2004 by human
-   GPLv2 with exception.
+   GPLv2 (or any later version) with exception.
   See licenses/LICENSE-I2PTunnel.txt
   See licenses/LICENSE-GPLv2.txt

@@ -160,13 +177,13 @@ Applications:
   By welterde.
   See licenses/LICENSE-GPLv2.txt

-   Jetty 5.1.12:
-   Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
-   See licenses/LICENSE-Apache1.1.txt
+   Jetty 6.1.26:
+   Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+   See licenses/LICENSE-Jetty.txt
   See licenses/LICENSE-Apache2.0.txt
   See licenses/NOTICE-Commons-Logging.txt

-   JRobin 1.4.0:
+   JRobin 1.5.9.1:
   See licenses/LICENSE-LGPLv2.1.txt

   Ministreaming Lib:
@@ -179,13 +196,27 @@ Applications:

   Router console:
   Public domain.
-       Flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
+       Flag icons:
+         - Jersey and EU flag icons: public domain, courtesy Xrmap flag
+           collection http://www.arvernes.com/wiki/index.php/Xrmap
+         - Guernsey and Isle of Man flags from the Open Clip Art Library, released into the public domain
+         - Curaçao, courtesy of David Benbennick, released into the public domain
+         - All other flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
       Silk icons: See licenses/LICENSE-SilkIcons.txt
+       FatCow icons: See licenses/LICENSE-FatCowIcons.txt

       GeoIP Data:
-       Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
+       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
       See licenses/LICENSE-GeoIP.txt

+   Router Console and I2PSnark themes:
+   "Man with hat over face" & related images licensed under a Creative Commons 2.0 license.
+   Original photos by Florian Kuhlmann. http://www.flickr.com/photos/floriankuhlmann/3117758155
+
+   I2PSnark light theme:
+   "Creative Commons Cat" licensed under a Creative Commons Attribution 3.0 Unported License.
+   Original photo by Boaz Arad. http://www.luxphile.com/2011/01/creative-commons-cat.html
+
   SAM:
   Public domain.

@@ -194,17 +225,27 @@ Applications:

   SusiDNS:
   Copyright (C) 2005 <susi23@mail.i2p>
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt
+       Uses Glassfish Standard Tag Library (JSTL) 1.2:
+       Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
+       See https://glassfish.dev.java.net/public/CDDL+GPL.html
+       See licenses/LICENSE-GPLv2.txt

   SusiMail:
   Copyright (C) 2004-2005  <susi23@mail.i2p>
+   GPLv2 (or any later version)
   See licenses/LICENSE-GPLv2.txt

   Systray:
   Public domain.
-      Bundles systray4j code:
-      See licenses/LICENSE-GPLv2.txt
+      Bundles systray4j-2.4.1:
+      See licenses/LICENSE-LGPLv2.1.txt

+   Tomcat 6.0.36:
+   Copyright 1999-2012 The Apache Software Foundation
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/NOTICE-Tomcat.txt


 Other Applications and Libraries
@@ -216,8 +257,9 @@ distributions. See the source package for the additional license information.
   Admin Manager:
   Public domain

-   Atalk:
-   Public domain
+   BOB Demos:
+   Copyright (C) sponge
+   DWTFYWTPL

   Desktopgui
   Copyright (c) Mathias De Maré
--- a/README.txt
+++ b/README.txt
@@ -1,17 +1,24 @@
 Prerequisites to build from source:
-	Java SDK (preferably Sun) 1.5.0 or higher (1.6 recommended)
-	The SDK must have Pack200 support (java.util.jar.Pack200)
+	Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+          Non-linux operating systems and JVMs: See http://trac.i2p2.de/wiki/java
 	Apache Ant 1.7.0 or higher
-	Optional, For multilanguage support: The xgettext, msgfmt, and msgmerge tools installed
-	from the GNU gettext package http://www.gnu.org/software/gettext/
+	The xgettext, msgfmt, and msgmerge tools installed
+	  from the GNU gettext package http://www.gnu.org/software/gettext/

 To build:
-	ant pkg
+	On x86 systems do:
+		ant pkg
+
+	On non-x86, use one of the following instead:
+		ant installer-linux
+		ant installer-freebsd
+		ant installer-osx
+
 	Run 'ant' with no arguments to see other build options.
 	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.

 Documentation:
-	http://www.i2p2.de/
+	http://www.i2p2.de/how
 	API: run 'ant javadoc' then start at build/javadoc/index.html

 Latest release:
@@ -25,7 +32,7 @@ FAQ:

 Need help?
 	IRC irc.freenode.net #i2p
-	http://forum.i2p2.de/
+	http://forum.i2p/

 Licenses:
 	See LICENSE.txt
--- a/Slackware/i2p-base/i2p-base.SlackBuild
+++ b/Slackware/i2p-base/i2p-base.SlackBuild
@@ -21,7 +21,7 @@ CWD=$(pwd)
 TMP=/tmp
 PKG=/$TMP/package-base-i2p
 NAME=i2p-base
-VERSION=0.0.2
+VERSION=0.0.4
 BUILD=1sponge
 ARCH=noarch
 INSTALL_DIR=opt
--- a/Slackware/i2p-base/rc.i2p_def
+++ b/Slackware/i2p-base/rc.i2p_def
@@ -2,27 +2,44 @@
 # Start/stop i2p service.

 i2p_start() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )"
+ # Check if router is up first!
+ /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'" > /dev/null
+ if [ $? -eq 0 ] ; then {
+  # I2p is already running, so tell the user.
+  echo "I2P is already running..."
+  i2p_status
+ } 
+ else
+ {
+  # Just in-case there are leftover junk in /tmp...
+  rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
+  # Now that all junk is cleaned up, start.
+  /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory start )'"
+ }
+ fi
 }

 i2p_stop() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )"
+ /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory stop )'"
+ rm -Rf `grep /tmp/hsperfdata_root/* -le i2p` /tmp/i2p-*.tmp /tmp/router.ping
 }

 i2p_restart() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory restart)"
+ # We want a FULL cycle here, not the wrappers idea of this!
+ i2p_stop
+ i2p_start
 }

 i2p_status() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory status )"
+ /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory status )'"
 }

 i2p_console() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory console )"
+ /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'"
 }

 i2p_dump() {
- /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory dump )"
+ /bin/su - -c "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory dump )'"
 }

 case "$1" in
--- a/Slackware/i2p/doinst.sh
+++ b/Slackware/i2p/doinst.sh
@@ -26,9 +26,9 @@ for i in *.config ; {

 ( cd $INST_DIR/eepsite
 	if [ -f jetty.xml ] ; then
-		rm jetty.xml.new
+		echo "Please check ${INST_DIR}/eepsite, as there are new files."
 	else
-		mv jetty.xml.new jetty.xml
+		find $PKG/$INSTALL_DIR/i2p -name "*.xml.new" -exec sh -c 'mv "$0" "${0/.new}"' {} \;
 	fi
 )

--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -18,6 +18,7 @@
 #

 BUILD=1sponge
+# INSTALL_DIR is referenced from /, don't prefix it with a '/'
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch
@@ -85,23 +86,29 @@ cp -a ../i2p $PKG/$INSTALL_DIR/
 mkdir -p $PKG/install

 #############################################################################
-# Preconfigureation to make package smaller
+# Preconfigureation to make package smaller, and...
+# we keep as much as reasonable in the installation directory.
+# This makes the install map fairly well to the standard installation.
+# It also makes it easier to find the log and pid files!
 #############################################################################
 cd $PKG/$INSTALL_DIR/i2p

 # wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
-sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a
-sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config
+sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" wrapper.config > a
+sed "s|\$SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > wrapper.config
 # eepget %INSTALL_PATH
-sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a
+sed "s|\$INSTALL_PATH|/$INSTALL_DIR/i2p|g" eepget > a
 rm eepget
 mv a eepget
 # runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a
-sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh
+sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" runplain.sh > a
+sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" a > runplain.sh
 # i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
-sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a
-sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter
+sed "s|%INSTALL_PATH|/$INSTALL_DIR/i2p|g" i2prouter > a
+rm i2prouter
+mv a i2prouter
+sed "s|%SYSTEM_java_io_tmpdir|/$INSTALL_DIR/i2p|g" i2prouter > a
+sed "s|#ALLOW_ROOT=true|ALLOW_ROOT=true|g" a > i2prouter

 chmod 744 ./i2prouter
 chmod 744 ./osid
@@ -113,7 +120,7 @@ rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh

 mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
 mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
-mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new
+find $PKG/$INSTALL_DIR/i2p -name "*.xml" -exec mv {} {}.new \;
 mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
 mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
 sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -121,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc

 cd $PKG
 #
-# requiredbuilder fucks up REALLY bad, and thinks java is perl?!
+# requiredbuilder messes up REALLY bad, and thinks java is perl?!
 # It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
 #
 # requiredbuilder -v -y -s $CWD $PKG
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.i2p.router"
-      android:versionCode="1"
-      android:versionName="1.0.0">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- 3 = 1.5, 2 = 1.1, 1 = 1.0; would probably work with 1 but don't have a 1.0 SDK to test against -->
-    <uses-sdk android:minSdkVersion="2" />
-    <application android:label="@string/app_name">
-        <activity android:name=".I2PAndroid"
-                  android:label="@string/app_name"
-                  android:launchMode="singleTask" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest> 
--- a/android/README.txt
+++ b/android/README.txt
@@ -1,38 +0,0 @@
-These instructions are for a recent Android SDK (1.6 or later)..
-Should also still work with a 1.5 SDK.
-The build file is not compatible with the 1.1 SDK any more.
-
-#Download the SDK from http://developer.android.com/sdk/index.html
-#Unzip the android SDK in ../../
-#So then the android tools will be in ../../android-sdk-linux_86/tools/
-#
-# now go to the available packages tab, check the box and click refresh,
-# and download an SDK Platform
-# Since I2P is configured to run on 1.1 or higher
-# (API 2) download that one. Otherwise you must change the
-# target in default.properties from android-2 to andriod-x
-# where x is the API version.
-
-# create a file local.properties with the following line:
-# sdk-location=/path/to/your/android-sdk-linux_86
-
-#then build the android apk file:
-ant debug
-
-# Create the android 1.1 (API 2) virtual device
-# (don't make a custom hardware profile)
-# A AVD created with the 1.5 SDK will not work with the newer tools
-../../android-sdk-linux_86/tools/android create avd --name i2p --target 2
-
-#then run the emulator:
-../../android-sdk-linux_86/tools/emulator -avd i2p &
-
-#then wait a couple minutes until the emulator is up
-#then install the I2P app
-ant install
-
-#then run the debugger
-../../android-sdk-linux_86/tools/ddms &
-
-#to rebuild and reinstall to emulator:
-ant reinstall
--- a/android/build.xml
+++ b/android/build.xml
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name=".I2PAndroid" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contain the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
-    <property file="local.properties"/>
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
-         Here are some properties you may want to change/update:
-
-         application-package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
-         source-folder
-             the name of the source folder. Default is 'src'.
-         out-folder
-             the name of the output folder. Default is 'bin'.
-
-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
-
-         -->
-    <property file="build.properties"/>
-
-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT. 
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties"/>
-
-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the rules files.
-         To customize the rules, copy/paste them below the task, and disable import by setting
-         the import attribute to false:
-            <setup import="false" />
-         
-         This will ensure that the properties are setup correctly but that your customized
-         targets are used.
-    -->
-    <setup import="false" />
-
-    <!--
-         ================================================================================
-         New I2P rules
-         ================================================================================
-    -->
-
-    <target name="buildrouter" depends="dirs" >
-        <!-- build router and core -->
-        <ant dir=".." target="buildrouter" />
-
-        <!-- router -->
-        <copy file="../build/router.jar" todir="${external-libs-folder}" />
-
-        <!-- core -->
-        <mkdir dir="tmp" />
-        <unjar src="../build/i2p.jar" dest="tmp/" />
-        <delete file="tmp/net/i2p/util/LogWriter.class" />
-        <!-- org.bouncycastle.crypto already in android
-             but we need a little trickery because our HMac is incompatible...
-             and the libs aren't in the SDK to compile against??? -->
-        <jar destfile="${external-libs-folder}/crypto.jar" >
-            <fileset dir="tmp/" >
-                <include name="org/bouncycastle/crypto/Digest.class" />
-                <include name="org/bouncycastle/crypto/Mac.class" />
-                <include name="org/bouncycastle/crypto/digests/GeneralDigest.class" />
-                <include name="org/bouncycastle/crypto/digests/MD5Digest.class" />
-            </fileset>
-        </jar>
-        <delete>
-            <fileset dir="tmp/" >
-                <include name="org/bouncycastle/crypto/Digest.class" />
-                <include name="org/bouncycastle/crypto/Mac.class" />
-                <include name="org/bouncycastle/crypto/digests/GeneralDigest.class" />
-                <include name="org/bouncycastle/crypto/digests/MD5Digest.class" />
-            </fileset>
-        </delete>
-<!--
-        <delete dir="tmp/org/bouncycastle/" />
-        <delete file="tmp/net/i2p/crypto/HMACGenerator.class" />
-->
-        <delete file="tmp/org/bouncycastle/" />
-        <!-- lots of unneeded stuff could be deleted here -->
-        <jar destfile="${external-libs-folder}/i2p.jar" basedir="tmp/" />
-
-        <!-- some resources -->
-        <mkdir dir="res/drawable/" />
-        <copy file="../installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
-        <copy file="../installer/resources/blocklist.txt" tofile="res/raw/blocklist_txt" />
-    </target>
-
-    <target name="hackcleanup">
-        <delete file="${external-libs-folder}/crypto.jar" />
-    </target>
-
-    <!-- fix for property name change sometime after SDK 1.5 -->
-    <property name="android-jar" value="${android.jar}" />
-    <property name="android-aidl" value="${android.aidl}" />
-
-    <!--
-         ================================================================================
-         From here down copied from SDK platforms/android-1.1/templates/android_rules.xml
-         and then modified
-         ================================================================================
-    -->
-
-    <!--
-        This rules file is meant to be imported by the custom Ant task:
-            com.android.ant.AndroidInitTask
-
-        The following properties are put in place by the importing task:
-            android-jar, android-aidl, aapt, aidl, and dx
-
-        Additionnaly, the task sets up the following classpath reference:
-            android.target.classpath
-        This is used by the compiler task as the boot classpath.
-    -->
-
-    <!-- Custom tasks -->
-    <taskdef name="aaptexec"
-        classname="com.android.ant.AaptExecLoopTask"
-        classpathref="android.antlibs"/>
-
-    <taskdef name="apkbuilder"
-        classname="com.android.ant.ApkBuilderTask"
-        classpathref="android.antlibs"/>
-
-    <!-- Properties -->
-
-    <property name="android-tools" value="${sdk-location}/tools" />
-
-    <!-- Input directories -->
-    <property name="source-folder" value="src" />
-    <property name="gen-folder" value="gen" />
-    <property name="resource-folder" value="res" />
-    <property name="asset-folder" value="assets" />
-    <property name="source-location" value="${basedir}/${source-folder}" />
-
-    <!-- folder for the 3rd party java libraries -->
-    <property name="external-libs-folder" value="libs" />
-
-    <!-- folder for the native libraries -->
-    <property name="native-libs-folder" value="libs" />
-
-    <!-- Output directories -->
-    <property name="gen-folder" value="gen" />
-    <property name="out-folder" value="bin" />
-    <property name="out-classes" value="${out-folder}/classes" />
-    <property name="out-classes-location" value="${basedir}/${out-classes}"/>
-    <!-- out folders for a parent project if this project is an instrumentation project -->
-    <property name="main-out-folder" value="../${out-folder}" />
-    <property name="main-out-classes" value="${main-out-folder}/classes"/>
-
-    <!-- Intermediate files -->
-    <property name="dex-file" value="classes.dex" />
-    <property name="intermediate-dex" value="${out-folder}/${dex-file}" />
-    <!-- dx does not properly support incorrect / or \ based on the platform
-         and Ant cannot convert them because the parameter is not a valid path.
-         Because of this we have to compute different paths depending on the platform. -->
-    <condition property="intermediate-dex-location"
-            value="${basedir}\${intermediate-dex}"
-            else="${basedir}/${intermediate-dex}" >
-        <os family="windows"/>
-    </condition>
-
-    <!-- The final package file to generate -->
-    <property name="out-debug-package" value="${out-folder}/${ant.project.name}-debug.apk"/>
-
-    <!-- Tools -->
-    <condition property="exe" value=".exe" else=""><os family="windows"/></condition>
-    <property name="adb" value="${android-tools}/adb${exe}"/>
-
-    <!-- rules -->
-
-    <!-- Create the output directories if they don't exist yet. -->
-    <target name="dirs">
-        <echo>Creating output directories if needed...</echo>
-        <mkdir dir="${resource-folder}" />
-        <mkdir dir="${external-libs-folder}" />
-        <mkdir dir="${gen-folder}" />
-        <mkdir dir="${out-folder}" />
-        <mkdir dir="${out-classes}" />
-    </target>
-
-    <!-- Generate the R.java file for this project's resources. -->
-    <target name="resource-src" depends="dirs">
-        <echo>Generating R.java / Manifest.java from the resources...</echo>
-        <exec executable="${aapt}" failonerror="true">
-            <arg value="package" />
-            <arg value="-m" />
-            <arg value="-J" />
-            <arg path="${gen-folder}" />
-            <arg value="-M" />
-            <arg path="AndroidManifest.xml" />
-            <arg value="-S" />
-            <arg path="${resource-folder}" />
-            <arg value="-I" />
-            <arg path="${android-jar}" />
-        </exec>
-    </target>
-
-    <!-- Generate java classes from .aidl files. -->
-    <target name="aidl" depends="dirs">
-        <echo>Compiling aidl files into Java classes...</echo>
-        <apply executable="${aidl}" failonerror="true">
-            <arg value="-p${android-aidl}" />
-            <arg value="-I${source-folder}" />
-            <arg value="-o${gen-folder}" />
-            <fileset dir="${source-folder}">
-                <include name="**/*.aidl"/>
-            </fileset>
-        </apply>
-    </target>
-
-    <!-- Compile this project's .java files into .class files. -->
-    <!-- I2P add buildrouter -->
-    <target name="compile" depends="buildrouter, resource-src, aidl">
-        <javac encoding="ascii" target="1.5" debug="true" extdirs=""
-                destdir="${out-classes}"
-                bootclasspathref="android.target.classpath">
-            <src path="${source-folder}" />
-            <src path="${gen-folder}" />
-            <classpath>
-                <fileset dir="${external-libs-folder}" includes="*.jar"/>
-                <pathelement path="${main-out-classes}"/>
-            </classpath>
-         </javac>
-    </target>
-
-    <!-- Convert this project's .class files into .dex files. -->
-    <!-- I2P add hackcleanup -->
-    <target name="dex" depends="compile, hackcleanup">
-        <echo>Converting compiled files and external libraries into ${out-folder}/${dex-file}...</echo>
-        <apply executable="${dx}" failonerror="true" parallel="true">
-            <!-- I2P this is a bad sign that we need this -->
-            <arg value="-JXmx256m" />
-            <arg value="--dex" />
-            <arg value="--output=${intermediate-dex-location}" />
-            <arg path="${out-classes-location}" />
-            <fileset dir="${external-libs-folder}" includes="*.jar"/>
-        </apply>
-    </target>
-
-    <!-- Put the project's resources into the output package file
-         This actually can create multiple resource package in case
-         Some custom apk with specific configuration have been
-         declared in default.properties.
-         -->
-    <target name="package-resources">
-        <echo>Packaging resources</echo>
-        <aaptexec executable="${aapt}"
-                command="package"
-                manifest="AndroidManifest.xml"
-                resources="${resource-folder}"
-                assets="${asset-folder}"
-                androidjar="${android-jar}"
-                outfolder="${out-folder}"
-                basename="${ant.project.name}" />
-    </target>
-
-    <!-- Package the application and sign it with a debug key.
-         This is the default target when building. It is used for debug. -->
-    <target name="debug" depends="dex, package-resources">
-        <apkbuilder
-                outfolder="${out-folder}"
-                basename="${ant.project.name}"
-                signed="true"
-                verbose="false">
-            <file path="${intermediate-dex}" />
-            <sourcefolder path="${source-folder}" />
-            <jarfolder path="${external-libs-folder}" />
-            <nativefolder path="${native-libs-folder}" />
-        </apkbuilder>
-    </target>
-
-    <!-- Package the application without signing it.
-         This allows for the application to be signed later with an official publishing key. -->
-    <target name="release" depends="dex, package-resources">
-        <apkbuilder
-                outfolder="${out-folder}"
-                basename="${ant.project.name}"
-                signed="false"
-                verbose="false">
-            <file path="${intermediate-dex}" />
-            <sourcefolder path="${source-folder}" />
-            <jarfolder path="${external-libs-folder}" />
-            <nativefolder path="${native-libs-folder}" />
-        </apkbuilder>
-        <echo>All generated packages need to be signed with jarsigner before they are published.</echo>
-    </target>
-
-    <!-- Install the package on the default emulator -->
-    <target name="install" depends="debug">
-        <echo>Installing ${out-debug-package} onto default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="install" />
-            <arg path="${out-debug-package}" />
-        </exec>
-    </target>
-
-    <target name="reinstall" depends="debug">
-        <echo>Installing ${out-debug-package} onto default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="install" />
-            <arg value="-r" />
-            <arg path="${out-debug-package}" />
-        </exec>
-    </target>
-
-    <!-- Uinstall the package from the default emulator -->
-    <target name="uninstall">
-        <echo>Uninstalling ${application-package} from the default emulator...</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg value="uninstall" />
-            <arg path="${application-package}" />
-        </exec>
-    </target>
-    
-    <target name="help">
-        <!-- displays starts at col 13
-              |13                                                              80| -->
-        <echo>Android Ant Build. Available targets:</echo>
-        <echo>   help:      Displays this help.</echo>
-        <echo>   debug:     Builds the application and sign it with a debug key.</echo>
-        <echo>   release:   Builds the application. The generated apk file must be</echo>
-        <echo>              signed before it is published.</echo>
-        <echo>   install:   Installs the debug package onto a running emulator or</echo>
-        <echo>              device. This can only be used if the application has </echo>
-        <echo>              not yet been installed.</echo>
-        <echo>   reinstall: Installs the debug package on a running emulator or</echo>
-        <echo>              device that already has the application.</echo>
-        <echo>              The signatures must match.</echo>
-        <echo>   uninstall: uninstall the application from a running emulator or</echo>
-        <echo>              device.</echo>
-    </target>
-</project>
--- a/android/default.properties
+++ b/android/default.properties
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-2
--- a/android/res/layout/main.xml
+++ b/android/res/layout/main.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="Hello World, I2PAndroid"
-    />
-<ImageView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:src="@drawable/i2plogo"
-    />
-</LinearLayout>
-
--- a/android/res/raw/logger_config
+++ b/android/res/raw/logger_config
@@ -1,3 +0,0 @@
-logger.defaultLevel=INFO
-logger.record.net.i2p.router.transport.FIFOBandwidthRefiller=ERROR
-logger.record.net.i2p.stat.Rate=ERROR
--- a/android/res/raw/router_config
+++ b/android/res/raw/router_config
@@ -1,22 +0,0 @@
-# initial router.config
-# temp directory
-i2p.dir.temp=/data/data/net.i2p.router/files/tmp
-i2p.dir.pid=/data/data/net.i2p.router/files/tmp
-# save memory
-prng.buffers=2
-router.decayingBloomFilterM=20
-stat.full=false
-i2np.udp.maxConnections=30
-# no I2CP
-i2p.dummyClientFacade=true
-# for now
-#i2np.ntcp.enable=false
-#
-# UDP crashes the JVM, don't know why
-#
-i2np.udp.enable=false
-# no COMM at all!!!
-#i2p.vmCommSystem=true
-# not on android
-i2np.upnp.enable=false
-routerconsole.geoip.enable=false
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">I2PAndroid</string>
-</resources>
--- a/android/src/net/i2p/router/I2PAndroid.java
+++ b/android/src/net/i2p/router/I2PAndroid.java
@@ -1,142 +0,0 @@
-package net.i2p.router;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-import android.os.Bundle;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.List;
-
-import net.i2p.router.Router;
-import net.i2p.router.RouterLaunch;
-// import net.i2p.util.NativeBigInteger;
-
-public class I2PAndroid extends Activity
-{
-    static Context _context;
-    private static final String DIR = "/data/data/net.i2p.router/files";
-
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        _context = this;  // Activity extends Context
-        debugStuff();
-        initialize();
-        // 300ms per run
-        // 5x slower than java on my server and 50x slower than native on my server
-        // NativeBigInteger.main(null);
-    }
-
-    public void onRestart()
-    {
-        System.err.println("onRestart called");
-        super.onRestart();
-    }
-
-    public void onStart()
-    {
-        System.err.println("onStart called");
-        super.onStart();
-        RouterLaunch.main(null);
-        System.err.println("Router.main finished");
-    }
-
-    public void onResume()
-    {
-        System.err.println("onResume called");
-        super.onResume();
-    }
-
-    public void onPause()
-    {
-        System.err.println("onPause called");
-        super.onPause();
-    }
-
-    public void onStop()
-    {
-        System.err.println("onStop called");
-        super.onStop();
-
-        // from routerconsole ContextHelper
-        List contexts = RouterContext.listContexts();
-        if ( (contexts == null) || (contexts.isEmpty()) ) 
-            throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
-        RouterContext ctx = (RouterContext)contexts.get(0);
-
-        // shutdown() doesn't return so use shutdownGracefully()
-        ctx.router().shutdownGracefully(Router.EXIT_HARD);
-        System.err.println("shutdown complete");
-    }
-
-    public void onDestroy()
-    {
-        System.err.println("onDestroy called");
-        super.onDestroy();
-    }
-
-    public static Context getContext() {
-        return _context;
-    }
-
-    private void debugStuff() {
-        System.err.println("java.io.tmpdir" + ": " + System.getProperty("java.io.tmpdir"));
-        System.err.println("java.vendor" + ": " + System.getProperty("java.vendor"));
-        System.err.println("java.version" + ": " + System.getProperty("java.version"));
-        System.err.println("os.arch" + ": " + System.getProperty("os.arch"));
-        System.err.println("os.name" + ": " + System.getProperty("os.name"));
-        System.err.println("os.version" + ": " + System.getProperty("os.version"));
-        System.err.println("user.dir" + ": " + System.getProperty("user.dir"));
-        System.err.println("user.home" + ": " + System.getProperty("user.home"));
-        System.err.println("user.name" + ": " + System.getProperty("user.name"));
-    }
-
-    private void initialize() {
-        // Until we can edit the router.config on the device,
-        // copy it from the resource every time.
-        // File f = new I2PFile("router.config");
-        // if (!f.exists()) {
-            copyResourceToFile(R.raw.router_config, "router.config");
-            copyResourceToFile(R.raw.logger_config, "logger.config");
-            copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
-        // }
-
-        // Set up the locations so Router and WorkingDir can find them
-        System.setProperty("i2p.dir.base", DIR);
-        System.setProperty("i2p.dir.config", DIR);
-        System.setProperty("wrapper.logfile", DIR + "/wrapper.log");
-    }
-
-    private void copyResourceToFile(int resID, String f) {
-        InputStream in = null;
-        FileOutputStream out = null;
-
-        System.err.println("Creating file " + f + " from resource");
-        byte buf[] = new byte[4096];
-        try {
-            // Context methods
-            in = getResources().openRawResource(resID);
-            out = openFileOutput(f, 0);
-            
-            int read = 0;
-            while ( (read = in.read(buf)) != -1)
-                out.write(buf, 0, read);
-            
-        } catch (IOException ioe) {
-        } catch (Resources.NotFoundException nfe) {
-        } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
-        }
-    }
-    
-}
--- a/android/src/net/i2p/util/LogWriter.java
+++ b/android/src/net/i2p/util/LogWriter.java
@@ -1,163 +0,0 @@
-package net.i2p.util;
-
-/*
- * public domain
- *
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-
-/**
- * bridge to android logging
- *
- * @author zzz
- */
-class LogWriter implements Runnable {
-    private final static long CONFIG_READ_ITERVAL = 10 * 1000;
-    private long _lastReadConfig = 0;
-    private long _numBytesInCurrentFile = 0;
-    private OutputStream _currentOut; // = System.out
-    private int _rotationNum = -1;
-    private String _logFilenamePattern;
-    private File _currentFile;
-    private LogManager _manager;
-
-    private boolean _write;
-    
-    private LogWriter() { // nop
-    }
-
-    public LogWriter(LogManager manager) {
-        _manager = manager;
-    }
-
-    public void stopWriting() {
-        _write = false;
-    }
-    
-    public void run() {
-        _write = true;
-        try {
-            while (_write) {
-                flushRecords();
-                rereadConfig();
-            }
-            System.err.println("Done writing");
-        } catch (Exception e) {
-            System.err.println("Error writing the logs: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    public void flushRecords() { flushRecords(true); }
-    public void flushRecords(boolean shouldWait) {
-        try {
-            List records = _manager._removeAll();
-            if (records == null) return;
-            for (int i = 0; i < records.size(); i++) {
-                LogRecord rec = (LogRecord) records.get(i);
-                writeRecord(rec);
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-        } finally {
-            if (shouldWait) {
-                try { 
-                    synchronized (this) {
-                        this.wait(10*1000); 
-                    }
-                } catch (InterruptedException ie) { // nop
-                }
-            }
-        }
-    }
-
-    public String currentFile() {
-        return _currentFile != null ? _currentFile.getAbsolutePath() : "uninitialized";
-    }
-    
-    private void rereadConfig() {
-        long now = Clock.getInstance().now();
-        if (now - _lastReadConfig > CONFIG_READ_ITERVAL) {
-            _manager.rereadConfig();
-            _lastReadConfig = now;
-        }
-    }
-
-    private void writeRecord(LogRecord rec) {
-        if (rec.getThrowable() == null)
-            log(rec.getPriority(), rec.getSource(), rec.getSourceName(), rec.getThreadName(), rec.getMessage());
-        else
-            log(rec.getPriority(), rec.getSource(), rec.getSourceName(), rec.getThreadName(), rec.getMessage(), rec.getThrowable());
-    }
-
-    public void log(int priority, Class src, String name, String threadName, String msg) {
-            if (src != null) {
-                String tag = src.getName();
-                int dot = tag.lastIndexOf(".");
-                if (dot >= 0)
-                    tag = tag.substring(dot + 1);
-                android.util.Log.println(toAndroidLevel(priority),
-                                         tag,
-                                         '[' + threadName + "] " + msg);
-            } else if (name != null)
-                android.util.Log.println(toAndroidLevel(priority),
-                                         name,
-                                         '[' + threadName + "] " + msg);
-            else
-                android.util.Log.println(toAndroidLevel(priority),
-                                         threadName, msg);
-    }
-
-    public void log(int priority, Class src, String name, String threadName, String msg, Throwable t) {
-            if (src != null) {
-                String tag = src.getName();
-                int dot = tag.lastIndexOf(".");
-                if (dot >= 0)
-                    tag = tag.substring(dot + 1);
-                android.util.Log.println(toAndroidLevel(priority),
-                                         tag,
-                                         '[' + threadName + "] " + msg +
-                                         ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-            } else if (name != null)
-                android.util.Log.println(toAndroidLevel(priority),
-                                         name,
-                                         '[' + threadName + "] " + msg +
-                                         ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-            else
-                android.util.Log.println(toAndroidLevel(priority),
-                                         threadName,
-                                         msg + ' ' + t.toString() + ' ' + android.util.Log.getStackTraceString(t));
-    }
-
-    private static int toAndroidLevel(int level) {
-        switch (level) {
-        case Log.DEBUG:
-            return android.util.Log.DEBUG;
-        case Log.INFO:
-            return android.util.Log.INFO;
-        case Log.WARN:
-            return android.util.Log.WARN;
-        case Log.ERROR:
-        case Log.CRIT:
-        default:
-            return android.util.Log.ERROR;
-        }
-    }
-
-    private static final String replace(String pattern, int num) {
-        char c[] = pattern.toCharArray();
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < c.length; i++) {
-            if ( (c[i] != '#') && (c[i] != '@') )
-                buf.append(c[i]);
-            else
-                buf.append(num);
-        }
-        return buf.toString();
-    }
-}
--- a/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
+++ b/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB.Demos.echo.echoclient;

@@ -55,7 +47,7 @@ public class Main {
 				// exit on anything not legal
 				break;
 			}
-			c = (char)(b & 0x7f); // We only really give a fuck about ASCII
+			c = (char)(b & 0x7f); // We only care about ASCII
 			S = new String(S + c);
 		}
 		return S;
--- a/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
+++ b/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB.Demos.echo.echoserver;

@@ -52,7 +44,7 @@ public class Main {
 			if(b < 20) {
 				break;
 			}
-			c = (char)(b & 0x7f); // We only really give a fuck about ASCII
+			c = (char)(b & 0x7f); // We only care about ASCII
 			S = new String(S + c);
 		}
 		return S;
--- a/apps/BOB/build.xml
+++ b/apps/BOB/build.xml
@@ -71,6 +71,7 @@
    nbproject/build-impl.xml file. 

    -->
+
    <target depends="jar" description="Build BOB into a SINGLE JAR." name="onejar">
 	<!-- Make needed working dirs -->
 	<mkdir dir="${dist.dir}/lib" />
@@ -82,7 +83,7 @@
 	        <pathelement path="${javac.classpath}" />
 	    </path>
 	</copy>
-	<copy todir="${dist.dir}/lib" file="../../installer/lib/jbigi/jbigi.jar" />
+	<copy todir="${dist.dir}/lib" file="../../build/jbigi.jar" />

 	<!-- Extract the classes inside the jar files -->
 	<unjar dest="${dist.dir}/classes" >
--- a/apps/BOB/nbproject/project.properties
+++ b/apps/BOB/nbproject/project.properties
@@ -26,15 +26,15 @@ dist.dir=dist
 dist.jar=${dist.dir}/BOB.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=
+excludes=**/*.html,**/*.txt
 file.reference.build-javadoc=../../i2p.i2p/build/javadoc
 file.reference.i2p.jar=../../core/java/build/i2p.jar
 file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
-file.reference.jbigi.jar=../../installer/lib/jbigi/jbigi.jar
+file.reference.jbigi.jar=../../build/jbigi.jar
 file.reference.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
 file.reference.router.jar=../../router/java/build/router.jar
 file.reference.streaming.jar=../streaming/java/build/streaming.jar
-file.reference.wrapper.jar=../../installer/lib/wrapper/linux/wrapper.jar
+file.reference.wrapper.jar=../../installer/lib/wrapper/all/wrapper.jar
 includes=**
 jar.compress=true
 javac.classpath=\
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -38,7 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean;

 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PClient;
-import net.i2p.client.streaming.RetransmissionTimer;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;
@@ -116,10 +107,10 @@ import net.i2p.util.SimpleTimer2;
 */
 public class BOB {

-	private final static Log _log = new Log(BOB.class);
 	public final static String PROP_CONFIG_LOCATION = "BOB.config";
 	public final static String PROP_BOB_PORT = "BOB.port";
 	public final static String PROP_BOB_HOST = "BOB.host";
+	public final static String PROP_CFG_VER = "BOB.CFG.VER";
 	private static NamedDB database;
 	private static Properties props = new Properties();
 	private static AtomicBoolean spin = new AtomicBoolean(true);
@@ -137,7 +128,7 @@ public class BOB {
 	 */
 	public static void info(String arg) {
 		System.out.println("INFO:" + arg);
-		_log.info(arg);
+		(new Log(BOB.class)).info(arg);
 	}

 	/**
@@ -147,7 +138,7 @@ public class BOB {
 	 */
 	public static void warn(String arg) {
 		System.out.println("WARNING:" + arg);
-		_log.warn(arg);
+		(new Log(BOB.class)).warn(arg);
 	}

 	/**
@@ -157,7 +148,7 @@ public class BOB {
 	 */
 	public static void error(String arg) {
 		System.out.println("ERROR: " + arg);
-		_log.error(arg);
+		(new Log(BOB.class)).error(arg);
 	}

 	/**
@@ -181,12 +172,11 @@ public class BOB {
 		// Re-reading the config file in each thread is pretty damn stupid.
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 		// This is here just to ensure there is no interference with our threadgroups.
-		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y.hashCode();
 		i = Y1.hashCode();
 		i = Y2.hashCode();
+		Log _log = new Log(BOB.class);
 		try {
 			{
 				File cfg = new File(configLocation);
@@ -209,30 +199,41 @@ public class BOB {
 			// Global router and client API configurations that are missing are set to defaults here.
 			if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
 				props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+				save = true;
 			}
 			if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
 				props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-			}
-			if (!props.containsKey(I2PClient.PROP_RELIABILITY)) {
-				props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_BEST_EFFORT);
+				save = true;
 			}
 			if (!props.containsKey(PROP_BOB_PORT)) {
 				props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
+				save = true;
 			}
 			if (!props.containsKey("inbound.length")) {
 				props.setProperty("inbound.length", "1");
+				save = true;
 			}
 			if (!props.containsKey("outbound.length")) {
 				props.setProperty("outbound.length", "1");
+				save = true;
 			}
 			if (!props.containsKey("inbound.lengthVariance")) {
 				props.setProperty("inbound.lengthVariance", "0");
+				save = true;
 			}
 			if (!props.containsKey("outbound.lengthVariance")) {
 				props.setProperty("outbound.lengthVariance", "0");
+				save = true;
 			}
 			if (!props.containsKey(PROP_BOB_HOST)) {
 				props.setProperty(PROP_BOB_HOST, "localhost");
+				save = true;
+			}
+			// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
+			if (!props.containsKey(PROP_CFG_VER)) {
+				props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
+				props.setProperty(PROP_CFG_VER,"1");
+				save = true;
 			}
 			if (save) {
 				File cfg = new File(configLocation);
@@ -251,6 +252,7 @@ public class BOB {

 			i = 0;
 			boolean g = false;
+			spin.set(true);
 			try {
 				info("BOB is now running.");
 				listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -29,12 +21,16 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.Socket;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClientFactory;
+//import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
+//import net.i2p.i2ptunnel.I2PTunnel;
 import net.i2p.util.Log;
 // needed only for debugging.
 // import java.util.logging.Level;
@@ -50,7 +46,7 @@ public class DoCMDS implements Runnable {

 	// FIX ME
 	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0D",  BEXT = "";
+	public static final String BMAJ = "00",  BMIN = "00",  BREV = "10",  BEXT = "";
 	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
 	private Socket server;
 	private Properties props;
@@ -86,6 +82,7 @@ public class DoCMDS implements Runnable {
 	private static final String C_inhost = "inhost";
 	private static final String C_inport = "inport";
 	private static final String C_list = "list";
+	private static final String C_lookup = "lookup";
 	private static final String C_newkeys = "newkeys";
 	private static final String C_option = "option";
 	private static final String C_outhost = "outhost";
@@ -103,7 +100,7 @@ public class DoCMDS implements Runnable {
 	private static final String C_visit = "visit";
 	private static final String C_zap = "zap";

-	/* all the coomands available, plus description */
+	/* all the commands available, plus description */
 	private static final String C_ALL[][] = {
 		{C_help, C_help + " <command> * Get help on a command."},
 		{C_clear, C_clear + " * Clear the current nickname out of the list."},
@@ -113,6 +110,7 @@ public class DoCMDS implements Runnable {
 		{C_inhost, C_inhost + " hostname | IP * Set the inbound hostname or IP."},
 		{C_inport, C_inport + " port_number * Set the inbound port number nickname listens on."},
 		{C_list, C_list + " * List all tunnels."},
+		{C_lookup, C_lookup + " * Lookup an i2p address."},
 		{C_newkeys, C_newkeys + " * Generate a new keypair for the current nickname."},
 		{C_option, C_option + " I2CPoption=something * Set an I2CP option. NOTE: Don't use any spaces."},
 		{C_outhost, C_outhost + " hostname | IP * Set the outbound hostname or IP."},
@@ -138,6 +136,7 @@ public class DoCMDS implements Runnable {
 			C_inhost + " " +
 			C_inport + " " +
 			C_list + " " +
+			C_lookup + " " +
 			C_newkeys + " " +
 			C_option + " " +
 			C_outhost + " " +
@@ -393,7 +392,7 @@ public class DoCMDS implements Runnable {
 	 */
 	private boolean is64ok(String data) {
 		try {
-			Destination x = new Destination(data);
+			new Destination(data);
 			return true;
 		} catch (Exception e) {
 			return false;
@@ -428,7 +427,7 @@ public class DoCMDS implements Runnable {
 							if (token.countTokens() != 0) {
 								Command = token.nextToken();
 								Command =
-									Command.toLowerCase();
+									Command.toLowerCase(Locale.US);
 								if (token.countTokens() != 0) {
 									Arg = token.nextToken();
 								} else {
@@ -446,6 +445,28 @@ public class DoCMDS implements Runnable {
 								} else if (Command.equals(C_visit)) {
 									visitAllThreads();
 									out.println("OK ");
+								} else if (Command.equals(C_lookup)) {
+									Destination dest = null;
+									String reply = null;
+									if (Arg.endsWith(".i2p")) {
+										try {
+											//try {
+												//dest = I2PTunnel.destFromName(Arg);
+											//} catch (DataFormatException ex) {
+											//}
+											dest = I2PAppContext.getGlobalContext().namingService().lookup(Arg);
+											if(dest != null) {
+												reply = dest.toBase64();
+											}
+										} catch (NullPointerException npe) {
+											// Could not find the destination!?
+										}
+									}
+									if (reply == null) {
+										out.println("ERROR Address Not found.");
+									} else {
+										out.println("OK " + reply);
+									}
 								} else if (Command.equals(C_getdest)) {
 									if (ns) {
 										if (dk) {
@@ -934,7 +955,7 @@ public class DoCMDS implements Runnable {
 										} catch (Exception e) {
 											break die;
 										}
-// Finally say OK.
+										// Finally say OK.
 										out.println("OK Nickname set to " + Arg);
 									}

@@ -1444,7 +1465,7 @@ public class DoCMDS implements Runnable {
 					} // die
 					out.print("ERROR A really bad error just happened, ");
 				} // quit
-// Say goodbye.
+				// Say goodbye.

 				out.println("OK Bye!");

--- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java
+++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -41,7 +33,6 @@ public class I2Plistener implements Runnable {

 	private NamedDB info,  database;
 	private Log _log;
-//	private int tgwatch;
 	public I2PSocketManager socketManager;
 	public I2PServerSocket serverSocket;
 	private AtomicBoolean lives;
@@ -95,7 +86,7 @@ public class I2Plistener implements Runnable {

 				}
 			} catch (I2PException e) {
-				// bad shit
+				// bad stuff
 				System.out.println("Exception " + e);
 			}
 		} finally {
@@ -103,7 +94,7 @@ public class I2Plistener implements Runnable {
 				serverSocket.close();
 			} catch (I2PException ex) {
 			}
-		// System.out.println("I2Plistener: Close");
+			// System.out.println("I2Plistener: Close");
 		}
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
+++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

--- a/apps/BOB/src/net/i2p/BOB/Lifted.java
+++ b/apps/BOB/src/net/i2p/BOB/Lifted.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -108,16 +100,6 @@ public class MUXlisten implements Runnable {
 				this.listener = new ServerSocket(port, backlog, host);
 			}
 			socketManager = I2PSocketManagerFactory.createManager(prikey, Q);
-		// I2PException, IOException, RuntimeException
-		// To bad we can't just catch and enumerate....
-		// } catch (I2PException e) {
-		// Something went bad.
-		//	this.database.getWriteLock();
-		//	this.info.getWriteLock();
-		//	this.info.add("STARTING", new Boolean(false));
-		//	this.info.releaseWriteLock();
-		//	this.database.releaseWriteLock();
-		//	throw new I2PException(e);
 		} catch (IOException e) {
 			// Something went bad.
 			this.database.getWriteLock();
@@ -194,7 +176,6 @@ public class MUXlisten implements Runnable {
 				lock.set(false);
 				return;
 			}
-//		socketManager.addDisconnectListener(new DisconnectListener());
 			lives.set(true);
 			lock.set(false);
 			quit:
@@ -313,14 +294,14 @@ public class MUXlisten implements Runnable {

 			// Hopefully nuke stuff here...
 			{
-				String boner = tg.getName();
+				String groupName = tg.getName();
 				try {
-					_log.warn("destroySocketManager " + boner);
+					_log.warn("destroySocketManager " + groupName);
 					socketManager.destroySocketManager();
-					_log.warn("destroySocketManager Successful" + boner);
+					_log.warn("destroySocketManager Successful" + groupName);
 				} catch (Exception e) {
 					// nop
-					_log.warn("destroySocketManager Failed" + boner);
+					_log.warn("destroySocketManager Failed" + groupName);
 					_log.warn(e.toString());
 				}
 			}
@@ -344,26 +325,25 @@ public class MUXlisten implements Runnable {

 			// Wait around till all threads are collected.
 			if (tg != null) {
-				String boner = tg.getName();
-				// System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner);
-				_log.warn("BOB: MUXlisten: Starting thread collection for: " + boner);
-				// tg.interrupt(); // give my stuff a small smack again.
+				String groupName = tg.getName();
+				// System.out.println("BOB: MUXlisten: Starting thread collection for: " + groupName);
+				_log.warn("BOB: MUXlisten: Starting thread collection for: " + groupName);
 				if (tg.activeCount() + tg.activeGroupCount() != 0) {
-					// visit(tg, 0, boner);
+					// visit(tg, 0, groupName);
 					int foo = tg.activeCount() + tg.activeGroupCount();
 					// hopefully no longer needed!
 					// int bar = lives;
-					// System.out.println("BOB: MUXlisten: Waiting on threads for " + boner);
-					// System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
-					// visit(tg, 0, boner);
-					// System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+					// System.out.println("BOB: MUXlisten: Waiting on threads for " + groupName);
+					// System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
+					// visit(tg, 0, groupName);
+					// System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
 					// Happily spin forever :-(
 					while (foo != 0) {
 						foo = tg.activeCount() + tg.activeGroupCount();
 						// if (lives != bar && lives != 0) {
-						// 	System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
-						// 	visit(tg, 0, boner);
-						// 	System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+						// 	System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName);
+						// 	visit(tg, 0, groupName);
+						// 	System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n");
 						// }
 						// bar = lives;
 						try {
@@ -373,8 +353,8 @@ public class MUXlisten implements Runnable {
 						}
 					}
 				}
-				// System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner);
-				_log.warn("BOB: MUXlisten: Threads went away. Success: " + boner);
+				// System.out.println("BOB: MUXlisten: Threads went away. Success: " + groupName);
+				_log.warn("BOB: MUXlisten: Threads went away. Success: " + groupName);
 				tg.destroy();
 				// Zap reference to the ThreadGroup so the JVM can GC it.
 				tg = null;
--- a/apps/BOB/src/net/i2p/BOB/Main.java
+++ b/apps/BOB/src/net/i2p/BOB/Main.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,11 +11,10 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

-import net.i2p.client.streaming.RetransmissionTimer;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer2;

@@ -40,7 +31,6 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		SimpleScheduler Y1 = SimpleScheduler.getInstance();
 		SimpleTimer2 Y2 = SimpleTimer2.getInstance();

@@ -48,6 +38,5 @@ public class Main {

 		Y2.stop();
 		Y1.stop();
-		Y.stop();
 	}
 }
--- a/apps/BOB/src/net/i2p/BOB/NamedDB.java
+++ b/apps/BOB/src/net/i2p/BOB/NamedDB.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

--- a/apps/BOB/src/net/i2p/BOB/TCPio.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPio.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -95,14 +87,9 @@ public class TCPio implements Runnable {
 					if (b > 0) {
 						Aout.write(a, 0, b);
 					} else if (b == 0) {
-// Will this die? We'll see.
 						while(Ain.available() == 0) {
 							Thread.sleep(20);
 						}
-//						Thread.yield(); // this should act like a mini sleep.
-//						if (Ain.available() == 0) {
-//							Thread.sleep(10);
-//						}
 					} else {
 						/* according to the specs:
 						 *
--- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -27,8 +19,6 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-// import net.i2p.client.I2PSession;
-// import net.i2p.client.I2PSessionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -30,13 +22,15 @@ import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-import net.i2p.i2ptunnel.I2PTunnel;
+//import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.I2PAppContext;

 /**
 *
@@ -92,7 +86,7 @@ public class TCPtoI2P implements Runnable {
 				// exit on anything not legal
 				break;
 			}
-			c = (char) (b & 0x7f); // We only really give a fuck about ASCII
+			c = (char) (b & 0x7f); // We only care about ASCII
 			S = new String(S + c);
 		}
 		return S;
@@ -106,20 +100,18 @@ public class TCPtoI2P implements Runnable {
 	 * @throws java.io.IOException
 	 */
 	private void Emsg(String e, OutputStream out) throws IOException {
-// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
+		// Debugging		System.out.println("ERROR TCPtoI2P: " + e);
 		out.write("ERROR ".concat(e).getBytes());
 		out.write(13);
 		out.write(10);
 		out.flush();
 	}

-//	private void rlock() throws Exception {
 	private void rlock() {
 		database.getReadLock();
 		info.getReadLock();
 	}

-//	private void runlock() throws Exception {
 	private void runlock() {
 		info.releaseReadLock();
 		database.releaseReadLock();
@@ -143,14 +135,14 @@ public class TCPtoI2P implements Runnable {
 				in = sock.getInputStream();
 				out = sock.getOutputStream();
 				line = lnRead(in);
-				input = line.toLowerCase();
+				input = line.toLowerCase(Locale.US);
 				Destination dest = null;
 				if (input.endsWith(".i2p")) {
-					try {
-						dest = I2PTunnel.destFromName(input);
+					//dest = I2PTunnel.destFromName(input);
+					dest = I2PAppContext.getGlobalContext().namingService().lookup(input);
+					if (dest != null) {
 						line = dest.toBase64();
-					} catch (NullPointerException npe) {
-						// Could not find the destination!?
+					} else {
 						Emsg("Can't find destination: " + input, out);
 						return;
 					}
--- a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
+++ b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java
@@ -1,17 +1,9 @@
 /**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                    WTFPL
 *                    Version 2, December 2004
 *
 * Copyright (C) sponge
 *   Planet Earth
- * Everyone is permitted to copy and distribute verbatim or modified
- * copies of this license document, and changing it is allowed as long
- * as the name is changed.
- *
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *  0. You just DO WHAT THE FUCK YOU WANT TO.
 *
 * See...
 *
@@ -19,7 +11,7 @@
 *	and
 *	http://en.wikipedia.org/wiki/WTFPL
 *
- * ...for any additional details and liscense questions.
+ * ...for any additional details and license questions.
 */
 package net.i2p.BOB;

@@ -111,7 +103,7 @@ public class UDPIOthread implements I2PSessionListener, Runnable {
 	 * @param size
 	 */
 	public void messageAvailable(I2PSession session, int msgId, long size) {
-//		_log.debug("Message available: id = " + msgId + " size = " + size);
+		//		_log.debug("Message available: id = " + msgId + " size = " + size);
 		try {
 			byte msg[] = session.receiveMessage(msgId);
 			out.write(msg);
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -38,6 +38,7 @@

 	<target name="compile" depends="init, depend">
 		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+                       includeAntRuntime="false"
                       srcdir="${src}" destdir="${build}">
            <compilerarg line="${javac.compilerargs}" />
            <classpath>
@@ -47,27 +48,68 @@
 		</javac>
 	</target>

-	<target name="jar" depends="compile">
+        <!-- unused for now, as we oddly ship addressbook as a .war -->
+	<target name="jar" depends="compile, changes">
 		<jar basedir="${build}" destfile="${dist}/${jar}">
+		<!-- set if unset -->
+		<property name="workspace.changes" value="" />
 			<manifest>
 				<attribute name="Main-Class" value="addressbook.Daemon"/>
+				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Built-By" value="${build.built-by}" />
+		                <attribute name="Build-Date" value="${build.timestamp}" />
+		                <attribute name="Base-Revision" value="${workspace.version}" />
+		                <attribute name="Workspace-Changes" value="${workspace.changes}" />
 			</manifest>
 		</jar>
 	</target>
 	
-	<target name="war" depends="compile" unless="war.uptodate">
+	<target name="war" depends="compile, changes, warUpToDate" unless="war.uptodate">
 		<mkdir dir="${dist}/tmp"/>
 		<mkdir dir="${dist}/tmp/WEB-INF"/>
 		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
 		<copy todir="${dist}/tmp/WEB-INF/classes">
 			<fileset dir="${build}"/>
 		</copy>
-		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}"/>
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
+		<war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
+			<manifest>
+				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Built-By" value="${build.built-by}" />
+		                <attribute name="Build-Date" value="${build.timestamp}" />
+		                <attribute name="Base-Revision" value="${workspace.version}" />
+		                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+			</manifest>
+		</war>
 		<delete dir="${dist}/tmp"/>
 	</target>
 	
-        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
-            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
-        </uptodate>
+	<target name="warUpToDate">
+	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
+		            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
+	        </uptodate>
+                <condition property="shouldListChanges" >
+                    <and>
+                        <not>
+                            <isset property="war.uptodate" />
+                        </not>
+                        <isset property="mtn.available" />
+                    </and>
+                </condition>
+	</target>

+	<target name="changes" depends="warUpToDate" if="shouldListChanges" >
+	        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
+	            <arg value="list" />
+	            <arg value="changed" />
+	            <arg value="." />
+	        </exec>
+		<!-- \n in an attribute value generates an invalid manifest -->
+		<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
+			<arg value="-s" />
+			<arg value="[:space:]" />
+			<arg value="," />
+		</exec>
+	</target>
 </project>
--- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@@ -23,12 +23,14 @@ package net.i2p.addressbook;

 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

 import net.i2p.I2PAppContext;
 import net.i2p.util.EepGet;
+import net.i2p.util.SecureFile;

 /**
 * An address book for storing human readable names mapped to base64 i2p
@@ -38,13 +40,14 @@ import net.i2p.util.EepGet;
 * @author Ragnarok
 *  
 */
-public class AddressBook {
-
-    private String location;
-
-    private Map addresses;
+class AddressBook {

+    private final String location;
+    /** either addresses or subFile will be non-null, but not both */
+    private final Map<String, String> addresses;
+    private final File subFile;
    private boolean modified;
+    private static final boolean DEBUG = false;

    /**
     * Construct an AddressBook from the contents of the Map addresses.
@@ -53,8 +56,10 @@ public class AddressBook {
     *            A Map containing human readable addresses as keys, mapped to
     *            base64 i2p destinations.
     */
-    public AddressBook(Map addresses) {
+    public AddressBook(Map<String, String> addresses) {
        this.addresses = addresses;
+        this.subFile = null;
+        this.location = null;
    }

    /*
@@ -82,38 +87,55 @@ public class AddressBook {
    }
 */
    static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts
+
    /**
     * Construct an AddressBook from the Subscription subscription. If the
     * address book at subscription has not changed since the last time it was
     * read or cannot be read, return an empty AddressBook.
     * Set a maximum size of the remote book to make it a little harder for a malicious book-sender.
     * 
+     * Yes, the EepGet fetch() is done in this constructor.
+     * 
+     * This stores the subscription in a temporary file and does not read the whole thing into memory.
+     * An AddressBook created with this constructor may not be modified or written using write().
+     * It may be a merge source (an parameter for another AddressBook's merge())
+     * but may not be a merge target (this.merge() will throw an exception).
+     * 
     * @param subscription
     *            A Subscription instance pointing at a remote address book.
     * @param proxyHost hostname of proxy
     * @param proxyPort port number of proxy
     */
    public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
-        File tmp = new File(I2PAppContext.getGlobalContext().getTempDir(), "addressbook.tmp");
+        Map<String, String> a = null;
+        File subf = null;
+        try {
+            File tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
+            EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
+                    proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
+                    subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
+            if (get.fetch()) {
+                subscription.setEtag(get.getETag());
+                subscription.setLastModified(get.getLastModified());
+                subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
+                subf = tmp;
+            } else {
+                a = Collections.EMPTY_MAP;
+                tmp.delete();
+            }
+        } catch (IOException ioe) {
+            a = Collections.EMPTY_MAP;
+        }
+        this.addresses = a;
+        this.subFile = subf;
        this.location = subscription.getLocation();
-        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
-                proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
-                subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
-        if (get.fetch()) {
-            subscription.setEtag(get.getETag());
-            subscription.setLastModified(get.getLastModified());
-        }
-        try {            
-            this.addresses = ConfigParser.parse(tmp);
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-        tmp.delete();
    }

    /**
     * Construct an AddressBook from the contents of the file at file. If the
-     * file cannot be read, construct an empty AddressBook
+     * file cannot be read, construct an empty AddressBook.
+     * This reads the entire file into memory.
+     * The resulting map is modifiable and may be a merge target.
     * 
     * @param file
     *            A File pointing at a file with lines in the format
@@ -122,22 +144,38 @@ public class AddressBook {
     */
    public AddressBook(File file) {
        this.location = file.toString();
+        Map<String, String> a;
        try {
-            this.addresses = ConfigParser.parse(file);
+            a = ConfigParser.parse(file);
        } catch (IOException exp) {
-            this.addresses = new HashMap();
+            a = new HashMap();
        }
+        this.addresses = a;
+        this.subFile = null;
    }

    /**
-     * Return a Map containing the addresses in the AddressBook.
-     * 
-     * @return A Map containing the addresses in the AddressBook, where the key
-     *         is a human readable name, and the value is a base64 i2p
-     *         destination.
+     * Return an iterator over the addresses in the AddressBook.
+     * @since 0.8.7
     */
-    public Map getAddresses() {
-        return this.addresses;
+    public Iterator<Map.Entry<String, String>> iterator() {
+        if (this.subFile != null)
+            return new ConfigIterator(this.subFile);
+        return this.addresses.entrySet().iterator();
+    }
+
+    /**
+     * Delete the temp file or clear the map.
+     * @since 0.8.7
+     */
+    public void delete() {
+        if (this.subFile != null) {
+            this.subFile.delete();
+        } else if (this.addresses != null) {
+            try {
+                this.addresses.clear();
+            } catch (UnsupportedOperationException uoe) {}
+        }
    }

    /**
@@ -145,29 +183,32 @@ public class AddressBook {
     * 
     * @return A String representing either an abstract path, or a url,
     *         depending on how the instance was constructed.
+     *         Will be null if created with the Map constructor.
     */
    public String getLocation() {
        return this.location;
    }

    /**
-     * Return a string representation of the contents of the AddressBook.
+     * Return a string representation of the origin of the AddressBook.
     * 
-     * @return A String representing the contents of the AddressBook.
+     * @return A String representing the origin of the AddressBook.
     */
    @Override
    public String toString() {
-        return this.addresses.toString();
+        if (this.location != null)
+            return "Book from " + this.location;
+        return "Map containing " + this.addresses.size() + " entries";
    }

    private static final int MIN_DEST_LENGTH = 516;
    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now

    /**
-     * Do basic validation of the hostname and dest
+     * Do basic validation of the hostname
     * hostname was already converted to lower case by ConfigParser.parse()
     */
-    private static boolean valid(String host, String dest) {
+    public static boolean isValidKey(String host) {
 	return
 		host.endsWith(".i2p") &&
 		host.length() > 4 &&
@@ -191,11 +232,20 @@ public class AddressBook {
                (! host.equals("console.i2p")) &&
                (! host.endsWith(".proxy.i2p")) &&
                (! host.endsWith(".router.i2p")) &&
-                (! host.endsWith(".console.i2p")) &&
+                (! host.endsWith(".console.i2p"))
+                ;	
+    }

+    /**
+     * Do basic validation of the b64 dest, without bothering to instantiate it
+     */
+    private static boolean isValidDest(String dest) {
+	return
                // null cert ends with AAAA but other zero-length certs would be AA
 		((dest.length() == MIN_DEST_LENGTH && dest.endsWith("AA")) ||
 		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
+		// B64 comes in groups of 2, 3, or 4 chars, but never 1
+		((dest.length() % 4) != 1) &&
                dest.replaceAll("[a-zA-Z0-9~-]", "").length() == 0
                ;	
    }
@@ -211,18 +261,21 @@ public class AddressBook {
     * @param overwrite True to overwrite
     * @param log
     *            The log to write messages about new addresses or conflicts to.
+     *
+     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
    public void merge(AddressBook other, boolean overwrite, Log log) {
-        Iterator otherIter = other.addresses.keySet().iterator();
+        if (this.addresses == null)
+            throw new IllegalStateException();
+        for (Iterator<Map.Entry<String, String>> iter = other.iterator(); iter.hasNext(); ) {
+            Map.Entry<String, String> entry = iter.next();
+            String otherKey = entry.getKey();
+            String otherValue = entry.getValue();

-        while (otherIter.hasNext()) {
-            String otherKey = (String) otherIter.next();
-            String otherValue = (String) other.addresses.get(otherKey);
-
-            if (valid(otherKey, otherValue)) {
+            if (isValidKey(otherKey) && isValidDest(otherValue)) {
                if (this.addresses.containsKey(otherKey) && !overwrite) {
-                    if (!this.addresses.get(otherKey).equals(otherValue)
-                            && log != null) {
+                    if (DEBUG && log != null &&
+                        !this.addresses.get(otherKey).equals(otherValue)) {
                        log.append("Conflict for " + otherKey + " from "
                                + other.location
                                + ". Destination in remote address book is "
@@ -247,12 +300,17 @@ public class AddressBook {
     * 
     * @param file
     *            The file to write the contents of this AddressBook too.
+     *
+     * @throws IllegalStateException if this was created with the Subscription constructor.
     */
    public void write(File file) {
+        if (this.addresses == null)
+            throw new IllegalStateException();
        if (this.modified) {
            try {
                ConfigParser.write(this.addresses, file);
            } catch (IOException exp) {
+                System.err.println("Error writing addressbook " + file.getAbsolutePath() + " : " + exp.toString());
            }
        }
    }
@@ -261,8 +319,17 @@ public class AddressBook {
     * Write this AddressBook out to the file it was read from. Requires that
     * AddressBook was constructed from a file on the local filesystem. If the
     * file cannot be writen to, this method will silently fail.
+     *
+     * @throws IllegalStateException if this was not created with the File constructor.
     */
    public void write() {
+        if (this.location == null || this.location.startsWith("http://"))
+            throw new IllegalStateException();
        this.write(new File(this.location));
    }
+
+    @Override
+    protected void finalize() {
+        delete();
+    }
 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+/**
+ *  A class to iterate through a hosts.txt or config file without
+ *  reading the whole thing into memory.
+ *  Keys are always converted to lower case.
+ *
+ *  Callers should iterate all the way through or call close()
+ *  to ensure the underlying stream is closed.
+ *
+ *  @since 0.8.7
+ */
+class ConfigIterator implements Iterator<Map.Entry<String, String>> {
+
+    private BufferedReader input;
+    private ConfigEntry next;
+
+    /**
+     *  A dummy iterator in which hasNext() is always false.
+     */
+    public ConfigIterator() {}
+
+    /**
+     *  An iterator over the key/value pairs in the file.
+     */
+    public ConfigIterator(File file) {
+        try {
+            FileInputStream fileStream = new FileInputStream(file);
+            input = new BufferedReader(new InputStreamReader(fileStream));
+        } catch (IOException ioe) {}
+    }
+
+    public boolean hasNext() {
+        if (input == null)
+            return false;
+        if (next != null)
+            return true;
+        try {
+            String inputLine = input.readLine();
+            while (inputLine != null) {
+                inputLine = ConfigParser.stripComments(inputLine);
+                String[] splitLine = inputLine.split("=");
+                if (splitLine.length == 2) {
+                    next = new ConfigEntry(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
+                    return true;
+                }
+                inputLine = input.readLine();
+            }
+        } catch (IOException ioe) {}
+        try { input.close(); } catch (IOException ioe) {}
+        input = null;
+        next = null;
+        return false;
+    }
+
+    public Map.Entry<String, String> next() {
+        if (!hasNext())
+            throw new NoSuchElementException();
+        Map.Entry<String, String> rv = next;
+        next = null;
+        return rv;
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void close() {
+        if (input != null) {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    @Override
+    protected void finalize() {
+        close();
+    }
+
+    /**
+     *  The object returned by the iterator.
+     */
+    private static class ConfigEntry implements Map.Entry<String, String> {
+        private final String key;
+        private final String value;
+
+        public ConfigEntry(String k, String v) {
+            key = k;
+            value = v;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String setValue(String v) {
+            throw new UnsupportedOperationException();
+        }
+
+        public int hashCode() {
+            return key.hashCode() ^ value.hashCode();
+        }
+
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry e = (Map.Entry) o;
+            return key.equals(e.getKey()) && value.equals(e.getValue());
+        }
+    }
+}
--- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java
@@ -25,16 +25,20 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.StringReader;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;

+import net.i2p.util.SecureFile;
+import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;
+
 /**
 * Utility class providing methods to parse and write files in config file
 * format, and subscription file format.
@@ -44,7 +48,9 @@ import java.util.Map;
 * 
 * @author Ragnarok
 */
-public class ConfigParser {
+class ConfigParser {
+
+    private static final boolean isWindows = SystemVersion.isWindows();

    /**
     * Strip the comments from a String. Lines that begin with '#' and ';' are
@@ -80,15 +86,15 @@ public class ConfigParser {
     *             if the BufferedReader cannot be read.
     *  
     */
-    public static Map parse(BufferedReader input) throws IOException {
-        Map result = new HashMap();
+    public static Map<String, String>  parse(BufferedReader input) throws IOException {
+        Map<String, String>  result = new HashMap();
        String inputLine;
        inputLine = input.readLine();
        while (inputLine != null) {
            inputLine = ConfigParser.stripComments(inputLine);
            String[] splitLine = inputLine.split("=");
            if (splitLine.length == 2) {
-                result.put(splitLine[0].trim().toLowerCase(), splitLine[1].trim());
+                result.put(splitLine[0].trim().toLowerCase(Locale.US), splitLine[1].trim());
            }
            inputLine = input.readLine();
        }
@@ -106,11 +112,11 @@ public class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static Map parse(File file) throws IOException {
+    public static Map<String, String>  parse(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        Map rv = ConfigParser.parse(input);
+        Map<String, String>  rv = ConfigParser.parse(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -127,7 +133,7 @@ public class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static Map parse(String string) throws IOException {
+    public static Map<String, String>  parse(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
        return ConfigParser.parse(input);
@@ -140,14 +146,18 @@ public class ConfigParser {
     * @param file
     *            A File to attempt to parse.
     * @param map
-     *            A Map to use as the default, if file fails.
+     *            A Map containing values to use as defaults.
     * @return A Map containing the key, value pairs from file, or if file
     *         cannot be read, map.
     */
-    public static Map parse(File file, Map map) {
-        Map result;
+    public static Map<String, String>  parse(File file, Map<String, String>  map) {
+        Map<String, String>  result;
        try {
            result = ConfigParser.parse(file);
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                if (!result.containsKey(entry.getKey()))
+                    result.put(entry.getKey(), entry.getValue());
+            }
        } catch (IOException exp) {
            result = map;
            try {
@@ -167,9 +177,9 @@ public class ConfigParser {
     * @throws IOException
     *             if input cannot be read.
     */
-    public static List parseSubscriptions(BufferedReader input)
+    public static List<String> parseSubscriptions(BufferedReader input)
            throws IOException {
-        List result = new LinkedList();
+        List<String> result = new LinkedList();
        String inputLine = input.readLine();
        while (inputLine != null) {
            inputLine = ConfigParser.stripComments(inputLine).trim();
@@ -191,11 +201,11 @@ public class ConfigParser {
     * @throws IOException
     *             if file cannot be read.
     */
-    public static List parseSubscriptions(File file) throws IOException {
+    public static List<String> parseSubscriptions(File file) throws IOException {
        FileInputStream fileStream = new FileInputStream(file);
        BufferedReader input = new BufferedReader(new InputStreamReader(
                fileStream));
-        List rv = ConfigParser.parseSubscriptions(input);
+        List<String> rv = ConfigParser.parseSubscriptions(input);
        try {
            fileStream.close();
        } catch (IOException ioe) {}
@@ -211,7 +221,7 @@ public class ConfigParser {
     * @throws IOException
     *             if string cannot be read.
     */
-    public static List parseSubscriptions(String string) throws IOException {
+    public static List<String> parseSubscriptions(String string) throws IOException {
        StringReader stringReader = new StringReader(string);
        BufferedReader input = new BufferedReader(stringReader);
        return ConfigParser.parseSubscriptions(input);
@@ -228,8 +238,8 @@ public class ConfigParser {
     * @return A List consisting of one element for each line in file, or if
     *         file cannot be read, list.
     */
-    public static List parseSubscriptions(File file, List list) {
-        List result;
+    public static List<String> parseSubscriptions(File file, List<String> list) {
+        List<String> result;
        try {
            result = ConfigParser.parseSubscriptions(file);
        } catch (IOException exp) {
@@ -253,12 +263,9 @@ public class ConfigParser {
     * @throws IOException
     *             if the BufferedWriter cannot be written to.
     */
-    public static void write(Map map, BufferedWriter output) throws IOException {
-        Iterator keyIter = map.keySet().iterator();
-
-        while (keyIter.hasNext()) {
-            String key = (String) keyIter.next();
-            output.write(key + "=" + (String) map.get(key));
+    public static void write(Map<String, String>  map, BufferedWriter output) throws IOException {
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            output.write(entry.getKey() + '=' + entry.getValue());
            output.newLine();
        }
        output.close();
@@ -267,7 +274,10 @@ public class ConfigParser {
    /**
     * Write contents of Map map to the File file. Output is written
     * with one key, value pair on each line, in the format: key=value.
-     * 
+     * Write to a temp file in the same directory and then rename, to not corrupt
+     * simultaneous accesses by the router. Except on Windows where renameTo()
+     * will fail if the target exists.
+     *
     * @param map
     *            A Map to write to file.
     * @param file
@@ -275,9 +285,23 @@ public class ConfigParser {
     * @throws IOException
     *             if file cannot be written to.
     */
-    public static void write(Map map, File file) throws IOException {
-        ConfigParser
-                .write(map, new BufferedWriter(new FileWriter(file, false)));
+    public static void write(Map<String, String>  map, File file) throws IOException {
+        boolean success = false;
+        if (!isWindows) {
+            File tmp = SecureFile.createTempFile("temp-", ".tmp", file.getAbsoluteFile().getParentFile());
+            ConfigParser
+                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(tmp), "UTF-8")));
+            success = tmp.renameTo(file);
+            if (!success) {
+                tmp.delete();
+                //System.out.println("Warning: addressbook rename fail from " + tmp + " to " + file);
+            }
+        }
+        if (!success) {
+            // hmm, that didn't work, try it the old way
+            ConfigParser
+                .write(map, new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
+        }
    }

    /**
@@ -291,12 +315,10 @@ public class ConfigParser {
     * @throws IOException
     *             if output cannot be written to.
     */
-    public static void writeSubscriptions(List list, BufferedWriter output)
+    public static void writeSubscriptions(List<String> list, BufferedWriter output)
            throws IOException {
-        Iterator iter = list.iterator();
-
-        while (iter.hasNext()) {
-            output.write((String) iter.next());
+        for (String s : list) {
+            output.write(s);
            output.newLine();
        }
        output.close();
@@ -313,10 +335,10 @@ public class ConfigParser {
     * @throws IOException
     *             if output cannot be written to.
     */
-    public static void writeSubscriptions(List list, File file)
+    public static void writeSubscriptions(List<String> list, File file)
            throws IOException {
        ConfigParser.writeSubscriptions(list, new BufferedWriter(
-                new FileWriter(file, false)));
+                new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
    }

 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -22,13 +22,21 @@
 package net.i2p.addressbook;

 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;

 import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingService;
+import net.i2p.client.naming.SingleFileNamingService;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.util.SecureDirectory;

 /**
 * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -37,9 +45,10 @@ import net.i2p.I2PAppContext;
 *
 */
 public class Daemon {
-    public static final String VERSION = "2.0.3";
+    public static final String VERSION = "2.0.4";
    private static final Daemon _instance = new Daemon();
    private boolean _running;
+    private static final boolean DEBUG = false;
    
    /**
     * Update the router and published address books using remote data from the
@@ -48,28 +57,166 @@ public class Daemon {
     * @param master
     *            The master AddressBook. This address book is never
     *            overwritten, so it is safe for the user to write to.
+     *            It is only merged to the published addressbook.
+     *            May be null.
     * @param router
     *            The router AddressBook. This is the address book read by
     *            client applications.
     * @param published
     *            The published AddressBook. This address book is published on
     *            the user's eepsite so that others may subscribe to it.
+     *            May be null.
+     *            If non-null, overwrite with the new addressbook.
     * @param subscriptions
     *            A SubscriptionList listing the remote address books to update
     *            from.
     * @param log
     *            The log to write changes and conflicts to.
+     *            May be null.
     */
-    public void update(AddressBook master, AddressBook router,
+    public static void update(AddressBook master, AddressBook router,
            File published, SubscriptionList subscriptions, Log log) {
-        router.merge(master, true, null);
-        Iterator iter = subscriptions.iterator();
+        Iterator<AddressBook> iter = subscriptions.iterator();
        while (iter.hasNext()) {
-            router.merge((AddressBook) iter.next(), false, log);
+            // yes, the EepGet fetch() is done in next()
+            router.merge(iter.next(), false, log);
        }
        router.write();
-        if (published != null)
+        if (published != null) {
+            if (master != null)
+                router.merge(master, true, null);
            router.write(published);
+        }
+        subscriptions.write();
+    }
+
+    /**
+     * Update the router and published address books using remote data from the
+     * subscribed address books listed in subscriptions.
+     * Merging of the "master" addressbook is NOT supported.
+     * 
+     * @param router
+     *            The NamingService to update, generally the root NamingService from the context.
+     * @param published
+     *            The published AddressBook. This address book is published on
+     *            the user's eepsite so that others may subscribe to it.
+     *            May be null.
+     *            If non-null, overwrite with the new addressbook.
+     * @param subscriptions
+     *            A SubscriptionList listing the remote address books to update
+     *            from.
+     * @param log
+     *            The log to write changes and conflicts to.
+     *            May be null.
+     * @since 0.8.7
+     */
+    public static void update(NamingService router, File published, SubscriptionList subscriptions, Log log) {
+        // If the NamingService is a database, we look up as we go.
+        // If it is a text file, we do things differently, to avoid O(n**2) behavior
+        // when scanning large subscription results (i.e. those that return the whole file, not just the new entries) -
+        // we load all the known hostnames into a Set one time.
+        // This also has the advantage of not flushing the NamingService's LRU cache.
+        String nsClass = router.getClass().getSimpleName();
+        boolean isTextFile = nsClass.equals("HostsTxtNamingService") || nsClass.equals("SingleFileNamingService");
+        Set<String> knownNames = null;
+
+        NamingService publishedNS = null;
+        Iterator<AddressBook> iter = subscriptions.iterator();
+        while (iter.hasNext()) {
+            // yes, the EepGet fetch() is done in next()
+            long start = System.currentTimeMillis();
+            AddressBook sub = iter.next();
+            long end = System.currentTimeMillis();
+            // SubscriptionIterator puts in a dummy AddressBook with no location if no fetch is done
+            if (DEBUG && log != null && sub.getLocation() != null)
+                log.append("Fetch of " + sub.getLocation() + " took " + (end - start));
+            start = end;
+            int old = 0, nnew = 0, invalid = 0, conflict = 0, total = 0;
+            for (Iterator<Map.Entry<String, String>> eIter = sub.iterator(); eIter.hasNext(); ) {
+                Map.Entry<String, String> entry = eIter.next();
+                String key = entry.getKey();
+                boolean isKnown;
+                Destination oldDest = null;
+                if (isTextFile) {
+                    if (knownNames == null) {
+                        // load the hostname set
+                        Properties opts = new Properties();
+                        opts.setProperty("file", "hosts.txt");
+                        knownNames = router.getNames(opts);
+                    }
+                    isKnown = knownNames.contains(key);
+                } else {
+                    oldDest = router.lookup(key);
+                    isKnown = oldDest != null;
+                }
+                try {
+                    if (!isKnown) {
+                        if (AddressBook.isValidKey(key)) {
+                            Destination dest = new Destination(entry.getValue());
+                            Properties props = new Properties();
+                            props.setProperty("s", sub.getLocation());
+                            boolean success = router.put(key, dest, props);
+                            if (log != null) {
+                                if (success)
+                                    log.append("New address " + key +
+                                               " added to address book. From: " + sub.getLocation());
+                                else
+                                    log.append("Save to naming service " + router + " failed for new key " + key);
+                            }
+                            // now update the published addressbook
+                            if (published != null) {
+                                if (publishedNS == null)
+                                    publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
+                                success = publishedNS.putIfAbsent(key, dest);
+                                if (!success) {
+                                    try {
+                                        log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
+                                    } catch (IOException ioe) {}
+                                }
+                            }
+                            if (isTextFile)
+                                // keep track for later dup check
+                                knownNames.add(key);
+                            nnew++;
+                        } else if (log != null) {
+                            log.append("Bad hostname " + key + " from "
+                                   + sub.getLocation());
+                            invalid++;
+                        }        
+                    } else if (false && DEBUG && log != null) {
+                        // lookup the conflict if we haven't yet (O(n**2) for text file)
+                        if (isTextFile)
+                            oldDest = router.lookup(key);
+                        if (oldDest != null && !oldDest.toBase64().equals(entry.getValue())) {
+                            log.append("Conflict for " + key + " from "
+                                       + sub.getLocation()
+                                       + ". Destination in remote address book is "
+                                       + entry.getValue());
+                            conflict++;
+                        } else {
+                            old++;
+                        }
+                    } else {
+                        old++;
+                    }
+                } catch (DataFormatException dfe) {
+                    if (log != null)
+                        log.append("Invalid b64 for " + key + " From: " + sub.getLocation());
+                    invalid++;
+                }
+                total++;
+            }
+            if (DEBUG && log != null && total > 0) {
+                log.append("Merge of " + sub.getLocation() + " into " + router +
+                           " took " + (System.currentTimeMillis() - start) + " ms with " +
+                           total + " total, " +
+                           nnew + " new, " +
+                           old + " old, " +
+                           invalid + " invalid, " +
+                           conflict + " conflicts");
+            }
+            sub.delete();
+        }
        subscriptions.write();
    }

@@ -81,35 +228,80 @@ public class Daemon {
     * @param home
     *            The directory containing addressbook's configuration files.
     */
-    public void update(Map settings, String home) {
-        File masterFile = new File(home, (String) settings
-                .get("master_addressbook"));
-        File routerFile = new File(home, (String) settings
-                .get("router_addressbook"));
+    public static void update(Map<String, String> settings, String home) {
        File published = null;
-        if ("true".equals(settings.get("should_publish"))) 
-            published = new File(home, (String) settings
+        boolean should_publish = Boolean.parseBoolean(settings.get("should_publish"));
+        if (should_publish) 
+            published = new File(home, settings
                .get("published_addressbook"));
-        File subscriptionFile = new File(home, (String) settings
+        File subscriptionFile = new File(home, settings
                .get("subscriptions"));
-        File logFile = new File(home, (String) settings.get("log"));
-        File etagsFile = new File(home, (String) settings.get("etags"));
-        File lastModifiedFile = new File(home, (String) settings
+        File logFile = new File(home, settings.get("log"));
+        File etagsFile = new File(home, settings.get("etags"));
+        File lastModifiedFile = new File(home, settings
                .get("last_modified"));
-
-        AddressBook master = new AddressBook(masterFile);
-        AddressBook router = new AddressBook(routerFile);
+        File lastFetchedFile = new File(home, settings
+                .get("last_fetched"));
+        long delay;
+        try {
+            delay = Long.parseLong(settings.get("update_delay"));
+        } catch (NumberFormatException nfe) {
+            delay = 12;
+        }
+        delay *= 60 * 60 * 1000;
        
-        List defaultSubs = new LinkedList();
+        List<String> defaultSubs = new LinkedList();
        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
        
        SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, defaultSubs, (String) settings
-                .get("proxy_host"), Integer.parseInt((String) settings.get("proxy_port")));
+                etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
+                .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
        Log log = new Log(logFile);

-        update(master, router, published, subscriptions, log);
+        // If false, add hosts via naming service; if true, write hosts.txt file directly
+        // Default false
+        if (Boolean.parseBoolean(settings.get("update_direct"))) {
+            // Direct hosts.txt access
+            File routerFile = new File(home, settings.get("router_addressbook"));
+            AddressBook master;
+            if (should_publish) {
+                File masterFile = new File(home, settings.get("master_addressbook"));
+                master = new AddressBook(masterFile);
+            } else {
+                master = null;
+            }
+            AddressBook router = new AddressBook(routerFile);
+            update(master, router, published, subscriptions, log);
+        } else {
+            // Naming service - no merging of master to router and published is supported.
+            update(getNamingService(settings.get("naming_service")), published, subscriptions, log);
+        }
+    }
+
+    /** depth-first search */
+    private static NamingService searchNamingService(NamingService ns, String srch)
+    {
+        String name = ns.getName();
+        if (name.equals(srch) || name.endsWith('/' + srch) || name.endsWith('\\' + srch))
+            return ns;
+        List<NamingService> list = ns.getNamingServices();
+        if (list != null) {
+            for (NamingService nss : list) {
+                NamingService rv = searchNamingService(nss, srch);
+                if (rv != null)
+                    return rv;
+            }
+        }
+        return null;                
+    }
+
+    /** @return the configured NamingService, or the root NamingService */
+    private static NamingService getNamingService(String srch)
+    {
+        NamingService root = I2PAppContext.getGlobalContext().namingService();
+        NamingService rv = searchNamingService(root, srch);
+        return rv != null ? rv : root;                
    }

    /**
@@ -131,14 +323,14 @@ public class Daemon {
        String settingsLocation = "config.txt";
        File homeFile;
        if (args.length > 0) {
-            homeFile = new File(args[0]);
+            homeFile = new SecureDirectory(args[0]);
            if (!homeFile.isAbsolute())
-                homeFile = new File(I2PAppContext.getGlobalContext().getRouterDir(), args[0]);
+                homeFile = new SecureDirectory(I2PAppContext.getGlobalContext().getRouterDir(), args[0]);
        } else {
-            homeFile = new File(System.getProperty("user.dir"));
+            homeFile = new SecureDirectory(System.getProperty("user.dir"));
        }
        
-        Map defaultSettings = new HashMap();
+        Map<String, String> defaultSettings = new HashMap();
        defaultSettings.put("proxy_host", "127.0.0.1");
        defaultSettings.put("proxy_port", "4444");
        defaultSettings.put("master_addressbook", "../userhosts.txt");
@@ -149,7 +341,10 @@ public class Daemon {
        defaultSettings.put("subscriptions", "subscriptions.txt");
        defaultSettings.put("etags", "etags");
        defaultSettings.put("last_modified", "last_modified");
+        defaultSettings.put("last_fetched", "last_fetched");
        defaultSettings.put("update_delay", "12");
+        defaultSettings.put("update_direct", "false");
+        defaultSettings.put("naming_service", "hosts.txt");
        
        if (!homeFile.exists()) {
            boolean created = homeFile.mkdirs();
@@ -161,15 +356,15 @@ public class Daemon {
        
        File settingsFile = new File(homeFile, settingsLocation);
        
-        Map settings = ConfigParser.parse(settingsFile, defaultSettings);
+        Map<String, String> settings = ConfigParser.parse(settingsFile, defaultSettings);
        // wait
        try {
-            Thread.sleep(5*60*1000);
+            Thread.sleep(5*60*1000 + I2PAppContext.getGlobalContext().random().nextLong(5*60*1000));
 	    // Static method, and redundent Thread.currentThread().sleep(5*60*1000);
        } catch (InterruptedException ie) {}
        
        while (_running) {
-            long delay = Long.parseLong((String) settings.get("update_delay"));
+            long delay = Long.parseLong(settings.get("update_delay"));
            if (delay < 1) {
                delay = 1;
            }
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -21,13 +21,18 @@

 package net.i2p.addressbook;

+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingServiceUpdater;
+
 /**
 * A thread that waits five minutes, then runs the addressbook daemon.  
 * 
 * @author Ragnarok
 *
 */
-public class DaemonThread extends Thread {
+public class DaemonThread extends Thread implements NamingServiceUpdater {

    private String[] args;

@@ -49,11 +54,22 @@ public class DaemonThread extends Thread {
        //    Thread.sleep(5 * 60 * 1000);
        //} catch (InterruptedException exp) {
        //}
+        I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
        Daemon.main(this.args);
+        I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
    }

    public void halt() {
        Daemon.stop();
        interrupt();
    }
+
+    /**
+     *  The NamingServiceUpdater interface
+     *  @param options ignored
+     *  @since 0.8.7
+     */
+    public void update(Properties options) {
+        interrupt();
+    }
 }
--- a/apps/addressbook/java/src/net/i2p/addressbook/Log.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Log.java
@@ -33,7 +33,7 @@ import java.util.Date;
 * @author Ragnarok
 *  
 */
-public class Log {
+class Log {

    private File file;

--- a/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Servlet.java
@@ -42,8 +42,8 @@ import javax.servlet.http.HttpServletResponse;
 */
 public class Servlet extends HttpServlet {
    private DaemonThread thread;
-    private String nonce;
-    private static final String PROP_NONCE = "addressbook.nonce";
+    //private String nonce;
+    //private static final String PROP_NONCE = "addressbook.nonce";

    /**
     * Hack to allow susidns to kick the daemon when the subscription list changes.
@@ -54,15 +54,15 @@ public class Servlet extends HttpServlet {
     */
    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
        //System.err.println("Got request nonce = " + request.getParameter("nonce"));
-        if (this.thread != null && request.getParameter("wakeup") != null &&
-            this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
-            //System.err.println("Sending interrupt");
-            this.thread.interrupt();
-            // no output
-        } else {
+        //if (this.thread != null && request.getParameter("wakeup") != null &&
+        //    this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
+        //    //System.err.println("Sending interrupt");
+        //    this.thread.interrupt();
+        //    // no output
+        //} else {
            PrintWriter out = response.getWriter();
            out.write("I2P addressbook OK");
-        }
+        //}
    }

    /* (non-Javadoc)
@@ -75,16 +75,16 @@ public class Servlet extends HttpServlet {
        } catch (ServletException exp) {
            System.err.println("Addressbook init exception: " + exp);
        }
-        this.nonce = "" + Math.abs((new Random()).nextLong());
+        //this.nonce = "" + Math.abs((new Random()).nextLong());
        // put the nonce where susidns can get it
-        System.setProperty(PROP_NONCE, this.nonce);
+        //System.setProperty(PROP_NONCE, this.nonce);
        String[] args = new String[1];
        args[0] = config.getInitParameter("home");
        this.thread = new DaemonThread(args);
        this.thread.setDaemon(true);
        this.thread.setName("Addressbook");
        this.thread.start();
-        System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
+        //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
        //System.out.println("INFO: config root under " + args[0]);
    }

--- a/apps/addressbook/java/src/net/i2p/addressbook/Subscription.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Subscription.java
@@ -27,13 +27,14 @@ package net.i2p.addressbook;
 * @author Ragnarok
 *  
 */
-public class Subscription {
+class Subscription {

    private String location;

    private String etag;

    private String lastModified;
+    private long lastFetched;

    /**
     * Construct a Subscription pointing to the address book at location, that
@@ -47,11 +48,17 @@ public class Subscription {
     * @param lastModified
     *            the last-modified header we recieved the last time we read
     *            this subscription.
+     * @param lastFetched when the subscription was last fetched (Java time, as a String)
     */
-    public Subscription(String location, String etag, String lastModified) {
+    public Subscription(String location, String etag, String lastModified, String lastFetched) {
        this.location = location;
        this.etag = etag;
        this.lastModified = lastModified;
+        if (lastFetched != null) {
+            try {
+                this.lastFetched = Long.parseLong(lastFetched);
+            } catch (NumberFormatException nfe) {}
+        }
    }

    /**
@@ -102,4 +109,14 @@ public class Subscription {
    public void setLastModified(String lastModified) {
        this.lastModified = lastModified;
    }
-}
+
+    /** @since 0.8.2 */
+    public long getLastFetched() {
+        return this.lastFetched;
+    }
+
+    /** @since 0.8.2 */
+    public void setLastFetched(long t) {
+        this.lastFetched = t;
+    }
+}
--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java
@@ -21,31 +21,38 @@

 package net.i2p.addressbook;

+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;

+import net.i2p.I2PAppContext;
+
 /**
 * An iterator over the subscriptions in a SubscriptionList.  Note that this iterator
 * returns AddressBook objects, and not Subscription objects.
+ * Yes, the EepGet fetch() is done in here in next().
 * 
 * @author Ragnarok
 */
-public class SubscriptionIterator implements Iterator {
+class SubscriptionIterator implements Iterator<AddressBook> {

-    private Iterator subIterator;
+    private Iterator<Subscription> subIterator;
    private String proxyHost;
    private int proxyPort;
+    private final long delay;

    /**
     * Construct a SubscriptionIterator using the Subscriprions in List subscriptions.
     * 
     * @param subscriptions
     *            List of Subscription objects that represent address books.
+     * @param delay the minimum delay since last fetched for the iterator to actually fetch
     * @param proxyHost proxy hostname
     * @param proxyPort proxt port number
     */
-    public SubscriptionIterator(List subscriptions, String proxyHost, int proxyPort) {
+    public SubscriptionIterator(List<Subscription> subscriptions, long delay, String proxyHost, int proxyPort) {
        this.subIterator = subscriptions.iterator();
+        this.delay = delay;
        this.proxyHost = proxyHost;
        this.proxyPort = proxyPort;
    }
@@ -58,12 +65,24 @@ public class SubscriptionIterator implements Iterator {
        return this.subIterator.hasNext();
    }

-    /* (non-Javadoc)
-     * @see java.util.Iterator#next()
+    /**
+     * Yes, the EepGet fetch() is done in here in next().
+     *
+     * see java.util.Iterator#next()
+     * @return an AddressBook (empty if the minimum delay has not been met)
     */
-    public Object next() {
-        Subscription sub = (Subscription) this.subIterator.next();
-        return new AddressBook(sub, this.proxyHost, this.proxyPort);
+    public AddressBook next() {
+        Subscription sub = this.subIterator.next();
+        if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now()) {
+            //System.err.println("Fetching addressbook from " + sub.getLocation());
+            return new AddressBook(sub, this.proxyHost, this.proxyPort);
+        } else {
+            //System.err.println("Addressbook " + sub.getLocation() + " was last fetched " + 
+            //                   DataHelper.formatDuration(I2PAppContext.getGlobalContext().clock().now() - sub.getLastFetched()) +
+            //                   " ago but the minimum delay is " +
+            //                   DataHelper.formatDuration(this.delay));
+            return new AddressBook(Collections.EMPTY_MAP);
+        }
    }

    /* (non-Javadoc)
@@ -72,4 +91,4 @@ public class SubscriptionIterator implements Iterator {
    public void remove() {
        throw new UnsupportedOperationException();
    }
-}
+}
--- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java
@@ -24,7 +24,6 @@ package net.i2p.addressbook;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -35,13 +34,15 @@ import java.util.Map;
 * @author Ragnarok
 *  
 */
-public class SubscriptionList {
+class SubscriptionList {

-    private List subscriptions;
+    private List<Subscription> subscriptions;

    private File etagsFile;

    private File lastModifiedFile;
+    private File lastFetchedFile;
+    private final long delay;
    
    private String proxyHost;
    
@@ -60,22 +61,25 @@ public class SubscriptionList {
     * @param lastModifiedFile
     *            A file containg the last-modified headers used for conditional
     *            GET. The file is in the format "url=leastmodified".
+     * @param delay the minimum delay since last fetched for the iterator to actually fetch
     * @param defaultSubs default subscription file
     * @param proxyHost proxy hostname
     * @param proxyPort proxy port number
     */
    public SubscriptionList(File locationsFile, File etagsFile,
-            File lastModifiedFile, List defaultSubs, String proxyHost, 
+            File lastModifiedFile, File lastFetchedFile, long delay, List<String> defaultSubs, String proxyHost, 
            int proxyPort) {
        this.subscriptions = new LinkedList();
        this.etagsFile = etagsFile;
        this.lastModifiedFile = lastModifiedFile;
+        this.lastFetchedFile = lastFetchedFile;
+        this.delay = delay;
        this.proxyHost = proxyHost;
        this.proxyPort = proxyPort;
-        Map etags;
-        Map lastModified;
-        String location;
-        List locations = ConfigParser.parseSubscriptions(locationsFile, 
+        Map<String, String> etags;
+        Map<String, String> lastModified;
+        Map<String, String> lastFetched;
+        List<String> locations = ConfigParser.parseSubscriptions(locationsFile, 
                defaultSubs);
        try {
            etags = ConfigParser.parse(etagsFile);
@@ -87,11 +91,15 @@ public class SubscriptionList {
        } catch (IOException exp) {
            lastModified = new HashMap();
        }
-        Iterator iter = locations.iterator();
-        while (iter.hasNext()) {
-            location = (String) iter.next();
-            this.subscriptions.add(new Subscription(location, (String) etags
-                    .get(location), (String) lastModified.get(location)));
+        try {
+            lastFetched = ConfigParser.parse(lastFetchedFile);
+        } catch (IOException exp) {
+            lastFetched = new HashMap();
+        }
+        for (String location : locations) {
+            this.subscriptions.add(new Subscription(location, etags.get(location),
+                                   lastModified.get(location),
+                                   lastFetched.get(location)));
        }
    }
    
@@ -102,31 +110,34 @@ public class SubscriptionList {
     * @return A SubscriptionIterator.
     */
    public SubscriptionIterator iterator() {
-        return new SubscriptionIterator(this.subscriptions, this.proxyHost, 
+        return new SubscriptionIterator(this.subscriptions, this.delay, this.proxyHost, 
                this.proxyPort);
    }

    /**
-     * Write the etag and last-modified headers for each Subscription to files.
+     * Write the etag and last-modified headers,
+     * and the last-fetched time, for each Subscription to files.
+     * BUG - If the subscription URL is a cgi containing an '=' the files
+     * won't be read back correctly; the '=' should be escaped.
     */
    public void write() {
-        Iterator iter = this.subscriptions.iterator();
-        Subscription sub;
-        Map etags = new HashMap();
-        Map lastModified = new HashMap();
-        while (iter.hasNext()) {
-            sub = (Subscription) iter.next();
+        Map<String, String> etags = new HashMap();
+        Map<String, String>  lastModified = new HashMap();
+        Map<String, String>  lastFetched = new HashMap();
+        for (Subscription sub : this.subscriptions) {
            if (sub.getEtag() != null) {
                etags.put(sub.getLocation(), sub.getEtag());
            }
            if (sub.getLastModified() != null) {
                lastModified.put(sub.getLocation(), sub.getLastModified());
            }
+            lastFetched.put(sub.getLocation(), "" + sub.getLastFetched());
        }
        try {
            ConfigParser.write(etags, this.etagsFile);
            ConfigParser.write(lastModified, this.lastModifiedFile);
+            ConfigParser.write(lastFetched, this.lastFetchedFile);
        } catch (IOException exp) {
        }
    }
-}
+}
--- a/apps/atalk/src/ATalk.java
+++ b/apps/atalk/src/ATalk.java
@@ -1,381 +0,0 @@
-package net.i2p.client;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't  make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Properties;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.Clock;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * ATalk - anonymous talk, demonstrating a trivial I2P usage scenario.
- * Run this class with no arguments for a manual.
- *
- * @author jrandom
- */
-public class ATalk implements I2PSessionListener, Runnable {
-    /** logging hook - status messages are piped to this */
-    private final static Log _log = new Log(ATalk.class);
-    
-    /** platform independent newline */
-    private final static String NL = System.getProperty("line.separator");
-    
-    /** the current session */
-    private I2PSession _session;
-    
-    /** who am i */
-    private Destination _myDestination;
-    
-    /** who are you? */
-    private Destination _peerDestination;
-    
-    /** location of my secret key file */
-    private String _myKeyFile;
-    
-    /** location of their public key */
-    private String _theirDestinationFile;
-    
-    /** where the application reads input from.  currently set to standard input */
-    private BufferedReader _in;
-    
-    /** where the application sends output to.  currently set to standard output */
-    private BufferedWriter _out;
-    
-    /** string that messages must begin with to be treated as files */
-    private final static String FILE_COMMAND = ".file: ";
-    
-    /** the, erm, manual */
-    private final static String MANUAL = "ATalk: Anonymous Talk, a demo program for the Invisible Internet Project SDK"
-                                         + NL
-                                         + "To generate a new destination:"
-                                         + NL
-                                         + "\tATalk [fileToSavePrivateKeyIn] [fileToSavePublicKeyIn]"
-                                         + NL
-                                         + "To talk to another destination:"
-                                         + NL
-                                         + "\tATalk [myPrivateKeyFile] [peerPublicKey] [shouldLogToScreen]"
-                                         + NL
-                                         + "shouldLogToScreen is 'true' or 'false', depending on whether you want log info on the screen"
-                                         + NL
-                                         + "When talking to another destination, messages are sent after you hit return"
-                                         + NL
-                                         + "To send a file, send a message saying:"
-                                         + NL
-                                         + "\t"
-                                         + FILE_COMMAND
-                                         + "[filenameToSend]"
-                                         + NL
-                                         + "The peer will then recieve the file and be notified of where it has been saved"
-                                         + NL
-                                         + "To end the talk session, enter a period on a line by itself and hit return"
-                                         + NL;
-    
-    public final static String PROP_CONFIG_LOCATION = "configFile";
-    
-    private static final SimpleDateFormat _fmt = new SimpleDateFormat("hh:mm:ss.SSS");
-
-    /** Construct the talk engine, but don't connect yet */
-    public ATalk(String myKeyFile, String theirDestFile) {
-        _myKeyFile = myKeyFile;
-        _theirDestinationFile = theirDestFile;
-    }
-
-    /** Actually start up the connection to the I2P network.
-     * Successful connect does not mean the peer is online or reachable.
-     *
-     * @throws IOException if there is a problem reading in the keys from the files specified
-     * @throws DataFormatException if the key files are not in the valid format
-     * @throws I2PSessionException if there is a problem contacting the I2P router
-     */
-    public void connect() throws IOException, I2PSessionException, DataFormatException {
-        I2PClient client = I2PClientFactory.createClient();
-        File myFile = new File(_myKeyFile);
-        Properties props = new Properties();
-        String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "atalk.config");
-        try {
-            props.load(new FileInputStream(configLocation));
-        } catch (FileNotFoundException fnfe) {
-            _log.warn("Unable to load up the ATalk config file " + configLocation);
-        }
-        // Provide any router or client API configuration here.
-        if (!props.containsKey(I2PClient.PROP_TCP_HOST))
-            props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-        if (!props.containsKey(I2PClient.PROP_TCP_PORT))
-            props.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-        if (!props.containsKey(I2PClient.PROP_RELIABILITY))
-            props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_BEST_EFFORT);
-        _session = client.createSession(new FileInputStream(myFile), props);
-        _session.setSessionListener(this);
-        _session.connect();
-
-        File peerDestFile = new File(_theirDestinationFile);
-        _peerDestination = new Destination();
-        _peerDestination.readBytes(new FileInputStream(peerDestFile));
-        return;
-    }
-
-    /** Actual bulk processing of the application, reading in user input, 
-     * sending messages, and displaying results.  When this function exits, the
-     * application is complete.
-     *
-     */
-    public void run() {
-        try {
-            connect();
-            _in = new BufferedReader(new InputStreamReader(System.in));
-            _out = new BufferedWriter(new OutputStreamWriter(System.out));
-
-            _out.write("Starting up anonymous talk session" + NL);
-
-            while (true) {
-                String line = _in.readLine();
-                if ((line == null) || (line.trim().length() <= 0)) continue;
-                if (".".equals(line)) {
-                    boolean ok = _session.sendMessage(_peerDestination, ("Peer disconnected at " + now()).getBytes());
-                    // ignore ok, we're closing
-                    break;
-                }
-                if (line.startsWith(FILE_COMMAND) && (line.trim().length() > FILE_COMMAND.length())) {
-                    try {
-                        String file = line.substring(FILE_COMMAND.length());
-                        boolean sent = sendFile(file);
-                        if (!sent) {
-                            _out.write("Failed sending the file: " + file + NL);
-                        }
-                    } catch (IOException ioe) {
-                        _out.write("Error sending the file: " + ioe.getMessage() + NL);
-                        _log.error("Error sending the file", ioe);
-                    }
-                } else {
-                    boolean ok = _session.sendMessage(_peerDestination, ("[" + now() + "] " + line).getBytes());
-                    if (!ok) {
-                        _out.write("Failed sending message.  Peer disconnected?" + NL);
-                    }
-                }
-            }
-        } catch (IOException ioe) {
-            _log.error("Error running", ioe);
-        } catch (I2PSessionException ise) {
-            _log.error("Error communicating", ise);
-        } catch (DataFormatException dfe) {
-            _log.error("Peer destination file is not valid", dfe);
-        } finally {
-            try {
-                _log.debug("Exiting anonymous talk session");
-                if (_out != null) _out.write("Exiting anonymous talk session");
-            } catch (IOException ioe) {
-                // ignored
-            }
-            if (_session != null) {
-                try {
-                    _session.destroySession();
-                } catch (I2PSessionException ise) {
-                    // ignored
-                }
-            }
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop!
-            }
-        }
-    }
-
-    private String now() {
-        Date now = new Date(Clock.getInstance().now());
-        return _fmt.format(now);
-    }
-
-    /** Send the given file to the current peer.  This works by sending a message
-     * saying ".file: filename\nbodyOfFile", where filename is the name of the file
-     * (which the recipient will be shown), and the bodyOfFile is the set of raw 
-     * bytes in the file.
-     *
-     * @throws IOException if the file could not be found or read
-     * @return false if the file could not be sent to the peer
-     */
-    private boolean sendFile(String filename) throws IOException, I2PSessionException {
-        _log.debug("Sending file [" + filename + "]");
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
-        baos.write((FILE_COMMAND + filename + "\n").getBytes());
-        FileInputStream fin = new FileInputStream(filename);
-        byte buf[] = new byte[4096];
-        try {
-            while (true) {
-                int len = fin.read(buf);
-                if (len == -1) break;
-                baos.write(buf, 0, len);
-            }
-        } catch (IOException ioe) {
-            _log.debug("Failed reading the file", ioe);
-            return false;
-        }
-        baos.close();
-        byte val[] = baos.toByteArray();
-        _log.debug("Sending " + filename + " with a full payload of " + val.length);
-        try {
-            boolean rv = _session.sendMessage(_peerDestination, val);
-            _log.debug("Sending " + filename + " complete: rv = " + rv);
-            return rv;
-        } catch (Throwable t) {
-            _log.error("Error sending file", t);
-            return false;
-        }
-    }
-
-    /** I2PSessionListener.messageAvailable requires this method to be called whenever
-     * I2P wants to tell the session that a message is available.  ATalk always grabs
-     * the message immediately and either processes it as a "send file" command (passing
-     * it off to handleRecieveFile(..) or simply displays the
-     * message to the user.
-     *
-     */
-    public void messageAvailable(I2PSession session, int msgId, long size) {
-        _log.debug("Message available: id = " + msgId + " size = " + size);
-        try {
-            byte msg[] = session.receiveMessage(msgId);
-            // inefficient way to just read the first line of text, but its easy 
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(msg)));
-            String line = reader.readLine();
-            if (line.startsWith(FILE_COMMAND)) {
-                handleRecieveFile(line, msg);
-            } else {
-                // not a file command, so just plop 'er out on the screen
-                _out.write(now() + " --> " + new String(msg));
-                _out.write(NL);
-                _out.flush();
-            }
-        } catch (I2PSessionException ise) {
-            _log.error("Error fetching available message", ise);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the message", ioe);
-        }
-    }
-
-    /** React to a file being sent our way from the peer via {@link #sendFile sendFile} 
-     * by saving the file to a temporary location and displaying where, what, and how large 
-     * it is.
-     *
-     * @param firstline the first line of the message that, according to the sendFile 
-     *			implementation, contains the command and the filename that it was stored 
-     *			at on the peer's computer
-     * @param msg the entire message recieved, including the firstline
-     */
-    private void handleRecieveFile(String firstline, byte msg[]) throws IOException {
-        _log.debug("handleRecieveFile called");
-        File f = File.createTempFile("recieve", ".dat", new File("."));
-        FileOutputStream fos = new FileOutputStream(f);
-        int lineLen = firstline.getBytes().length + "\n".getBytes().length;
-        int lenToCopy = msg.length - lineLen;
-        byte buf[] = new byte[lenToCopy];
-        System.arraycopy(msg, lineLen, buf, 0, lenToCopy);
-        fos.write(buf);
-        fos.close();
-        String name = firstline.substring(FILE_COMMAND.length());
-        _out.write("Recieved a file called [" + name + "] of size [" + lenToCopy + "] bytes, saved as ["
-                   + f.getAbsolutePath() + "]" + NL);
-        _out.flush();
-    }
-
-    /** driver */
-    public static void main(String args[]) {
-        I2PAppContext context = new I2PAppContext();
-        if (args.length == 2) {
-            String myKeyFile = args[0];
-            String myDestinationFile = args[1];
-            boolean success = generateKeys(myKeyFile, myDestinationFile);
-            if (success)
-                _log.debug("Keys generated (private key file: " + myKeyFile + " destination file: " + myDestinationFile
-                           + ")");
-            else
-                _log.debug("Keys generation failed");
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop
-            }
-        } else if (args.length == 3) {
-            _log.debug("Starting chat");
-            String myKeyfile = args[0];
-            String peerDestFile = args[1];
-            String shouldLog = args[2];
-            if (Boolean.TRUE.toString().equalsIgnoreCase(shouldLog))
-                context.logManager().setDisplayOnScreen(true);
-            else
-                context.logManager().setDisplayOnScreen(false);
-            String logFile = args[2];
-            Thread talkThread = new I2PThread(new ATalk(myKeyfile, peerDestFile));
-            talkThread.start();
-        } else {
-            System.out.println(MANUAL);
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException ie) { // nop
-            }
-            System.exit(-1);
-        }
-    }
-
-    /** Generate a new Destination, saving that destination and the associated 
-     * private keys in the privKeyFile, and also saving the destination without
-     * any private keys to destinationFile.
-     *
-     * @param privKeyFile private key file, including the destination and the various
-     *			    private keys, as defined by {@link I2PClient#createDestination I2PClient.createDestination}
-     * @param destinationFile file in which the Destination is serialized in
-     */
-    private static boolean generateKeys(String privKeyFile, String destinationFile) {
-        try {
-            Destination d = I2PClientFactory.createClient().createDestination(new FileOutputStream(privKeyFile));
-            FileOutputStream fos = new FileOutputStream(destinationFile);
-            d.writeBytes(fos);
-            fos.flush();
-            fos.close();
-            return true;
-        } catch (IOException ioe) {
-            _log.error("Error generating keys", ioe);
-        } catch (I2PException ipe) {
-            _log.error("Error generating keys", ipe);
-        }
-        return false;
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of disconnect */
-    public void disconnected(I2PSession session) {
-        _log.debug("Disconnected");
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of error */
-    public void errorOccurred(I2PSession session, String message, Throwable error) {
-        _log.debug("Error occurred: " + message, error);
-    }
-
-    /** required by {@link I2PSessionListener I2PSessionListener} to notify of abuse */
-    public void reportAbuse(I2PSession session, int severity) {
-        _log.debug("Abuse reported of severity " + severity);
-    }
-}
-
--- a/apps/desktopgui/.classpath
+++ b/apps/desktopgui/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry kind="lib" path="/lib/wrapper/all/wrapper.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
--- a/apps/desktopgui/.project
+++ b/apps/desktopgui/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>desktopgui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/apps/desktopgui/README
+++ b/apps/desktopgui/README
@@ -0,0 +1,13 @@
+Current setup:
+* Build desktopgui:
+    * 'ant jar' in the desktopgui directory
+    OR
+    * 'ant desktopgui' in the i2p.i2p directory
+* Place desktopgui.jar in the $I2P/lib/ directory.
+* Add to .i2p/clients.config:
+    #Desktopgui
+    clientApp.6.args=
+    clientApp.6.delay=5
+    clientApp.6.main=net.i2p.desktopgui.Main
+    clientApp.6.name=desktopgui
+    clientApp.6.startOnLoad=true
--- a/apps/desktopgui/TODO
+++ b/apps/desktopgui/TODO
@@ -0,0 +1,55 @@
+HIGH PRIORITY:
+- Allow desktopgui to start, stop and restart I2P. - DONE
+- Correct logging system - DONE
+- Internationalisation:
+    * Add strings - DONE
+    * Add Windows support - NEED TO CHECK
+    * Might need some kind of trigger to reload the menu (for live language switching) - DONE
+    * Language choice is not actually set as a parameter in I2P config?
+        As a result, desktopgui always starts with the default, unless you manually set the language.
+        DONE - uses routerconsole.lang -- this parameter is now updated in routerconsole as well
+- Check if we're inside I2P without using a command-line parameter - DONE
+- Modify installer to set I2P directory parameter; or use $I2P? - Is already there
+- Include in installer - TODO
+- Start desktopgui without adding to clients.config and without adding a dependency on routerconsole!
+  * One possibility:
+        Adding some kind of 'ApplicationManager' that allows starting applications.
+        Extra remark: ApplicationManager should also allow stopping certain applications from launching.
+        Suggestion:
+            * ApplicationManager reads/writes clients.config
+            * ApplicationManager itself: independent from clients.config?
+            * Upon reboot, ApplicationManager could add a new application to clients.config _if_ the 'application.manager.version' is not there, or is smaller than the current version.
+            * ApplicationManager can be the clients.config backend for routerconsole, so routerconsole is not the dependency.
+            * API:
+                - addConfig(args, name, ...)
+                - removeConfig(int)
+                - removeConfig(ConfigFilter)
+                    ConfigFilter() {
+                        boolean filterArgs(String args);
+                        boolean filterMain(String main);
+                        ...
+                    }
+                - editConfig(args, name, ..., ConfigFilter)
+                - editConfig(args, name, ..., int)
+                - editConfigArgs(args, ConfigFilter)
+                - editConfigArgs(args, int)
+                - ...
+ * For now: added in the routerconsole startup (like the old SysTray. - DONE
+    Possible migration path: startup ApplicationManager in routerconsole the first time.
+- Check bug: restart is happening instead of shutdown!
+- Check build order (for example: first desktopgui, only later routerconsole)
+- Fix tabs versus spaces ;-)
+- Add check for Java version 6 in RouterConsoleRunner!
+UNKNOWN:
+- API to allow applications to add themselves to the menu?
+    * registerApplication(); -- should return a positive number on success, -1 on failure
+    * unregisterApplication(int); -- should return nothing (or bool for success?), and the parameter should be the number given when registering the application
+- Fetch I2P localhost from the core I2P application? 
+- Use I2PAppContext::appDir (something like that) for desktopgui data.
+- Consider SWT as option
+    * Check core/java/src/net/i2p/util/FileUtil.java for dynamic jar loading
+    * Possible logic:
+        - First try to load SWT (has the most options and is not ugly)
+        - Then load AWT
+- Access router.jar from other JVM? Is this possible? -- no: use I2CP with auth (not ready yet)
+- Start desktopgui with another user than the user starting I2P (required for daemon usage).
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -1,119 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="desktopgui" default="default" basedir=".">
-    <description>Builds, tests, and runs the project desktopgui.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
+<project basedir="." default="all" name="desktopgui">

-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+	<property name="src" value="src"/>
+	<property name="build" value="build"/>
+	<property name="dist"  location="dist"/>
+	<property name="jar" value="desktopgui.jar"/>
+	<property name="resources" value="resources"/>
+    <property name="javadoc" value="javadoc"/>

-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+    <condition property="no.bundle">
+        <isfalse value="${require.gettext}" />
+    </condition>
+	<property name="javac.compilerargs" value=""/>
+	<property name="require.gettext" value="true" />

-    (Targets beginning with '-' are not intended to be called on their own.)
+	<target name="init">
+	<mkdir dir="${build}"/>
+	<mkdir dir="${build}/${resources}"/>
+        <mkdir dir="${build}/${javadoc}"/>
+		<mkdir dir="${dist}"/>
+	</target>

-    Example of inserting an obfuscator after compilation could look like this:
+	<target name="clean">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>

-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
+	<target name="compile" depends="init">
+		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+                       includeAntRuntime="false"
+                       srcdir="${src}" destdir="${build}">
+            <compilerarg line="${javac.compilerargs}" />
+            <classpath>
+                <pathelement location="../../core/java/build/i2p.jar" />
+                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
+            	<pathelement location="../../router/java/build/router.jar" />
+            </classpath>
+		</javac>
+        <copy todir="${build}/desktopgui/${resources}">
+            <fileset dir="${resources}" />
+        </copy>
+	</target>

-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+	<target name="bundle" unless="no.bundle">
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <arg value="./bundle-messages.sh" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
+            <arg value="./bundle-messages.sh" />
+        </exec>
+		<!-- multi-lang is optional -->
+        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
+            <arg value="./bundle-messages.sh" />
+        </exec>
+	</target>

+        <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
+        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
+            <arg value="list" />
+            <arg value="changed" />
+            <arg value="." />
+        </exec>
+        <!-- \n in an attribute value generates an invalid manifest -->
+        <exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
+            <arg value="-s" />
+            <arg value="[:space:]" />
+            <arg value="," />
+        </exec>
+	</target>

-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
+		<!-- set if unset -->
+		<property name="workspace.changes.tr" value="" />
+		<jar basedir="${build}" destfile="${dist}/${jar}">
+			<manifest>
+				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
+				<attribute name="Build-Date" value="${build.timestamp}" />
+				<attribute name="Base-Revision" value="${workspace.version}" />
+				<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+			</manifest>
+		</jar>
+	</target>

-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="BOB-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-    <property name="build_src" location="src"/>
-    <property name="build_bin" location="bin"/>
-    <property name="build_dist" location="dist"/>
-    <property name="build_lib" location="lib"/>
-    <property name="build_i2pref" location="../../build"/>
-    <property name="build_routerconsole" location="../routerconsole/java/build/"/>
-    <property name="build_i2ptunnel" location="../i2ptunnel/java/build/"/>
-	
-    <path id="build_classpath">
-        <fileset dir="${build_lib}" includes="**/*.jar"/>
-        <fileset dir="${build_i2pref}" includes="**/*.jar"/>
-        <fileset dir="${build_routerconsole}" includes="**/*.jar"/>
-        <fileset dir="${build_i2ptunnel}" includes="**/*.jar"/>
-    </path>
-    <target name="build_init">
-        <!-- Create the time stamp -->
-        <tstamp/>
-  	    <mkdir dir="${build_dist}"/>
-  	    <mkdir dir="${build_bin}"/>
-    </target>
-    <target name="build_compile" depends="build_init"
-        description="compile the source " >
-        <!-- Compile the java code from ${src} into ${bin} -->
-        <javac srcdir="${build_src}" destdir="${build_bin}"  classpathref="build_classpath"/>
-	    <copy todir="${build_bin}">
-	        <fileset dir="${build_src}">
-		        <exclude name="**/*.java"/>
-	        </fileset>
-	    </copy>
-    </target>
-    <target name="build_jar" depends="build_compile"
-        description="generate the distribution" >
-        <!-- Create the distribution directory -->
-        <mkdir dir="${build_dist}/lib"/>
-
-        <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-        <zip destfile="${build_dist}/desktopgui.jar" basedir="${build_bin}" />
+    <target name="jarUpToDate">
+        <uptodate property="jar.uptodate" targetfile="${dist}/${jar}" >
+            <srcfiles dir= "." includes="build/**/*.class" />
+        </uptodate>
+        <condition property="shouldListChanges" >
+            <and>
+                <not>
+                    <isset property="jar.uptodate" />
+                </not>
+                <isset property="mtn.available" />
+            </and>
+        </condition>
    </target>

-    <target name="build_clean"
-        description="clean up" >
-        <!-- Delete the ${build} and ${dist} directory trees -->
-        <delete dir="${build_bin}"/>
-        <delete dir="${build_dist}"/>
+    <target name="javadoc">
+        <mkdir dir="${build}" />
+        <mkdir dir="${build}/${javadoc}" />
+        <javadoc 
+            sourcepath="${src}" destdir="${build}/${javadoc}" 
+            packagenames="*" 
+            use="true" 
+            splitindex="true" 
+            windowtitle="Desktopgui">
+            <classpath>
+                <pathelement location="../../router/java/build/router.jar" />
+                <pathelement location="../../core/java/build/i2p.jar" />
+            </classpath>
+        </javadoc>
    </target>
+
+    <target name="poupdate">
+        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages.sh" />
+            <arg value="-p" />
+        </exec>
+        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
+            <arg value="./bundle-messages.sh" />
+            <arg value="-p" />
+        </exec>
+    </target>
+
+	<target name="dist" depends="jar" />	
+	<target name="all" depends="jar" />
 </project>
+
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# Update messages_xx.po and messages_xx.class files,
+# from both java and jsp sources.
+# Requires installed programs xgettext, msgfmt, msgmerge, and find.
+#
+# usage:
+#    bundle-messages.sh (generates the resource bundle from the .po file)
+#    bundle-messages.sh -p (updates the .po file from the source tags, then generates the resource bundle)
+#
+# zzz - public domain
+# Mathiasdm - modifications for desktopgui
+#
+CLASS=net.i2p.desktopgui.messages
+TMPFILE=build/javafiles.txt
+export TZ=UTC
+RC=0
+
+if [ "$1" = "-p" ]
+then
+	POUPDATE=1
+fi
+
+# on windows, one must specify the path of commnad find
+# since windows has its own retarded version of find.
+if which find|grep -q -i windows ; then
+	export PATH=.:/bin:/usr/local/bin:$PATH
+fi
+# Fast mode - update ondemond
+# set LG2 to the language you need in envrionment varibales to enable this
+
+# add ../java/ so the refs will work in the po file
+JPATHS="src"
+for i in locale/messages_*.po
+do
+	# get language
+	LG=${i#locale/messages_}
+	LG=${LG%.po}
+	
+	# skip, if specified
+	if [ $LG2 ]; then
+		[ $LG != $LG2 ] && continue || echo INFO: Language update is set to [$LG2] only.
+	fi
+
+	if [ "$POUPDATE" = "1" ]
+	then
+		# make list of java files newer than the .po file
+		find $JPATHS -name *.java -newer $i > $TMPFILE
+	fi
+
+	if [ -s build/net/i2p/desktopgui/messages_$LG.class -a \
+	     build/net/i2p/desktopgui/messages_$LG.class -nt $i -a \
+	     ! -s $TMPFILE ]
+	then
+		continue
+	fi
+
+	if [ "$POUPDATE" = "1" ]
+	then
+	 	echo "Updating the $i file from the tags..."
+		# extract strings from java and jsp files, and update messages.po files
+		# translate calls must be one of the forms:
+		# _("foo")
+		# _x("foo")
+		# intl._("foo")
+		# intl.title("foo")
+		# handler._("foo")
+		# formhandler._("foo")
+		# net.i2p.router.web.Messages.getString("foo")
+		# In a jsp, you must use a helper or handler that has the context set.
+		# To start a new translation, copy the header from an old translation to the new .po file,
+		# then ant distclean updater.
+		find $JPATHS -name *.java > $TMPFILE
+		xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
+	                 --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \
+	                 --keyword=handler._ --keyword=formhandler._ \
+	                 --keyword=net.i2p.router.web.Messages.getString \
+		         -o ${i}t
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR - xgettext failed on ${i}, not updating translations"
+			rm -f ${i}t
+			RC=1
+			break
+		fi
+		msgmerge -U --backup=none $i ${i}t
+		if [ $? -ne 0 ]
+		then
+			echo "ERROR - msgmerge failed on ${i}, not updating translations"
+			rm -f ${i}t
+			RC=1
+			break
+		fi
+		rm -f ${i}t
+		# so we don't do this again
+		touch $i
+	fi
+
+    if [ "$LG" != "en" ]
+    then
+        # only generate for non-source language
+        echo "Generating ${CLASS}_$LG ResourceBundle..."
+
+        # convert to class files in build
+        msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+        if [ $? -ne 0 ]
+        then
+            echo "ERROR - msgfmt failed on ${i}, not updating translations"
+            # msgfmt leaves the class file there so the build would work the next time
+            find build -name messages_${LG}.class -exec rm -f {} \;
+            RC=1
+            break
+        fi
+    fi
+done
+rm -f $TMPFILE
+exit $RC
--- a/apps/desktopgui/desktopgui/resources/howto/howto.html
+++ b/apps/desktopgui/desktopgui/resources/howto/howto.html
@@ -1,261 +0,0 @@
-<html>
-    <head>
-        <title>Small Guide to I2P</title>
-    </head>
-    <body>
-        <h1>Small Guide to I2P</h1>
-
-        <h2>So, what's this all about?</h2>
-
-        <p>I2P builds up a new net inside the usual internet, connecting nodes together 
-        via encrypted connections.
-        It is a JAVA prgram with its most used part (the encryption of the data) written
-        in handoptimized assembler code.
-        It will use your bandwith, your RAM and your CPU. It will use them all up if you
-        do not limit it.
-        I2P will route unknown traffic through your node, even stuff you dislike.
-        As that data is encrypted, nobody knows whats data went to or drom your node.
-        </p>
-
-        <p>
-        First, ALWAYS use the latest stable release.
-        Development releases are called "mtn version" and are marked with a -, e.g. 
-        0.6.5-1. Those are usually useable by all but could do harm to your I2P 
-        experience.
-        You can get the latest MTN builds from my eepsite echelon.i2p, but always
-        remember: I built them, you need to trust me not to changed the code!
-        After you get the right "i2pupdate.zip" file, put that file into the I2P
-        directory and hit restart on the router console http://127.0.0.1:7657.
-        Do NOT deflate the zip file!
-        </p>
-
-        <p>
-        I2P is very dynamic - after startup it tries to get known to other I2P routers
-        and measures their speed - you need to wait some 10-120 minutes until your
-        I2P router knows enough other ones to obtain full power of I2P.
-        </p>
-
-        <h2>Filesharing</h2>
-
-        <p>
-        I2P is able to do anonymous filesharing.
-        But as there are NO gateways between real net and I2P, you can only share/
-        download torrents from within I2P. Look e.g. postman.i2p or planet.i2p.
-        You CANNOT use azureus, utorrent or any other usual client.
-        You cannot download anonymous torrents from mininova, piratebay or else.
-        You need to use I2P internal torrents and I2P aware programs like 
-        I2Psnark (builtin, suitable for 1-20 torrents)
-        I2PRufus (external, python, high CPU load, suitable >20 torrents) http://echelon.i2p/i2prufus
-        I2P-BT (external, python) 
-        I2PsnarkXL (mod of I2Psnark made by fwd)
-        </p>
-
-        <p>
-        There are also gnutella and edonkey clients:
-        i2phex for gnutella (http://echelon.i2p/i2phex)
-        imule for edonkey (http://echelon.i2p/imule)
-        </p>
-
-        <p>
-        Remember, as I2P uses other routers to route your traffic via 1-6 other PCs,
-        your transferrates in P2P are slower than in usual internet.
-        But you are anonymous, no one can easily (within 2 months-2 years) get your IP!
-        torrents inside of I2P reaches up to 50 kb/sec, usual are 10-20 kb/sec per torrent
-        i2phex reaches up to 20 kb/sec, usually 5-10 kb/sec
-        imule in times reaches 10 kb/sec, usually 5-10 kb/sec
-        </p>
-
-        <p>
-        In I2PHex and imule you can just tell "share file or directory", in torrent
-        you need to create a .torrent file and upload that (and ONLY that small .torrent)
-        file to the trackers like tracker.postman.i2p/
-        </p>
-
-        <p>
-        I2P is a smaller net (1000 users) which grows slowly. As of which amount of shared
-        data will slowly rise.
-        </p>
-
-        <p>
-        I2P is anonymous and it does not censor - there is no administrator.
-        There IS unwanted stuff like kiddyporn, nazism, or else.
-        If you dislike all this, do not use I2P.
-        There is NO way to prohibite this stuff to appear in a anonymous net like I2P.
-        (as that stuff is available shows the anonymity and transfer function of I2P
-        is working well enough)
-        You can delete the destinations in question from your local hosts.txt file (or
-        deface them) which will partly prevent you to reach those bad sies by accident.
-        </p>
-         
-        <h2>Internet (the websites)</h2>
-
-        <p>         
-        Only one outproxy (gateway I2P - webpages in usual Internet) is working.
-        It is NOT official from I2P, I2P does work without.
-        If that outproxy is slow, offline, gone,.. I2P still works on and cannot do
-        anything to change that failure.
-        That outproxy translates usual internet webpages into the I2P net and you can 
-        reach them via your Router.
-        The best way for usual webpages is TOR, not that outproxy.
-        Remember: the owner of the outproxy got ALL traffic from all I2P users
-        visiting Internet pages and will risk that into the police!
-        </p>
-        
-        <p>
-        This proxy is false.i2p. In newer I2P routers it is enabled, but not in
-        older ones. Go to http://127.0.0.1:7657/i2ptunnel/index.jsp tunnels page and
-        click on the eepProxy tunnel. Change the entry for the "Outproxies" to false.i2p
-        and save.  On the tunnels page, stop the epproxy tunnel and start it again,
-        now your router will use the false.i2p outproxy. 
-        </p>
-        
-        <p>
-        No other (known) gateways are setup and running. No one we know will run
-        the gateway for torrent or any other P2P data (and risk his life).
-        </p>
-        
-        <h2>Bandwidth</h2>
-        
-        <p>http://127.0.0.1:7657/config.jsp</p>
-        
-        <p>Setup your bandwith wisely. Know your linespeed!</p>
-        
-        <p>
-        E.g. most common terms are:
-        1Mbit = roughly 100 kbyte/sec
-        10 MBit = roughly 1100 kbyte/sec
-        512 kbit = roughly 50 kbyte/sec
-        or in germany:
-        16000er = roughly 1500 kbyte/sec
-        6000er = roughly 600 kbyte/sec
-        1000er = roughly 100 kb/sec
-        </p>        
-        
-        <p>
-        Set your bandwith limits to 10% under your line speed and burst  rate to
-        your line speed.
-        Set the bandwith share percentage to:
-        >80% if lowest bandwith setting is >50k
-        >50% if lowest bandwith setting is >30k
-        >20% if lowest bandwith setting is >16k
-        </p>
-        
-        <p>There is no shared bandwith under 16k.</p>
-        
-        <p>
-        Limit your participating tunnels (shared bandwith) on:
-        http://127.0.0.1:7657/configadvanced.jsp
-        with the line:
-        router.maxParticipatingTunnels=500
-        </p>
-        
-        <p>
-        2000 is for roughly 600 kb/sec - very high value with high CPU load
-        1000 is for roughly 300 kb/sec
-        600 is a good value for 150-200kb/sec
-        300 is roughly 90 kb/sec
-        150 roughly 50 kb/sec 
-        Remember: even failed tunnel requests will result in a part tunnel on the hops in between!
-        Those said, there are far more part tunnels unused than used in the live net under load, which 
-        results in slower bandwith per tunnel in the end.
-        It is wise to first limit the bandwith and afterwards the part tunnels, e.g. set some more part
-        tunnels and let I2P reach the bandwith limit instead of the part tunnels limit!
-        </p>
-        
-        <h2>What is shared bandwidth?</h2>
-         
-        <p>
-        I2P transports your date from the client to the server through 1-6 hops 
-        (other I2P routers). Each of this hops sees the data from you as "participating
-        tunnel" - which is the shared bandwith of them.
-        With this in mind, I2P needs some amount of this shared bandwith at some 
-        amount of routers.
-        Share as much as you are able of - others will thank you!
-        </p>
-        
-        <p>
-        With the "share percentage" set like above, you will obtain enough speed for
-        your own traffic and obtain some participating tunnels (if >16kb/sec) with some 
-        noise traffic to hide your traffic in the stream.
-        </p>
-        
-        <p>
-        With release 0.6.5 there is some method to prefer your own traffic ahead
-        of shared traffic which will result in better experience to you!
-        </p>
-        
-        <h2>Addressbook</h2>
-
-        <p>
-        I2P uses a local addressbook to link short DNS names with the internal used 512bit
-        hashes (which are destination IDs).
-        Those links are saved insside the hosts.txt and userhosts.txt files in the i2p 
-        directory.
-        Hosts which are not in those files cannot be reached via the short DNS names
-        and a error message with "jumper links" will appear. Those links will ask
-        some hosts services and forward to the correct site (if the site is known to them).
-        Those hosts services just made a form to add new "hosts" and those results public
-        available.
-        You can subscribe to those hosts service and let your hosts.txt file be updated
-        automatic. Go to http://127.0.0.1:7657/susidns/subscriptions.jsp SusiDNS
-        and enter the hosts services into the textbox (and save afterwards):
-        http://www.i2p2.i2p/hosts.txt
-        http://stats.i2p/cgi-bin/newhosts.txt
-        http://tino.i2p/hosts.txt
-        http://i2host.i2p/cgi-bin/i2hostag
-        You can add one of them, two or all. 
-        SusiDNS will now ask those hosts for new entries to the hosts.txt and those
-        will be added to your hosts.txt. The userhosts.txt will ONLY be updated by
-        yourself (the user) and not be published into the net!
-        Remember, names once set could not be changed! If you loose your key (destination
-        ID) to your eepsite, service,..., there is no way to change the linking 
-        between the DNS name and the (lost) destination ID automatic! Only manual by each 
-        user itself - great topic to discuss of need to renew DNS hostnames.
-        As this subscription will not update old entries, you can "deface" unwanted 
-        eepsites with a false key and if you hit the bad name in browser by accident, 
-        you will not see the bad stuff!
-        </p>
-
-        <h2>Out of Memory errors </h2>
-
-        <p>
-        If your router hits the Out of Memory error - check your logs!
-        Usual point for OOM are to much torrents in i2psnark - i2psnark is a real
-        memory hogg and >10 torrents it requiers hell a lot of memory!
-        </p>
-
-        <p>
-        Maybe it is possible for you to increase the wrapper memory config.
-        This ONLY works if you start the I2P service restartable with console
-        (on Windows).
-        In I2P directory edit the wrapper.config file and change the values:
-        wrapper.java.maxmemory=256 (or even to 512, IF possible)
-        Afterwards shutdown I2P complete (the service) and restart it.
-        </p>
-
-        <h2>Blocklists</h2>
-
-        <p>
-        Sometimes attackers trying to flood the I2P net and try to do some harm.
-        And some folks setting localnet IPs as their internet reachable address.
-        To prevent those bad router to harm the local router, I2P implemented
-        a local blocklist system. It is NOT integrated automatic as it could 
-        really harm your I2P experience if setup the wrong way.
-        The way to enable blocklists is:
-        Get the file http://zzz.i2p/files/blocklist.txt and copy this file into the
-        I2P directory.
-        On http://127.0.0.1:7657/configadvanced.jsp set the option 
-        router.blocklist.enable=true - click on Apply and restart the router 
-        with the restart link left on router console.
-        The blockfile.txt file follows a special order, you<6F>ll get it if you read it.
-        The first entry is the reason to be shown on http://127.0.0.1:7657/profiles.jsp
-        at the bottom in the shitlist section.
-        The second entry is the IP or the dest ID of a router.
-        Right now there are only private subnets in the blocklist AND one chinese router
-        which floods the floodfill DB while restarting every few minutes with a different
-        router ID and far to less bandwith for being a floodfill router.
-        </p>
-
-        <p>(By echelon -- echelon.i2p )</p>
-    </body>
-</html>
--- a/apps/desktopgui/lib/appframework.jar
+++ b/apps/desktopgui/lib/appframework.jar
--- a/apps/desktopgui/lib/swing-worker.jar
+++ b/apps/desktopgui/lib/swing-worker.jar
--- a/apps/desktopgui/locale/messages_ar.po
+++ b/apps/desktopgui/locale/messages_ar.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P desktopgui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-20 11:53+0000\n"
+"PO-Revision-Date: 2011-02-26 19:46-0000\n"
+"Last-Translator: hamada <hamada@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "ابدأ I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "جاري تشغيل I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "جاري البدأ"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr " تشغيل متصفح I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "اعدادات"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "اعادة تشغيل"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "توقيف I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "اعدادات الأيقونة"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "هل ترغب في تفعيل الأيقونة؟"
+
--- a/apps/desktopgui/locale/messages_cs.po
+++ b/apps/desktopgui/locale/messages_cs.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-02-12 19:44+0000\n"
+"Last-Translator: Waseihou Watashi <waseihou@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/I2P/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Spustit I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P startuje!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Startuji"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Spouštím I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Nastavuji desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Restart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zastavit I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Nastavení ikony na liště (tray icon)"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Zapnout ikonu na liště?"
--- a/apps/desktopgui/locale/messages_da.po
+++ b/apps/desktopgui/locale/messages_da.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+#   <kia___@hushmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-07-12 19:41+0000\n"
+"Last-Translator: KIA <kia___@hushmail.com>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/I2P/team/da/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Start I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P starter nu!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Starter"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Start I2P Browseren"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Konfigurer desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Genstart I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stop I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Konfiguration af processbar ikonet"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Skal processbar ikonet være aktivt?"
+
+
--- a/apps/desktopgui/locale/messages_de.po
+++ b/apps/desktopgui/locale/messages_de.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-03-22 15:49+0000\n"
+"Last-Translator: blabla <blabla@trash-mail.com>\n"
+"Language-Team: German <>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P starten"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P startet gerade!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Startend"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P-Browser öffnen"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Desktopgui konfigurieren"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P neustarten"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P beenden"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Systemleistensymbol konfigurieren"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Systemleistensymbol aktivieren?"
--- a/apps/desktopgui/locale/messages_el.po
+++ b/apps/desktopgui/locale/messages_el.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+#   <lixtetrax@grhack.net>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-07-02 11:28+0000\n"
+"Last-Translator: lixtetrax <lixtetrax@grhack.net>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Έναρξη Ι2Ρ"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Το Ι2Ρ ξεκίνησε!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Έναρξη"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Έναρξη φυλλομετρητή Ι2Ρ"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Παραμετροποίηση desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Επανεκκίνηση Ι2Ρ"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Τερματισμός Ι2Ρ"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Παραμετροποίηση εικονιδίου"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Ενεργοποίηση εικονιδίου;"
--- a/apps/desktopgui/locale/messages_en.po
+++ b/apps/desktopgui/locale/messages_en.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P desktopgui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2010-06-15 14:09+0100\n"
+"Last-Translator: duck <duck@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr ""
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr ""
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr ""
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr ""
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr ""
--- a/apps/desktopgui/locale/messages_es.po
+++ b/apps/desktopgui/locale/messages_es.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-04-02 23:57+0100\n"
+"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
+"Language-Team: Spanish (Castilian) <None>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Iniciar I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P está iniciando!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Iniciando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lanzar navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurar desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Reiniciar I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Detener I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Configuración del ícono de la barra de tareas"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "¿Debería estar activado el ícono de la barra de tareas?"
+
--- a/apps/desktopgui/locale/messages_fr.po
+++ b/apps/desktopgui/locale/messages_fr.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P desktopgui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-03-30 21:58+0100\n"
+"Last-Translator: magma <magma@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Démarrer I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P démarre!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Démarrage"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Lancer le navigateur"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configurer l'interface de bureau"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Redémarrer I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Arrêter I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Configuration de l'icône de notification"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Activer l'icône de notification"
+
--- a/apps/desktopgui/locale/messages_hu.po
+++ b/apps/desktopgui/locale/messages_hu.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-06-01 16:28+0000\n"
+"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
+"Language-Team: Hungarian (http://www.transifex.net/projects/p/I2P/language/hu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P indítása"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P indul!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "indítás"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "I2P Böngésző Indítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Asztali Grafikus Felület Beállítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P Újraindítása"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P Leállítása"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Tálcaikon beállítása"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Tálcaikon engedélyezve legyen?"
--- a/apps/desktopgui/locale/messages_it.po
+++ b/apps/desktopgui/locale/messages_it.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+#   <bovas85@gmail.com>, 2012.
+#   <jokjok@hotmail.it>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2012-06-01 12:21+0000\n"
+"Last-Translator: Leelium <bovas85@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/I2P/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Avvia I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Avvio di I2P in corso!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Avvio"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Avvia il Browser I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configura desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Riavvia I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Ferma I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Configurazione dell'icona nell'area di notifica"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Vuoi che l'icona nelll'rea di notifica venga abilitata?"
--- a/apps/desktopgui/locale/messages_nl.po
+++ b/apps/desktopgui/locale/messages_nl.po
@@ -0,0 +1,55 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: http://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-02-20 11:53+0000\n"
+"PO-Revision-Date: 2011-02-20 12:15+0000\n"
+"Last-Translator: ducki2p <ducki2p@gmail.com>\n"
+"Language-Team: Dutch <>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "I2P starten"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P is aan het starten!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Bezig met starten"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Start I2P Browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Configureer desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "I2P herstarten"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "I2P stoppen"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Systeemvak icoon configuratie"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Systeemvak icoon inschakelen?"
--- a/apps/desktopgui/locale/messages_pl.po
+++ b/apps/desktopgui/locale/messages_pl.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+#   <b790979@klzlk.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-05-25 18:36+0000\n"
+"Last-Translator: PolishAnon <b790979@klzlk.com>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/I2P/team/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Uruchom I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "Uruchamianie I2P!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Uruchamianie"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Uruchom Przeglądarke I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Skonfiguruj intrefejs pulpitu (desktopgui)"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Zrestartuj I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Zatrzymaj I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Konfiguracja ikony zasobnika"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Czy ikona zasobnika powinna być aktywna?"
+
+
--- a/apps/desktopgui/locale/messages_ru.po
+++ b/apps/desktopgui/locale/messages_ru.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# foo <foo@bar>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P desktopgui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-19 17:26+0000\n"
+"PO-Revision-Date: 2011-02-23 10:23+0500\n"
+"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
+"Language-Team: duck <duck@mail.i2p>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Запустить I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P запускается!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Запускается"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Запустить I2P браузер"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Настроить desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Перезапустить I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Остановить I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Настройка иконки в трее"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Отображать ли иконку в трее?"
+
--- a/apps/desktopgui/locale/messages_sv.po
+++ b/apps/desktopgui/locale/messages_sv.po
@@ -0,0 +1,56 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# 123hund123 <M8R-ra4r1r@mailinator.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-03-22 15:49+0000\n"
+"Last-Translator: 123hund123 <M8R-ra4r1r@mailinator.com>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/I2P/language/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Starta I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P startas!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Startar"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Öppna I2P browser"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Konfigurera desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Starta om I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Stoppar I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Ikonpanelskonfiguration"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Ska ikonpanelen vara aktiverad?"
--- a/apps/desktopgui/locale/messages_uk.po
+++ b/apps/desktopgui/locale/messages_uk.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+#   <gribua@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-06-19 14:01+0000\n"
+"Last-Translator: Pharmasolin <gribua@gmail.com>\n"
+"Language-Team: Ukrainian (Ukraine) (http://www.transifex.net/projects/p/I2P/team/uk_UA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk_UA\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Запустити I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P запускається!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Запускається"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Запустити I2P Браузер"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Настроїти вигляд інтерфейсу"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Перезапустити I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Зупинити I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Настройка трей-іконки"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Чм повинна трей-іконка бути включена?"
+
+
--- a/apps/desktopgui/locale/messages_vi.po
+++ b/apps/desktopgui/locale/messages_vi.po
@@ -0,0 +1,57 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# dich_tran <tran.nathan@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-04-12 06:13+0000\n"
+"Last-Translator: dich_tran <tran.nathan@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "Khởi động I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "I2P đang bắt đầu"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "Bắt đầu"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "Kích hoạt trình duyệt I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "Cấu hình giao diện"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "Khởi động lại I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "Ngưng I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "Cấu hình tray icon"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "Cần dùng tray icon?"
+
+
--- a/apps/desktopgui/locale/messages_zh.po
+++ b/apps/desktopgui/locale/messages_zh.po
@@ -0,0 +1,58 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# ducki2p <ducki2p@gmail.com>, 2011.
+# walking <walking@i2pmail.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2011-03-03 18:29+0000\n"
+"PO-Revision-Date: 2011-03-24 09:18+0000\n"
+"Last-Translator: walking <walking@i2pmail.org>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/I2P/team/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:23
+msgid "Start I2P"
+msgstr "启动 I2P"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "I2P is starting!"
+msgstr "正在启动 I2P !"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:38
+msgid "Starting"
+msgstr "正在启动"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:26
+msgid "Launch I2P Browser"
+msgstr "正在启动I2P浏览器"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:50
+msgid "Configure desktopgui"
+msgstr "设置desktopgui"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:67
+msgid "Restart I2P"
+msgstr "重启 I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:85
+msgid "Stop I2P"
+msgstr "停止 I2P"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:44
+msgid "Tray icon configuration"
+msgstr "托盘图标配置"
+
+#: src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java:47
+msgid "Should tray icon be enabled?"
+msgstr "是否启用托盘图标？"
+
+
--- a/apps/desktopgui/manifest.mf
+++ b/apps/desktopgui/manifest.mf
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
--- a/apps/desktopgui/nbproject/build-impl.xml
+++ b/apps/desktopgui/nbproject/build-impl.xml
@@ -1,642 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="desktopgui-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="/does/not/exist" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>
--- a/apps/desktopgui/nbproject/genfiles.properties
+++ b/apps/desktopgui/nbproject/genfiles.properties
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=c4b345cd
-build.xml.script.CRC32=9785bb9a
-build.xml.stylesheet.CRC32=be360661
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=f630f8db
-nbproject/build-impl.xml.script.CRC32=8c02c081
-nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
--- a/apps/desktopgui/nbproject/project.properties
+++ b/apps/desktopgui/nbproject/project.properties
@@ -1,81 +0,0 @@
-application.desc=An anonymous communication network.
-application.homepage=http://www.i2p2.de
-application.title=I2P Desktop GUI
-application.vendor=I2P Developers
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/desktopgui.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.appframework.jar=lib/appframework.jar
-file.reference.i2p.jar=../../core/java/build/i2p.jar
-file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
-file.reference.router.jar=../../router/java/build/router.jar
-file.reference.routerconsole.jar=../routerconsole/java/build/routerconsole.jar
-file.reference.swing-worker.jar=lib/swing-worker.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.router.jar}:\
-    ${file.reference.appframework.jar}:\
-    ${file.reference.swing-worker.jar}:\
-    ${file.reference.i2p.jar}:\
-    ${file.reference.routerconsole.jar}:\
-    ${file.reference.i2ptunnel.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.encoding.used=${javadoc.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/home/mathias/Documenten/Programmeren/i2p_monotone/repo/i2p.i2p/apps/desktopgui/dist/
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=net.i2p.desktopgui.desktopgui.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
--- a/apps/desktopgui/nbproject/project.xml
+++ b/apps/desktopgui/nbproject/project.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>desktopgui</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <swingapp xmlns="http://www.netbeans.org/ns/form-swingapp/1">
-            <application-class name="net.i2p.desktopgui.desktopgui.Main"/>
-        </swingapp>
-    </configuration>
-</project>
--- a/apps/desktopgui/desktopgui/resources/logo/logo.jpg
+++ b/apps/desktopgui/desktopgui/resources/logo/logo.jpg
--- a/apps/desktopgui/resources/images/logo.png
+++ b/apps/desktopgui/resources/images/logo.png
--- a/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg
+++ b/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg
--- a/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg
+++ b/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg
--- a/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg
+++ b/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg
--- a/apps/desktopgui/src/META-INF/services/org.jdesktop.application.Application
+++ b/apps/desktopgui/src/META-INF/services/org.jdesktop.application.Application
@@ -1 +0,0 @@
-desktopgui.Main
--- a/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java
@@ -0,0 +1,52 @@
+package net.i2p.desktopgui;
+
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.TrayIcon;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.SwingWorker;
+
+import net.i2p.desktopgui.router.RouterManager;
+import net.i2p.util.Log;
+
+public class ExternalTrayManager extends TrayManager {
+	
+    private final static Log log = new Log(ExternalTrayManager.class);
+
+    protected ExternalTrayManager() {}
+
+    @Override
+    public PopupMenu getMainMenu() {
+        PopupMenu popup = new PopupMenu();
+        MenuItem startItem = new MenuItem(_("Start I2P"));
+        startItem.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                new SwingWorker<Object, Object>() {
+
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        RouterManager.start();
+                        return null;
+                    }
+                    
+                    @Override
+                    protected void done() {
+                        trayIcon.displayMessage(_("Starting"), _("I2P is starting!"), TrayIcon.MessageType.INFO);
+                        //Hide the tray icon.
+                        //We cannot stop the desktopgui program entirely,
+                        //since that risks killing the I2P process as well.
+                        tray.remove(trayIcon);
+                    }
+                    
+                }.execute();
+            }
+            
+        });
+        popup.add(startItem);
+        return popup;
+    }
+}
--- a/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
@@ -0,0 +1,113 @@
+package net.i2p.desktopgui;
+
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.SwingWorker;
+import net.i2p.desktopgui.gui.DesktopguiConfigurationFrame;
+
+import net.i2p.desktopgui.router.RouterManager;
+import net.i2p.desktopgui.util.BrowseException;
+import net.i2p.desktopgui.util.I2PDesktop;
+import net.i2p.util.Log;
+
+public class InternalTrayManager extends TrayManager {
+	
+	private final static Log log = new Log(InternalTrayManager.class);
+
+    protected InternalTrayManager() {}
+
+    @Override
+    public PopupMenu getMainMenu() {
+        PopupMenu popup = new PopupMenu();
+        
+        MenuItem browserLauncher = new MenuItem(_("Launch I2P Browser"));
+        browserLauncher.addActionListener(new ActionListener() {
+            
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                new SwingWorker<Object, Object>() {
+
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        return null;
+                    }
+                    
+                    @Override
+                    protected void done() {
+                        try {
+                            I2PDesktop.browse("http://localhost:7657");
+                        } catch (BrowseException e1) {
+                            log.log(Log.WARN, "Failed to open browser!", e1);
+                        }    
+                    }
+                    
+                }.execute();
+            }
+        });
+        MenuItem desktopguiConfigurationLauncher = new MenuItem(_("Configure desktopgui"));
+        desktopguiConfigurationLauncher.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                new SwingWorker<Object, Object>() {
+
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        new DesktopguiConfigurationFrame().setVisible(true);
+                        return null;
+                    }
+
+                }.execute();
+            }
+
+        });
+        MenuItem restartItem = new MenuItem(_("Restart I2P"));
+        restartItem.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                new SwingWorker<Object, Object>() {
+
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        RouterManager.restart();
+                        return null;
+                    }
+                    
+                }.execute();
+                
+            }
+            
+        });
+        MenuItem stopItem = new MenuItem(_("Stop I2P"));
+        stopItem.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent arg0) {
+                new SwingWorker<Object, Object>() {
+                    
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        RouterManager.shutDown();
+                        return null;
+                    }
+                    
+                }.execute();
+                
+            }
+            
+        });
+        
+        popup.add(browserLauncher);
+        popup.addSeparator();
+        popup.add(desktopguiConfigurationLauncher);
+        popup.addSeparator();
+        popup.add(restartItem);
+        popup.add(stopItem);
+        
+        return popup;
+    }
+}
--- a/apps/desktopgui/src/net/i2p/desktopgui/Main.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/Main.java
@@ -0,0 +1,125 @@
+package net.i2p.desktopgui;
+
+/*
+ * Main.java
+ */
+
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import java.awt.GraphicsEnvironment;
+
+import net.i2p.I2PAppContext;
+import net.i2p.desktopgui.router.RouterManager;
+import net.i2p.desktopgui.util.*;
+import net.i2p.util.Log;
+import net.i2p.util.Translate;
+import net.i2p.util.I2PProperties.I2PPropertyCallback;
+
+/**
+ * The main class of the application.
+ */
+public class Main {
+    
+    ///Manages the lifetime of the tray icon.
+    private TrayManager trayManager = null;
+    private final static Log log = new Log(Main.class);
+
+    /**
+     * Start the tray icon code (loads tray icon in the tray area).
+     * @throws Exception 
+     */
+    public void startUp() throws Exception {
+        trayManager = TrayManager.getInstance();
+        trayManager.startManager();
+        
+        if(RouterManager.inI2P()) {
+            RouterManager.getRouterContext().addPropertyCallback(new I2PPropertyCallback() {
+
+                @Override
+                public void propertyChanged(String arg0, String arg1) {
+                    if(arg0.equals(Translate.PROP_LANG)) {
+                        trayManager.languageChanged();
+                    }
+                }
+                
+            });
+        }
+    }
+    
+    public static void main(String[] args) {
+        beginStartup(args);
+    }
+
+    /**
+     * Main method launching the application.
+     */
+    public static void beginStartup(String[] args) {
+        try {
+            String headless = System.getProperty("java.awt.headless");
+            boolean isHeadless = Boolean.parseBoolean(headless);
+            if(isHeadless) {
+            	log.warn("Headless environment: not starting desktopgui!");
+                return;
+            }
+        }
+        catch(Exception e) {
+            return;
+        }
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (ClassNotFoundException ex) {
+            log.log(Log.ERROR, null, ex);
+        } catch (InstantiationException ex) {
+            log.log(Log.ERROR, null, ex);
+        } catch (IllegalAccessException ex) {
+            log.log(Log.ERROR, null, ex);
+        } catch (UnsupportedLookAndFeelException ex) {
+            log.log(Log.ERROR, null, ex);
+        }
+        
+        ConfigurationManager.getInstance().loadArguments(args);
+        
+        final Main main = new Main();
+        
+        main.launchForeverLoop();
+        //We'll be doing GUI work, so let's stay in the event dispatcher thread.
+        SwingUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    main.startUp();
+                }
+                catch(Exception e) {
+                    log.error("Failed while running desktopgui!", e);
+                }
+                
+            }
+            
+        });
+
+    }
+    
+    /**
+     * Avoids the app terminating because no Window is opened anymore.
+     * More info: http://java.sun.com/javase/6/docs/api/java/awt/doc-files/AWTThreadIssues.html#Autoshutdown
+     */
+    public void launchForeverLoop() {
+       Runnable r = new Runnable() {
+            public void run() {
+                try {
+                    Object o = new Object();
+                    synchronized (o) {
+                        o.wait();
+                    }
+                } catch (InterruptedException ie) {
+                }
+            }
+        };
+        Thread t = new Thread(r);
+        t.setDaemon(false);
+        t.start();
+    }
+    
+}
--- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
@@ -0,0 +1,97 @@
+package net.i2p.desktopgui;
+
+import java.awt.AWTException;
+import java.awt.Desktop;
+import java.awt.Image;
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.SystemTray;
+import java.awt.Toolkit;
+import java.awt.TrayIcon;
+import java.awt.Desktop.Action;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.swing.SwingWorker;
+
+import net.i2p.desktopgui.i18n.DesktopguiTranslator;
+import net.i2p.desktopgui.router.RouterManager;
+import net.i2p.desktopgui.util.BrowseException;
+import net.i2p.desktopgui.util.ConfigurationManager;
+import net.i2p.desktopgui.util.I2PDesktop;
+import net.i2p.util.Log;
+
+/**
+ * Manages the tray icon life.
+ */
+public abstract class TrayManager {
+
+    private static TrayManager instance = null;
+    ///The tray area, or null if unsupported
+    protected SystemTray tray = null;
+    ///Our tray icon, or null if unsupported
+    protected TrayIcon trayIcon = null;
+    private final static Log log = new Log(TrayManager.class);
+    
+    /**
+     * Instantiate tray manager.
+     */
+    protected TrayManager() {}
+    
+    protected static TrayManager getInstance() {
+        if(instance == null) {
+            boolean inI2P = RouterManager.inI2P();
+            if(inI2P) {
+                instance = new InternalTrayManager();
+            }
+            else {
+                instance = new ExternalTrayManager();
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * Add the tray icon to the system tray and start everything up.
+     */
+    protected void startManager() {
+        if(SystemTray.isSupported()) {
+            tray = SystemTray.getSystemTray();
+            trayIcon = new TrayIcon(getTrayImage(), "I2P", getMainMenu());
+            trayIcon.setImageAutoSize(true); //Resize image to fit the system tray
+            try {
+                tray.add(trayIcon);
+            } catch (AWTException e) {
+                log.log(Log.WARN, "Problem creating system tray icon!", e);
+            }
+        }
+    }
+    
+    protected void languageChanged() {
+        trayIcon.setPopupMenu(getMainMenu());
+    }
+    
+    /**
+     * Build a popup menu, adding callbacks to the different items.
+     * @return popup menu
+     */
+    protected abstract PopupMenu getMainMenu();
+    
+    /**
+     * Get tray icon image from the desktopgui resources in the jar file.
+     * @return image used for the tray icon
+     */
+    private Image getTrayImage() {
+        URL url = getClass().getResource("/desktopgui/resources/images/logo.png");
+        Image image = Toolkit.getDefaultToolkit().getImage(url);
+        return image;
+    }
+    
+    protected static String _(String s) {
+        return DesktopguiTranslator._(s);
+    }
+}
--- a/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/GUIVersion.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/GUIVersion.java
@@ -1,14 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package net.i2p.desktopgui.desktopgui;
-
-/**
- *
- * @author mathias
- */
-public class GUIVersion {
-    public static final String VERSION = "0.0.2";
-}
--- a/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/Main.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/Main.java
@@ -1,109 +0,0 @@
-package net.i2p.desktopgui.desktopgui;
-
-/*
- * Main.java
- */
-
-
-
-import net.i2p.desktopgui.gui.Tray;
-import net.i2p.desktopgui.gui.SpeedSelector;
-import java.awt.SystemTray;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import org.jdesktop.application.Application;
-import org.jdesktop.application.SingleFrameApplication;
-import net.i2p.desktopgui.persistence.PropertyManager;
-
-/**
- * The main class of the application.
- */
-public class Main extends SingleFrameApplication {
-
-    /**
-     * At startup create and show the main frame of the application.
-     */
-    @Override protected void startup() {
-        Properties props = PropertyManager.loadProps();
-        
-        //First load: present screen with information (to help choose I2P settings)
-        if(props.getProperty(FIRSTLOAD).equals("true")) {
-            props.setProperty(FIRSTLOAD, "false");
-            PropertyManager.saveProps(props);
-            new SpeedSelector(); //Start speed selector GUI
-        }
-        
-        if(SystemTray.isSupported()) {
-            tray = new Tray();
-        }
-        else { //Alternative if SystemTray is not supported on the platform
-        }
-    }
-
-    /**
-     * This method is to initialize the specified window by injecting resources.
-     * Windows shown in our application come fully initialized from the GUI
-     * builder, so this additional configuration is not needed.
-     */
-    @Override protected void configureWindow(java.awt.Window root) {
-    }
-
-    /**
-     * A convenient static getter for the application instance.
-     * @return the instance of Main
-     */
-    public static Main getApplication() {
-        return Application.getInstance(Main.class);
-    }
-
-    /**
-     * Main method launching the application.
-     */
-    public static void main(String[] args) {
-        System.setProperty("java.awt.headless", "false");  //Make sure I2P is running in GUI mode for our application
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (ClassNotFoundException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (InstantiationException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (IllegalAccessException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (UnsupportedLookAndFeelException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        
-        Main main = getApplication();
-        main.launchForeverLoop();
-        main.startup();
-    }
-    
-    /**
-     * Avoids the app terminating because no Window is opened anymore.
-     * More info: http://java.sun.com/javase/6/docs/api/java/awt/doc-files/AWTThreadIssues.html#Autoshutdown
-     */
-    public void launchForeverLoop() {
-       Runnable r = new Runnable() {
-            public void run() {
-                try {
-                    Object o = new Object();
-                    synchronized (o) {
-                        o.wait();
-                    }
-                } catch (InterruptedException ie) {
-                }
-            }
-        };
-        Thread t = new Thread(r);
-        t.setDaemon(false);
-        t.start();
-    }
-    
-    private Tray tray = null;
-    ///Indicates if this is the first time the application loads
-    ///(is only true at the very start of loading the first time!)
-    private static final String FIRSTLOAD = "firstLoad";
-}
--- a/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main.properties
+++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main.properties
@@ -1,11 +0,0 @@
-# Application global resources
-
-Application.name = desktopgui
-Application.title = I2P Desktop GUI
-Application.version = 0.7.1
-Application.vendor = I2P Developers
-Application.homepage = http://www.i2p2.de
-Application.description = An anonymous communication network.
-Application.vendorId = I2P
-Application.id = desktopgui
-Application.lookAndFeel = system
--- a/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main_nl_BE.properties
+++ b/apps/desktopgui/src/net/i2p/desktopgui/desktopgui/resources/Main_nl_BE.properties
@@ -1,11 +0,0 @@
-# Application global resources
-
-Application.name = desktopgui
-Application.title = I2P Desktop GUI
-Application.version = 0.7.1
-Application.vendor = I2P Ontwikkelaars
-Application.homepage = http://www.i2p2.de
-Application.description = Een anoniem communicatienetwerk.
-Application.vendorId = I2P
-Application.id = desktopgui
-Application.lookAndFeel = system
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/ClientTunnelWindow.form
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/ClientTunnelWindow.form
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="3"/>
-    <Property name="title" type="java.lang.String" resourceKey="Form.title"/>
-    <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-  </SyntheticProperties>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,48,0,0,2,48"/>
-  </AuxValues>
-
-  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-    <Property name="useNullLayout" type="boolean" value="true"/>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JLabel" name="tunnelNameLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelNameLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelNameLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="20" width="120" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelTypeLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelTypeLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelTypeLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="50" width="120" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelPortLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelPortLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelPortLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="80" width="110" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelDestinationLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelDestinationLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelDestinationLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="110" width="110" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelProfileLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelProfileLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelProfileLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="140" width="110" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="delayConnect">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="delayConnect.text"/>
-        <Property name="name" type="java.lang.String" value="delayConnect" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="170" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="sharedClient">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="sharedClient.text"/>
-        <Property name="name" type="java.lang.String" value="sharedClient" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="200" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="autoStart">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="autoStart.text"/>
-        <Property name="name" type="java.lang.String" value="autoStart" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="230" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JSeparator" name="jSeparator1">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="jSeparator1" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="0" y="510" width="750" height="10"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelDepthLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelDepthLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelDepthLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="280" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="depthVarianceLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="depthVarianceLabel.text"/>
-        <Property name="name" type="java.lang.String" value="depthVarianceLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="310" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelCountLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelCountLabel.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelCountLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="340" width="160" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="backupTunnelCountLabel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="backupTunnelCountLabel.text"/>
-        <Property name="name" type="java.lang.String" value="backupTunnelCountLabel" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="370" width="170" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JSeparator" name="jSeparator2">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="jSeparator2" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="0" y="260" width="750" height="10"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="reduceIdle">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="reduceIdle.text"/>
-        <Property name="name" type="java.lang.String" value="reduceIdle" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="420" width="300" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="closeIdle">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="closeIdle.text"/>
-        <Property name="name" type="java.lang.String" value="closeIdle" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="450" width="370" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JCheckBox" name="delayIdle">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="delayIdle.text"/>
-        <Property name="name" type="java.lang.String" value="delayIdle" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="20" y="480" width="400" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JSeparator" name="jSeparator3">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="jSeparator3" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="0" y="400" width="760" height="10"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JButton" name="save">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="save.text"/>
-        <Property name="name" type="java.lang.String" value="save" noResource="true"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="saveActionPerformed"/>
-      </Events>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="10" y="520" width="-1" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JButton" name="cancel">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="cancel.text"/>
-        <Property name="name" type="java.lang.String" value="cancel" noResource="true"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelActionPerformed"/>
-      </Events>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="60" y="520" width="-1" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JTextField" name="tunnelName">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelName.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelName" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="20" width="340" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JLabel" name="tunnelType">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelType.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelType" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="50" width="340" height="20"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JTextField" name="tunnelPort">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelPort.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelPort" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="70" width="340" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JTextField" name="tunnelDestination">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="tunnelDestination.text"/>
-        <Property name="name" type="java.lang.String" value="tunnelDestination" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="100" width="340" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="tunnelProfile">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="2">
-            <StringItem index="0" value="Interactive connection (Instant messaging)"/>
-            <StringItem index="1" value="Bulk connection (Downloads, websites...)"/>
-          </StringArray>
-        </Property>
-        <Property name="name" type="java.lang.String" value="tunnelProfile" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="130" width="340" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="tunnelDepth">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="0 hop tunnel (no anonymity, low latency)"/>
-            <StringItem index="1" value="1 hop tunnel (low anonymity, low latency)"/>
-            <StringItem index="2" value="2 hop tunnel (medium anonymity, medium latency)"/>
-            <StringItem index="3" value="3 hop tunnel (high anonymity, high latency)"/>
-          </StringArray>
-        </Property>
-        <Property name="name" type="java.lang.String" value="tunnelDepth" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="280" width="350" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="depthVariance">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="5">
-            <StringItem index="0" value="0 hop variance (no random, good performance)"/>
-            <StringItem index="1" value="+ 0-1 hop variance (slightly random, lower performance)"/>
-            <StringItem index="2" value="+ 0-2 hop variance (very random, lower performance)"/>
-            <StringItem index="3" value="+/- 0-1 hop variance (slightly random, standard performance)"/>
-            <StringItem index="4" value="+/- 0-2 hop variance (not recommended)"/>
-          </StringArray>
-        </Property>
-        <Property name="name" type="java.lang.String" value="depthVariance" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="310" width="350" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="tunnelCount">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="3">
-            <StringItem index="0" value="1 tunnel (low bandwidth usage, low reliability)"/>
-            <StringItem index="1" value="2 tunnels (standard bandwidth usage, standard reliability)"/>
-            <StringItem index="2" value="3 tunnels (high bandwidth usage, high reliability)"/>
-          </StringArray>
-        </Property>
-        <Property name="name" type="java.lang.String" value="tunnelCount" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="340" width="350" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JComboBox" name="backupTunnelCount">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="0 backup tunnels (no redundancy, no resource usage)"/>
-            <StringItem index="1" value="1 backup tunnel (low redundancy, low resource usage)"/>
-            <StringItem index="2" value="2 backup tunnels (medium redundancy, medium resource usage)"/>
-            <StringItem index="3" value="3 backup tunnels (high redundancy, high resource usage)"/>
-          </StringArray>
-        </Property>
-        <Property name="name" type="java.lang.String" value="backupTunnelCount" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="200" y="370" width="350" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-    <Component class="javax.swing.JButton" name="changeTunnelState">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="changeTunnelState.text"/>
-        <Property name="name" type="java.lang.String" value="changeTunnelState" noResource="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-          <AbsoluteConstraints x="160" y="520" width="150" height="-1"/>
-        </Constraint>
-      </Constraints>
-    </Component>
-  </SubComponents>
-</Form>
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/ClientTunnelWindow.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/ClientTunnelWindow.java
@@ -1,434 +0,0 @@
-/*
- * ClientTunnelWindow.java
- *
- * Created on 10-jun-2009, 16:49:12
- */
-
-package net.i2p.desktopgui.gui;
-
-import net.i2p.i2ptunnel.web.EditBean;
-import java.awt.event.ActionListener;
-
-/**
- *
- * @author mathias
- */
-public class ClientTunnelWindow extends javax.swing.JFrame {
-
-    /** Creates new form ClientTunnelWindow */
-    public ClientTunnelWindow(int tunnelNumber, ActionListener al) {
-        initComponents();
-        this.tunnelNumber = tunnelNumber;
-        this.al = al;
-        extraInitComponents();
-        this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        this.setSize(600, 600);
-        this.setLocationRelativeTo(null);
-        this.requestFocus();
-        this.changeTunnelState.setVisible(false); //TODO: implement tunnel state change
-        this.setVisible(true);
-    }
-
-    public void extraInitComponents() {
-        EditBean bean = new EditBean();
-        if(!bean.isClient(tunnelNumber)) {
-            this.dispose();
-        }
-        else {
-            this.tunnelName.setText(bean.getTunnelName(tunnelNumber));
-            this.tunnelType.setText(bean.getTunnelType(tunnelNumber));
-            this.tunnelPort.setText(bean.getClientPort(tunnelNumber));
-            this.tunnelDestination.setText(bean.getClientDestination(tunnelNumber));
-
-            if(bean.getTunnelType(tunnelNumber).equals(TYPE_STREAMR_CLIENT)) {
-                tunnelProfile.setVisible(false);
-                tunnelProfileLabel.setVisible(false);
-                this.delayConnect.setVisible(false);
-                this.sharedClient.setVisible(false);
-                this.autoStart.setVisible(false);
-            }
-            else {
-                if(bean.isInteractive(tunnelNumber)) {
-                    tunnelProfile.setSelectedIndex(TUNNEL_INTERACTIVE);
-                }
-                else {
-                    tunnelProfile.setSelectedIndex(TUNNEL_BULK);
-                }
-
-                this.delayConnect.setSelected(bean.shouldDelay(tunnelNumber));
-                this.sharedClient.setSelected(bean.isSharedClient(tunnelNumber));
-                this.autoStart.setSelected(bean.startAutomatically(tunnelNumber));
-            }
-
-            this.tunnelDepth.setSelectedIndex(bean.getTunnelDepth(tunnelNumber, 2));
-
-            int variance = bean.getTunnelVariance(tunnelNumber, 0);
-            if(variance == 0) {
-                this.depthVariance.setSelectedIndex(0);
-            }
-            else if(variance == 1) {
-                this.depthVariance.setSelectedIndex(1);
-            }
-            else if(variance == 2) {
-                this.depthVariance.setSelectedIndex(2);
-            }
-            else if(variance == -1) {
-                this.depthVariance.setSelectedIndex(3);
-            }
-            else if(variance == -2) {
-                this.depthVariance.setSelectedIndex(4);
-            }
-
-            int tunnelQuantity = bean.getTunnelQuantity(tunnelNumber, 2) - 1;
-            if(tunnelQuantity >= 0 && tunnelQuantity <= 2) {
-                this.tunnelCount.setSelectedIndex(tunnelQuantity);
-            }
-
-            int backupTunnelQuantity = bean.getTunnelBackupQuantity(tunnelNumber, 0);
-            if(backupTunnelQuantity >= 0 && backupTunnelQuantity <= 3) {
-                this.backupTunnelCount.setSelectedIndex(backupTunnelQuantity);
-            }
-
-            
-            if(bean.getTunnelType(tunnelNumber).equals(TYPE_STREAMR_CLIENT)) {
-                this.reduceIdle.setVisible(false);
-                this.closeIdle.setVisible(false);
-                this.delayIdle.setVisible(false);
-            }
-            else {
-                this.reduceIdle.setSelected(bean.getReduce(tunnelNumber));
-                this.closeIdle.setSelected(bean.getClose(tunnelNumber));
-                this.delayIdle.setSelected(bean.getDelayOpen(tunnelNumber));
-            }
-        }
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        tunnelNameLabel = new javax.swing.JLabel();
-        tunnelTypeLabel = new javax.swing.JLabel();
-        tunnelPortLabel = new javax.swing.JLabel();
-        tunnelDestinationLabel = new javax.swing.JLabel();
-        tunnelProfileLabel = new javax.swing.JLabel();
-        delayConnect = new javax.swing.JCheckBox();
-        sharedClient = new javax.swing.JCheckBox();
-        autoStart = new javax.swing.JCheckBox();
-        jSeparator1 = new javax.swing.JSeparator();
-        tunnelDepthLabel = new javax.swing.JLabel();
-        depthVarianceLabel = new javax.swing.JLabel();
-        tunnelCountLabel = new javax.swing.JLabel();
-        backupTunnelCountLabel = new javax.swing.JLabel();
-        jSeparator2 = new javax.swing.JSeparator();
-        reduceIdle = new javax.swing.JCheckBox();
-        closeIdle = new javax.swing.JCheckBox();
-        delayIdle = new javax.swing.JCheckBox();
-        jSeparator3 = new javax.swing.JSeparator();
-        save = new javax.swing.JButton();
-        cancel = new javax.swing.JButton();
-        tunnelName = new javax.swing.JTextField();
-        tunnelType = new javax.swing.JLabel();
-        tunnelPort = new javax.swing.JTextField();
-        tunnelDestination = new javax.swing.JTextField();
-        tunnelProfile = new javax.swing.JComboBox();
-        tunnelDepth = new javax.swing.JComboBox();
-        depthVariance = new javax.swing.JComboBox();
-        tunnelCount = new javax.swing.JComboBox();
-        backupTunnelCount = new javax.swing.JComboBox();
-        changeTunnelState = new javax.swing.JButton();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(ClientTunnelWindow.class);
-        setTitle(resourceMap.getString("Form.title")); // NOI18N
-        setName("Form"); // NOI18N
-        getContentPane().setLayout(null);
-
-        tunnelNameLabel.setText(resourceMap.getString("tunnelNameLabel.text")); // NOI18N
-        tunnelNameLabel.setName("tunnelNameLabel"); // NOI18N
-        getContentPane().add(tunnelNameLabel);
-        tunnelNameLabel.setBounds(20, 20, 120, 17);
-
-        tunnelTypeLabel.setText(resourceMap.getString("tunnelTypeLabel.text")); // NOI18N
-        tunnelTypeLabel.setName("tunnelTypeLabel"); // NOI18N
-        getContentPane().add(tunnelTypeLabel);
-        tunnelTypeLabel.setBounds(20, 50, 120, 17);
-
-        tunnelPortLabel.setText(resourceMap.getString("tunnelPortLabel.text")); // NOI18N
-        tunnelPortLabel.setName("tunnelPortLabel"); // NOI18N
-        getContentPane().add(tunnelPortLabel);
-        tunnelPortLabel.setBounds(20, 80, 110, 17);
-
-        tunnelDestinationLabel.setText(resourceMap.getString("tunnelDestinationLabel.text")); // NOI18N
-        tunnelDestinationLabel.setName("tunnelDestinationLabel"); // NOI18N
-        getContentPane().add(tunnelDestinationLabel);
-        tunnelDestinationLabel.setBounds(20, 110, 110, 17);
-
-        tunnelProfileLabel.setText(resourceMap.getString("tunnelProfileLabel.text")); // NOI18N
-        tunnelProfileLabel.setName("tunnelProfileLabel"); // NOI18N
-        getContentPane().add(tunnelProfileLabel);
-        tunnelProfileLabel.setBounds(20, 140, 110, 17);
-
-        delayConnect.setText(resourceMap.getString("delayConnect.text")); // NOI18N
-        delayConnect.setName("delayConnect"); // NOI18N
-        getContentPane().add(delayConnect);
-        delayConnect.setBounds(20, 170, 160, 22);
-
-        sharedClient.setText(resourceMap.getString("sharedClient.text")); // NOI18N
-        sharedClient.setName("sharedClient"); // NOI18N
-        getContentPane().add(sharedClient);
-        sharedClient.setBounds(20, 200, 160, 22);
-
-        autoStart.setText(resourceMap.getString("autoStart.text")); // NOI18N
-        autoStart.setName("autoStart"); // NOI18N
-        getContentPane().add(autoStart);
-        autoStart.setBounds(20, 230, 160, 22);
-
-        jSeparator1.setName("jSeparator1"); // NOI18N
-        getContentPane().add(jSeparator1);
-        jSeparator1.setBounds(0, 510, 750, 10);
-
-        tunnelDepthLabel.setText(resourceMap.getString("tunnelDepthLabel.text")); // NOI18N
-        tunnelDepthLabel.setName("tunnelDepthLabel"); // NOI18N
-        getContentPane().add(tunnelDepthLabel);
-        tunnelDepthLabel.setBounds(20, 280, 160, 17);
-
-        depthVarianceLabel.setText(resourceMap.getString("depthVarianceLabel.text")); // NOI18N
-        depthVarianceLabel.setName("depthVarianceLabel"); // NOI18N
-        getContentPane().add(depthVarianceLabel);
-        depthVarianceLabel.setBounds(20, 310, 160, 17);
-
-        tunnelCountLabel.setText(resourceMap.getString("tunnelCountLabel.text")); // NOI18N
-        tunnelCountLabel.setName("tunnelCountLabel"); // NOI18N
-        getContentPane().add(tunnelCountLabel);
-        tunnelCountLabel.setBounds(20, 340, 160, 17);
-
-        backupTunnelCountLabel.setText(resourceMap.getString("backupTunnelCountLabel.text")); // NOI18N
-        backupTunnelCountLabel.setName("backupTunnelCountLabel"); // NOI18N
-        getContentPane().add(backupTunnelCountLabel);
-        backupTunnelCountLabel.setBounds(20, 370, 170, 17);
-
-        jSeparator2.setName("jSeparator2"); // NOI18N
-        getContentPane().add(jSeparator2);
-        jSeparator2.setBounds(0, 260, 750, 10);
-
-        reduceIdle.setText(resourceMap.getString("reduceIdle.text")); // NOI18N
-        reduceIdle.setName("reduceIdle"); // NOI18N
-        getContentPane().add(reduceIdle);
-        reduceIdle.setBounds(20, 420, 300, 22);
-
-        closeIdle.setText(resourceMap.getString("closeIdle.text")); // NOI18N
-        closeIdle.setName("closeIdle"); // NOI18N
-        getContentPane().add(closeIdle);
-        closeIdle.setBounds(20, 450, 370, 22);
-
-        delayIdle.setText(resourceMap.getString("delayIdle.text")); // NOI18N
-        delayIdle.setName("delayIdle"); // NOI18N
-        getContentPane().add(delayIdle);
-        delayIdle.setBounds(20, 480, 400, 22);
-
-        jSeparator3.setName("jSeparator3"); // NOI18N
-        getContentPane().add(jSeparator3);
-        jSeparator3.setBounds(0, 400, 760, 10);
-
-        save.setText(resourceMap.getString("save.text")); // NOI18N
-        save.setName("save"); // NOI18N
-        save.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                saveActionPerformed(evt);
-            }
-        });
-        getContentPane().add(save);
-        save.setBounds(10, 520, 44, 29);
-
-        cancel.setText(resourceMap.getString("cancel.text")); // NOI18N
-        cancel.setName("cancel"); // NOI18N
-        cancel.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                cancelActionPerformed(evt);
-            }
-        });
-        getContentPane().add(cancel);
-        cancel.setBounds(60, 520, 55, 29);
-
-        tunnelName.setText(resourceMap.getString("tunnelName.text")); // NOI18N
-        tunnelName.setName("tunnelName"); // NOI18N
-        getContentPane().add(tunnelName);
-        tunnelName.setBounds(200, 20, 340, 27);
-
-        tunnelType.setText(resourceMap.getString("tunnelType.text")); // NOI18N
-        tunnelType.setName("tunnelType"); // NOI18N
-        getContentPane().add(tunnelType);
-        tunnelType.setBounds(200, 50, 340, 20);
-
-        tunnelPort.setText(resourceMap.getString("tunnelPort.text")); // NOI18N
-        tunnelPort.setName("tunnelPort"); // NOI18N
-        getContentPane().add(tunnelPort);
-        tunnelPort.setBounds(200, 70, 340, 27);
-
-        tunnelDestination.setText(resourceMap.getString("tunnelDestination.text")); // NOI18N
-        tunnelDestination.setName("tunnelDestination"); // NOI18N
-        getContentPane().add(tunnelDestination);
-        tunnelDestination.setBounds(200, 100, 340, 27);
-
-        tunnelProfile.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Interactive connection (Instant messaging)", "Bulk connection (Downloads, websites...)" }));
-        tunnelProfile.setName("tunnelProfile"); // NOI18N
-        getContentPane().add(tunnelProfile);
-        tunnelProfile.setBounds(200, 130, 340, 27);
-
-        tunnelDepth.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "0 hop tunnel (no anonymity, low latency)", "1 hop tunnel (low anonymity, low latency)", "2 hop tunnel (medium anonymity, medium latency)", "3 hop tunnel (high anonymity, high latency)" }));
-        tunnelDepth.setName("tunnelDepth"); // NOI18N
-        getContentPane().add(tunnelDepth);
-        tunnelDepth.setBounds(200, 280, 350, 27);
-
-        depthVariance.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "0 hop variance (no random, good performance)", "+ 0-1 hop variance (slightly random, lower performance)", "+ 0-2 hop variance (very random, lower performance)", "+/- 0-1 hop variance (slightly random, standard performance)", "+/- 0-2 hop variance (not recommended)" }));
-        depthVariance.setName("depthVariance"); // NOI18N
-        getContentPane().add(depthVariance);
-        depthVariance.setBounds(200, 310, 350, 27);
-
-        tunnelCount.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1 tunnel (low bandwidth usage, low reliability)", "2 tunnels (standard bandwidth usage, standard reliability)", "3 tunnels (high bandwidth usage, high reliability)" }));
-        tunnelCount.setName("tunnelCount"); // NOI18N
-        getContentPane().add(tunnelCount);
-        tunnelCount.setBounds(200, 340, 350, 27);
-
-        backupTunnelCount.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "0 backup tunnels (no redundancy, no resource usage)", "1 backup tunnel (low redundancy, low resource usage)", "2 backup tunnels (medium redundancy, medium resource usage)", "3 backup tunnels (high redundancy, high resource usage)" }));
-        backupTunnelCount.setName("backupTunnelCount"); // NOI18N
-        getContentPane().add(backupTunnelCount);
-        backupTunnelCount.setBounds(200, 370, 350, 27);
-
-        changeTunnelState.setText(resourceMap.getString("changeTunnelState.text")); // NOI18N
-        changeTunnelState.setName("changeTunnelState"); // NOI18N
-        getContentPane().add(changeTunnelState);
-        changeTunnelState.setBounds(160, 520, 150, 29);
-
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void saveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveActionPerformed
-        EditBean bean = new EditBean();
-        if(!bean.isClient(tunnelNumber)) {
-            al.actionPerformed(evt);
-            this.dispose();
-        }
-        else {
-            bean.setTunnel("" + tunnelNumber);
-            bean.setName(tunnelName.getText());
-            bean.setPort(tunnelPort.getText());
-            bean.setTargetDestination(tunnelDestination.getText());
-            if(!bean.getTunnelType(tunnelNumber).equals(TYPE_STREAMR_CLIENT)) {
-                if(tunnelProfile.getSelectedIndex() == TUNNEL_INTERACTIVE) {
-                    bean.setProfile("interactive");
-                }
-                else {
-                    bean.setProfile("bulk");
-                }
-
-                if(delayConnect.isSelected()) {
-                    bean.setConnectDelay("true");
-                }
-                else {
-                    bean.setConnectDelay("false");
-                }
-
-                if(sharedClient.isSelected()) {
-                    bean.setShared(true);
-                }
-                else {
-                    bean.setShared(false);
-                }
-
-                if(autoStart.isSelected()) {
-                    bean.setStartOnLoad("true");
-                }
-                else {
-                }
-            }
-            bean.setTunnelDepth("" + tunnelDepth.getSelectedIndex());
-
-            int variance = depthVariance.getSelectedIndex();
-            if(variance >= 0 && variance <= 2) {
-                bean.setTunnelVariance("" + variance);
-            }
-            else if(variance == 3) {
-                bean.setTunnelVariance("-1");
-            }
-            else if(variance == 4) {
-                bean.setTunnelVariance("-2");
-            }
-
-            bean.setTunnelQuantity("" + tunnelCount.getSelectedIndex() + 1);
-
-            bean.setTunnelBackupQuantity("" + backupTunnelCount.getSelectedIndex());
-
-            if(!bean.getTunnelType(tunnelNumber).equals(TYPE_STREAMR_CLIENT)) {
-                if(reduceIdle.isSelected()) {
-                    bean.setReduce("true");
-                }
-                else {
-                }
-
-                if(closeIdle.isSelected()) {
-                    bean.setClose("true");
-                }
-                else {
-                }
-
-                if(delayIdle.isSelected()) {
-                    bean.setDelayOpen("true");
-                }
-            }
-            
-        }
-        
-        al.actionPerformed(evt);
-        this.dispose();
-}//GEN-LAST:event_saveActionPerformed
-
-    private void cancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelActionPerformed
-        al.actionPerformed(evt);
-        this.dispose();
-    }//GEN-LAST:event_cancelActionPerformed
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JCheckBox autoStart;
-    private javax.swing.JComboBox backupTunnelCount;
-    private javax.swing.JLabel backupTunnelCountLabel;
-    private javax.swing.JButton cancel;
-    private javax.swing.JButton changeTunnelState;
-    private javax.swing.JCheckBox closeIdle;
-    private javax.swing.JCheckBox delayConnect;
-    private javax.swing.JCheckBox delayIdle;
-    private javax.swing.JComboBox depthVariance;
-    private javax.swing.JLabel depthVarianceLabel;
-    private javax.swing.JSeparator jSeparator1;
-    private javax.swing.JSeparator jSeparator2;
-    private javax.swing.JSeparator jSeparator3;
-    private javax.swing.JCheckBox reduceIdle;
-    private javax.swing.JButton save;
-    private javax.swing.JCheckBox sharedClient;
-    private javax.swing.JComboBox tunnelCount;
-    private javax.swing.JLabel tunnelCountLabel;
-    private javax.swing.JComboBox tunnelDepth;
-    private javax.swing.JLabel tunnelDepthLabel;
-    private javax.swing.JTextField tunnelDestination;
-    private javax.swing.JLabel tunnelDestinationLabel;
-    private javax.swing.JTextField tunnelName;
-    private javax.swing.JLabel tunnelNameLabel;
-    private javax.swing.JTextField tunnelPort;
-    private javax.swing.JLabel tunnelPortLabel;
-    private javax.swing.JComboBox tunnelProfile;
-    private javax.swing.JLabel tunnelProfileLabel;
-    private javax.swing.JLabel tunnelType;
-    private javax.swing.JLabel tunnelTypeLabel;
-    // End of variables declaration//GEN-END:variables
-    private int tunnelNumber;
-    private ActionListener al;
-    private static final int TUNNEL_INTERACTIVE = 0;
-    private static final int TUNNEL_BULK = 1;
-    private static final String TYPE_STREAMR_CLIENT = "Streamr client";
-}
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java
@@ -0,0 +1,132 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/*
+ * ConfigurationFrame.java
+ *
+ * Created on Feb 16, 2011, 8:03:14 AM
+ */
+
+package net.i2p.desktopgui.gui;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.i2p.desktopgui.i18n.DesktopguiTranslator;
+import net.i2p.desktopgui.router.RouterManager;
+
+/**
+ *
+ * @author mathias
+ */
+public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
+
+    /** Creates new form ConfigurationFrame */
+    public DesktopguiConfigurationFrame() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        desktopguiEnabled = new javax.swing.JCheckBox();
+        okButton = new javax.swing.JButton();
+        cancelButton = new javax.swing.JButton();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setTitle(_("Tray icon configuration"));
+
+        desktopguiEnabled.setSelected(true);
+        desktopguiEnabled.setText(_("Should tray icon be enabled?"));
+        desktopguiEnabled.setActionCommand("shouldDesktopguiBeEnabled");
+
+        okButton.setText("OK");
+        okButton.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseReleased(java.awt.event.MouseEvent evt) {
+                okButtonMouseReleased(evt);
+            }
+        });
+
+        cancelButton.setText("Cancel");
+        cancelButton.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseReleased(java.awt.event.MouseEvent evt) {
+                cancelButtonMouseReleased(evt);
+            }
+        });
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(desktopguiEnabled)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(okButton)
+                        .addGap(18, 18, 18)
+                        .addComponent(cancelButton)))
+                .addContainerGap(237, Short.MAX_VALUE))
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(desktopguiEnabled)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(okButton)
+                    .addComponent(cancelButton))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void cancelButtonMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelButtonMouseReleased
+        System.out.println("Cancelling configuration change.");
+        this.dispose();
+    }//GEN-LAST:event_cancelButtonMouseReleased
+
+    private void okButtonMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_okButtonMouseReleased
+        configureDesktopgui();
+    }//GEN-LAST:event_okButtonMouseReleased
+
+    protected static String _(String s) {
+        return DesktopguiTranslator._(s);
+    }
+
+    private void configureDesktopgui() {
+        String property = "desktopgui.enabled";
+        String value;
+        if(!desktopguiEnabled.isSelected()) {
+            value = "false";
+            System.out.println("Disabling desktopgui");
+        }
+        else {
+            value = "true";
+            System.out.println("Enabling desktopgui");
+        }
+        try {
+            RouterManager.getRouterContext().setProperty(property, value);
+        } catch (Exception ex) {
+            Logger.getLogger(DesktopguiConfigurationFrame.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        System.out.println("Applying desktopgui configuration!");
+        this.dispose();
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton cancelButton;
+    private javax.swing.JCheckBox desktopguiEnabled;
+    private javax.swing.JButton okButton;
+    // End of variables declaration//GEN-END:variables
+
+}
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.form
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.form
@@ -1,645 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.6" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <NonVisualComponents>
-    <Component class="javax.swing.ButtonGroup" name="updateButtonGroup">
-    </Component>
-  </NonVisualComponents>
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="3"/>
-    <Property name="title" type="java.lang.String" resourceKey="Form.title"/>
-    <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-  </SyntheticProperties>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="applyPanel" alignment="0" max="32767" attributes="0"/>
-          <Group type="102" attributes="0">
-              <EmptySpace min="12" pref="12" max="12" attributes="0"/>
-              <Component id="settingsPanel" pref="566" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="1" attributes="0">
-              <Component id="settingsPanel" max="32767" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="applyPanel" min="-2" max="-2" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Container class="javax.swing.JPanel" name="applyPanel">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="applyPanel" noResource="true"/>
-      </Properties>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="1" attributes="0">
-                  <EmptySpace pref="475" max="32767" attributes="0"/>
-                  <Component id="ok" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="cancel" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="cancel" alignment="3" min="-2" max="-2" attributes="0"/>
-                      <Component id="ok" alignment="3" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <EmptySpace pref="14" max="32767" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JToggleButton" name="cancel">
-          <Properties>
-            <Property name="text" type="java.lang.String" resourceKey="cancel.text"/>
-            <Property name="name" type="java.lang.String" value="cancel" noResource="true"/>
-          </Properties>
-          <Events>
-            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="cancelMouseClicked"/>
-          </Events>
-        </Component>
-        <Component class="javax.swing.JToggleButton" name="ok">
-          <Properties>
-            <Property name="text" type="java.lang.String" resourceKey="ok.text"/>
-            <Property name="name" type="java.lang.String" value="ok" noResource="true"/>
-          </Properties>
-          <Events>
-            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="okMouseClicked"/>
-          </Events>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Container class="javax.swing.JTabbedPane" name="settingsPanel">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="settingsPanel" noResource="true"/>
-      </Properties>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
-      <SubComponents>
-        <Container class="javax.swing.JPanel" name="speedPanel">
-          <Properties>
-            <Property name="name" type="java.lang.String" value="speedPanel" noResource="true"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Speed">
-                <Property name="tabTitle" type="java.lang.String" resourceKey="speedPanel.TabConstraints.tabTitle"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-            <Property name="useNullLayout" type="boolean" value="true"/>
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JLabel" name="uploadSpeedLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="uploadSpeedLabel.text"/>
-                <Property name="name" type="java.lang.String" value="uploadSpeedLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="20" y="20" width="140" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="downloadSpeedLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="downloadSpeedLabel.text"/>
-                <Property name="name" type="java.lang.String" value="downloadSpeedLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="20" y="60" width="140" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="uploadspeed">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="uploadspeed.text"/>
-                <Property name="name" type="java.lang.String" value="uploadspeed" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="speedKeyReleased"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="160" y="20" width="-1" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="downloadspeed">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="downloadspeed.text"/>
-                <Property name="name" type="java.lang.String" value="downloadspeed" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="speedKeyReleased"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="160" y="60" width="-1" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JComboBox" name="uploadkbps">
-              <Properties>
-                <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                  <StringArray count="2">
-                    <StringItem index="0" value="kbps"/>
-                    <StringItem index="1" value="kBps"/>
-                  </StringArray>
-                </Property>
-                <Property name="name" type="java.lang.String" value="uploadkbps" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="uploadkbpsActionPerformed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="240" y="20" width="-1" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JComboBox" name="downloadkbps">
-              <Properties>
-                <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                  <StringArray count="2">
-                    <StringItem index="0" value="kbps"/>
-                    <StringItem index="1" value="kBps"/>
-                  </StringArray>
-                </Property>
-                <Property name="name" type="java.lang.String" value="downloadkbps" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="downloadkbpsActionPerformed"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="240" y="60" width="-1" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="uploadUsageLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="uploadUsageLabel.text"/>
-                <Property name="name" type="java.lang.String" value="uploadUsageLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="330" y="20" width="-1" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="downloadUsageLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="downloadUsageLabel.text"/>
-                <Property name="name" type="java.lang.String" value="downloadUsageLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="330" y="60" width="-1" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="uploadgb">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="uploadgb.text"/>
-                <Property name="name" type="java.lang.String" value="uploadgb" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="monthKeyReleased"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="440" y="20" width="60" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="downloadgb">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="downloadgb.text"/>
-                <Property name="name" type="java.lang.String" value="downloadgb" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="keyReleased" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="monthKeyReleased"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="440" y="60" width="60" height="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="gbUploadLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="gbUploadLabel.text"/>
-                <Property name="name" type="java.lang.String" value="gbUploadLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="510" y="20" width="-1" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="gbDownloadLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="gbDownloadLabel.text"/>
-                <Property name="name" type="java.lang.String" value="gbDownloadLabel" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="510" y="60" width="-1" height="30"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JLabel" name="uploadDownloadExplanation">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="uploadDownloadExplanation.text"/>
-                <Property name="name" type="java.lang.String" value="uploadDownloadExplanation" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="20" y="100" width="520" height="70"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Container class="javax.swing.JPanel" name="updatesPanel">
-          <Properties>
-            <Property name="name" type="java.lang.String" value="updatesPanel" noResource="true"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Updates">
-                <Property name="tabTitle" type="java.lang.String" resourceKey="updatesPanel.TabConstraints.tabTitle"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="updateMethod" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <Component id="checkUpdates" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                                      <Component id="updateNow" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="40" pref="40" max="40" attributes="0"/>
-                              <Group type="103" groupAlignment="0" max="-2" attributes="0">
-                                  <Component id="updateInform" alignment="0" pref="377" max="32767" attributes="1"/>
-                                  <Component id="updateDownload" alignment="0" max="32767" attributes="1"/>
-                                  <Component id="updateDownloadRestart" alignment="0" max="32767" attributes="1"/>
-                              </Group>
-                          </Group>
-                      </Group>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace pref="339" max="32767" attributes="0"/>
-                      <Component id="advancedUpdateConfig" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="updateMethod" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="updateInform" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="updateDownload" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="updateDownloadRestart" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="checkUpdates" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="updateNow" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace pref="181" max="32767" attributes="0"/>
-                      <Component id="advancedUpdateConfig" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-          <SubComponents>
-            <Component class="javax.swing.JLabel" name="updateMethod">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="updateMethod.text"/>
-                <Property name="name" type="java.lang.String" value="updateMethod" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JRadioButton" name="updateInform">
-              <Properties>
-                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-                  <ComponentRef name="updateButtonGroup"/>
-                </Property>
-                <Property name="text" type="java.lang.String" resourceKey="updateInform.text"/>
-                <Property name="name" type="java.lang.String" value="updateInform" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JRadioButton" name="updateDownload">
-              <Properties>
-                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-                  <ComponentRef name="updateButtonGroup"/>
-                </Property>
-                <Property name="text" type="java.lang.String" resourceKey="updateDownload.text"/>
-                <Property name="name" type="java.lang.String" value="updateDownload" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JRadioButton" name="updateDownloadRestart">
-              <Properties>
-                <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
-                  <ComponentRef name="updateButtonGroup"/>
-                </Property>
-                <Property name="text" type="java.lang.String" resourceKey="updateDownloadRestart.text"/>
-                <Property name="name" type="java.lang.String" value="updateDownloadRestart" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JToggleButton" name="checkUpdates">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="checkUpdates.text"/>
-                <Property name="name" type="java.lang.String" value="checkUpdates" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="checkUpdatesActionPerformed"/>
-              </Events>
-            </Component>
-            <Component class="javax.swing.JToggleButton" name="updateNow">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="updateNow.text"/>
-                <Property name="name" type="java.lang.String" value="updateNow" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="updateNowActionPerformed"/>
-              </Events>
-            </Component>
-            <Component class="javax.swing.JToggleButton" name="advancedUpdateConfig">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="advancedUpdateConfig.text"/>
-                <Property name="name" type="java.lang.String" value="advancedUpdateConfig" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="advancedUpdateConfigActionPerformed"/>
-              </Events>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Container class="javax.swing.JPanel" name="tunnelPanel">
-          <Properties>
-            <Property name="name" type="java.lang.String" value="tunnelPanel" noResource="true"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Tunnels/Services">
-                <Property name="tabTitle" type="java.lang.String" resourceKey="tunnelPanel.TabConstraints.tabTitle"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="1" attributes="0">
-                          <Component id="tunnelsExplanation" alignment="0" pref="538" max="32767" attributes="0"/>
-                          <Component id="serverFrame" alignment="1" pref="538" max="32767" attributes="0"/>
-                          <Component id="clientTunnelLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="clientFrame" alignment="0" pref="538" max="32767" attributes="0"/>
-                          <Component id="serverTunnelLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace max="-2" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="clientTunnelLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="clientFrame" pref="119" max="32767" attributes="0"/>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="serverTunnelLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="serverFrame" pref="122" max="32767" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="tunnelsExplanation" min="-2" pref="45" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
-                  </Group>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-          <SubComponents>
-            <Container class="javax.swing.JScrollPane" name="clientFrame">
-              <Properties>
-                <Property name="name" type="java.lang.String" value="clientFrame" noResource="true"/>
-              </Properties>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JTable" name="clientTable">
-                  <Properties>
-                    <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-                      <Table columnCount="4" rowCount="0">
-                        <Column editable="true" title="Name" type="java.lang.Object"/>
-                        <Column editable="true" title="Type" type="java.lang.Object"/>
-                        <Column editable="true" title="Address" type="java.lang.Object"/>
-                        <Column editable="true" title="Status" type="java.lang.Object"/>
-                      </Table>
-                    </Property>
-                    <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
-                      <TableColumnModel selectionModel="0">
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="clientTable.columnModel.title0"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="clientTable.columnModel.title1"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="clientTable.columnModel.title2"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="clientTable.columnModel.title3"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                      </TableColumnModel>
-                    </Property>
-                    <Property name="name" type="java.lang.String" value="clientTable" noResource="true"/>
-                    <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
-                      <TableHeader reorderingAllowed="true" resizingAllowed="true"/>
-                    </Property>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="clientTableMouseClicked"/>
-                  </Events>
-                </Component>
-              </SubComponents>
-            </Container>
-            <Container class="javax.swing.JScrollPane" name="serverFrame">
-              <Properties>
-                <Property name="name" type="java.lang.String" value="serverFrame" noResource="true"/>
-              </Properties>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Component class="javax.swing.JTable" name="serverTable">
-                  <Properties>
-                    <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-                      <Table columnCount="3" rowCount="4">
-                        <Column editable="true" title="Name" type="java.lang.Object"/>
-                        <Column editable="true" title="Address" type="java.lang.Object"/>
-                        <Column editable="true" title="Status" type="java.lang.Object"/>
-                      </Table>
-                    </Property>
-                    <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
-                      <TableColumnModel selectionModel="0">
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="serverTable.columnModel.title0"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="serverTable.columnModel.title1"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
-                          <Title resourceKey="serverTable.columnModel.title2"/>
-                          <Editor/>
-                          <Renderer/>
-                        </Column>
-                      </TableColumnModel>
-                    </Property>
-                    <Property name="name" type="java.lang.String" value="serverTable" noResource="true"/>
-                    <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
-                      <TableHeader reorderingAllowed="true" resizingAllowed="true"/>
-                    </Property>
-                  </Properties>
-                  <Events>
-                    <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="serverTableMouseClicked"/>
-                  </Events>
-                </Component>
-              </SubComponents>
-            </Container>
-            <Component class="javax.swing.JLabel" name="tunnelsExplanation">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="tunnelsExplanation.text"/>
-                <Property name="name" type="java.lang.String" value="tunnelsExplanation" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="clientTunnelLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="clientTunnelLabel.text"/>
-                <Property name="name" type="java.lang.String" value="clientTunnelLabel" noResource="true"/>
-              </Properties>
-            </Component>
-            <Component class="javax.swing.JLabel" name="serverTunnelLabel">
-              <Properties>
-                <Property name="text" type="java.lang.String" resourceKey="serverTunnelLabel.text"/>
-                <Property name="name" type="java.lang.String" value="serverTunnelLabel" noResource="true"/>
-              </Properties>
-            </Component>
-          </SubComponents>
-        </Container>
-        <Container class="javax.swing.JPanel" name="networkPanel">
-          <Properties>
-            <Property name="name" type="java.lang.String" value="networkPanel" noResource="true"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Network">
-                <Property name="tabTitle" type="java.lang.String" resourceKey="networkPanel.TabConstraints.tabTitle"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="562" max="32767" attributes="0"/>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="388" max="32767" attributes="0"/>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-        </Container>
-        <Container class="javax.swing.JPanel" name="advancedPanel">
-          <Properties>
-            <Property name="name" type="java.lang.String" value="advancedPanel" noResource="true"/>
-          </Properties>
-          <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
-              <JTabbedPaneConstraints tabName="Advanced">
-                <Property name="tabTitle" type="java.lang.String" resourceKey="advancedPanel.TabConstraints.tabTitle"/>
-              </JTabbedPaneConstraints>
-            </Constraint>
-          </Constraints>
-
-          <Layout>
-            <DimensionLayout dim="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="562" max="32767" attributes="0"/>
-              </Group>
-            </DimensionLayout>
-            <DimensionLayout dim="1">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="388" max="32767" attributes="0"/>
-              </Group>
-            </DimensionLayout>
-          </Layout>
-        </Container>
-      </SubComponents>
-    </Container>
-  </SubComponents>
-</Form>
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/GeneralConfiguration.java
@@ -1,839 +0,0 @@
-/*
- * GeneralConfiguration.java
- *
- * Created on 10 april 2009, 19:04
- */
-
-package net.i2p.desktopgui.gui;
-
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import net.i2p.desktopgui.router.configuration.SpeedHelper;
-import javax.swing.JComboBox;
-import javax.swing.ButtonModel;
-import javax.swing.JTextField;
-import net.i2p.desktopgui.router.RouterHelper;
-import net.i2p.desktopgui.router.configuration.SpeedHandler;
-import net.i2p.desktopgui.router.configuration.UpdateHelper;
-import net.i2p.router.web.NewsFetcher;
-import net.i2p.desktopgui.router.configuration.UpdateHandler;
-import java.util.Date;
-import javax.swing.SwingWorker;
-import net.i2p.i2ptunnel.web.IndexBean;
-import javax.swing.table.DefaultTableModel;
-import java.awt.event.ActionListener;
-
-/**
- *
- * @author  mathias
- */
-public class GeneralConfiguration extends javax.swing.JFrame {
-
-    /** Creates new form GeneralConfiguration */
-    public GeneralConfiguration() {
-        initComponents();
-        extraInitComponents();
-        this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-        this.setLocationRelativeTo(null);
-        this.requestFocus();
-        this.setVisible(true);
-    }
-    
-    private void extraInitComponents() {
-        initSpeedTab();
-        initUpdateTab();
-        initTunnelTab();
-    }
-
-    private void initSpeedTab() {
-        try {
-            String inbound = SpeedHelper.getInboundBandwidth();
-            String outbound = SpeedHelper.getOutboundBandwidth();
-
-            initSpeeds("" + Integer.parseInt(inbound)*8, "" + Integer.parseInt(outbound)*8);
-            initUsage("" + Integer.parseInt(inbound), "" + Integer.parseInt(outbound));
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-            System.out.println("Exception noticed, probably running desktopgui in a debugger instead of along with I2P!?");
-            initSpeeds("100", "100");
-            initUsage("12", "12");
-        }
-    }
-
-    private void initUpdateTab() {
-        //Set update policy
-        String updatePolicy = UpdateHelper.getUpdatePolicy();
-        if(updatePolicy.equals(UpdateHelper.NOTIFY_UPDATE_POLICY)) {
-            updateButtonGroup.setSelected(updateInform.getModel(), true);
-        }
-        else if(updatePolicy.equals(UpdateHelper.DOWNLOAD_UPDATE_POLICY)) {
-            updateButtonGroup.setSelected(updateDownload.getModel(), true);
-        }
-        else if(updatePolicy.equals(UpdateHelper.INSTALL_UPDATE_POLICY)) {
-            updateButtonGroup.setSelected(updateDownloadRestart.getModel(), true);
-        }
-        else {
-            System.out.println("desktopgui: no updates for you!");
-        }
-
-        //Check if an update is available
-        //TODO: move this method out of the routerconsole so desktopgui doesn't depend on routerconsole!!!
-        if(NewsFetcher.getInstance(RouterHelper.getContext()).updateAvailable()) {
-            updateNow.setVisible(true);
-        }
-        else {
-            updateNow.setVisible(false);
-        }
-    }
-
-    private void initTunnelTab() {
-        while(((DefaultTableModel) clientTable.getModel()).getRowCount() > 0) {
-            ((DefaultTableModel) clientTable.getModel()).removeRow(0);
-        }
-        while(((DefaultTableModel) serverTable.getModel()).getRowCount() > 0) {
-            ((DefaultTableModel) serverTable.getModel()).removeRow(0);
-        }
-        IndexBean bean = new IndexBean();
-        for(int i=0; i<bean.getTunnelCount(); i++) {
-            if(bean.isClient(i)) {
-                Object[] row = {bean.getTunnelName(i), bean.getTunnelType(i),
-                                bean.getClientInterface(i) + ":" + bean.getClientPort(i),
-                                getTunnelStatus(bean.getTunnelStatus(i))};
-                ((DefaultTableModel) clientTable.getModel()).addRow(row);
-            }
-            else {
-                Object[] row = {bean.getTunnelName(i),
-                                bean.getServerTarget(i),
-                                getTunnelStatus(bean.getTunnelStatus(i))};
-                ((DefaultTableModel) serverTable.getModel()).addRow(row);
-            }
-        }
-    }
-
-    public String getTunnelStatus(int status) {
-        if(status == IndexBean.NOT_RUNNING) {
-            return "Not running";
-        }
-        else if(status == IndexBean.RUNNING) {
-            return "Running";
-        }
-        else if(status == IndexBean.STANDBY) {
-            return "Standby";
-        }
-        else if(status == IndexBean.STARTING) {
-            return "Starting";
-        }
-        else {
-            return "Error: status not found";
-        }
-    }
-
-    /** This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        updateButtonGroup = new javax.swing.ButtonGroup();
-        applyPanel = new javax.swing.JPanel();
-        cancel = new javax.swing.JToggleButton();
-        ok = new javax.swing.JToggleButton();
-        settingsPanel = new javax.swing.JTabbedPane();
-        speedPanel = new javax.swing.JPanel();
-        uploadSpeedLabel = new javax.swing.JLabel();
-        downloadSpeedLabel = new javax.swing.JLabel();
-        uploadspeed = new javax.swing.JTextField();
-        downloadspeed = new javax.swing.JTextField();
-        uploadkbps = new javax.swing.JComboBox();
-        downloadkbps = new javax.swing.JComboBox();
-        uploadUsageLabel = new javax.swing.JLabel();
-        downloadUsageLabel = new javax.swing.JLabel();
-        uploadgb = new javax.swing.JTextField();
-        downloadgb = new javax.swing.JTextField();
-        gbUploadLabel = new javax.swing.JLabel();
-        gbDownloadLabel = new javax.swing.JLabel();
-        uploadDownloadExplanation = new javax.swing.JLabel();
-        updatesPanel = new javax.swing.JPanel();
-        updateMethod = new javax.swing.JLabel();
-        updateInform = new javax.swing.JRadioButton();
-        updateDownload = new javax.swing.JRadioButton();
-        updateDownloadRestart = new javax.swing.JRadioButton();
-        checkUpdates = new javax.swing.JToggleButton();
-        updateNow = new javax.swing.JToggleButton();
-        advancedUpdateConfig = new javax.swing.JToggleButton();
-        tunnelPanel = new javax.swing.JPanel();
-        clientFrame = new javax.swing.JScrollPane();
-        clientTable = new javax.swing.JTable();
-        serverFrame = new javax.swing.JScrollPane();
-        serverTable = new javax.swing.JTable();
-        tunnelsExplanation = new javax.swing.JLabel();
-        clientTunnelLabel = new javax.swing.JLabel();
-        serverTunnelLabel = new javax.swing.JLabel();
-        networkPanel = new javax.swing.JPanel();
-        advancedPanel = new javax.swing.JPanel();
-
-        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.i2p.desktopgui.desktopgui.Main.class).getContext().getResourceMap(GeneralConfiguration.class);
-        setTitle(resourceMap.getString("Form.title")); // NOI18N
-        setName("Form"); // NOI18N
-
-        applyPanel.setName("applyPanel"); // NOI18N
-
-        cancel.setText(resourceMap.getString("cancel.text")); // NOI18N
-        cancel.setName("cancel"); // NOI18N
-        cancel.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                cancelMouseClicked(evt);
-            }
-        });
-
-        ok.setText(resourceMap.getString("ok.text")); // NOI18N
-        ok.setName("ok"); // NOI18N
-        ok.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                okMouseClicked(evt);
-            }
-        });
-
-        javax.swing.GroupLayout applyPanelLayout = new javax.swing.GroupLayout(applyPanel);
-        applyPanel.setLayout(applyPanelLayout);
-        applyPanelLayout.setHorizontalGroup(
-            applyPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, applyPanelLayout.createSequentialGroup()
-                .addContainerGap(475, Short.MAX_VALUE)
-                .addComponent(ok)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(cancel)
-                .addContainerGap())
-        );
-        applyPanelLayout.setVerticalGroup(
-            applyPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(applyPanelLayout.createSequentialGroup()
-                .addGroup(applyPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(cancel)
-                    .addComponent(ok))
-                .addContainerGap(14, Short.MAX_VALUE))
-        );
-
-        settingsPanel.setName("settingsPanel"); // NOI18N
-
-        speedPanel.setName("speedPanel"); // NOI18N
-        speedPanel.setLayout(null);
-
-        uploadSpeedLabel.setText(resourceMap.getString("uploadSpeedLabel.text")); // NOI18N
-        uploadSpeedLabel.setName("uploadSpeedLabel"); // NOI18N
-        speedPanel.add(uploadSpeedLabel);
-        uploadSpeedLabel.setBounds(20, 20, 140, 30);
-
-        downloadSpeedLabel.setText(resourceMap.getString("downloadSpeedLabel.text")); // NOI18N
-        downloadSpeedLabel.setName("downloadSpeedLabel"); // NOI18N
-        speedPanel.add(downloadSpeedLabel);
-        downloadSpeedLabel.setBounds(20, 60, 140, 30);
-
-        uploadspeed.setText(resourceMap.getString("uploadspeed.text")); // NOI18N
-        uploadspeed.setName("uploadspeed"); // NOI18N
-        uploadspeed.addKeyListener(new java.awt.event.KeyAdapter() {
-            public void keyReleased(java.awt.event.KeyEvent evt) {
-                speedKeyReleased(evt);
-            }
-        });
-        speedPanel.add(uploadspeed);
-        uploadspeed.setBounds(160, 20, 77, 27);
-
-        downloadspeed.setText(resourceMap.getString("downloadspeed.text")); // NOI18N
-        downloadspeed.setName("downloadspeed"); // NOI18N
-        downloadspeed.addKeyListener(new java.awt.event.KeyAdapter() {
-            public void keyReleased(java.awt.event.KeyEvent evt) {
-                speedKeyReleased(evt);
-            }
-        });
-        speedPanel.add(downloadspeed);
-        downloadspeed.setBounds(160, 60, 77, 27);
-
-        uploadkbps.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "kbps", "kBps" }));
-        uploadkbps.setName("uploadkbps"); // NOI18N
-        uploadkbps.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                uploadkbpsActionPerformed(evt);
-            }
-        });
-        speedPanel.add(uploadkbps);
-        uploadkbps.setBounds(240, 20, 68, 27);
-
-        downloadkbps.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "kbps", "kBps" }));
-        downloadkbps.setName("downloadkbps"); // NOI18N
-        downloadkbps.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                downloadkbpsActionPerformed(evt);
-            }
-        });
-        speedPanel.add(downloadkbps);
-        downloadkbps.setBounds(240, 60, 68, 27);
-
-        uploadUsageLabel.setText(resourceMap.getString("uploadUsageLabel.text")); // NOI18N
-        uploadUsageLabel.setName("uploadUsageLabel"); // NOI18N
-        speedPanel.add(uploadUsageLabel);
-        uploadUsageLabel.setBounds(330, 20, 97, 30);
-
-        downloadUsageLabel.setText(resourceMap.getString("downloadUsageLabel.text")); // NOI18N
-        downloadUsageLabel.setName("downloadUsageLabel"); // NOI18N
-        speedPanel.add(downloadUsageLabel);
-        downloadUsageLabel.setBounds(330, 60, 97, 30);
-
-        uploadgb.setText(resourceMap.getString("uploadgb.text")); // NOI18N
-        uploadgb.setName("uploadgb"); // NOI18N
-        uploadgb.addKeyListener(new java.awt.event.KeyAdapter() {
-            public void keyReleased(java.awt.event.KeyEvent evt) {
-                monthKeyReleased(evt);
-            }
-        });
-        speedPanel.add(uploadgb);
-        uploadgb.setBounds(440, 20, 60, 27);
-
-        downloadgb.setText(resourceMap.getString("downloadgb.text")); // NOI18N
-        downloadgb.setName("downloadgb"); // NOI18N
-        downloadgb.addKeyListener(new java.awt.event.KeyAdapter() {
-            public void keyReleased(java.awt.event.KeyEvent evt) {
-                monthKeyReleased(evt);
-            }
-        });
-        speedPanel.add(downloadgb);
-        downloadgb.setBounds(440, 60, 60, 27);
-
-        gbUploadLabel.setText(resourceMap.getString("gbUploadLabel.text")); // NOI18N
-        gbUploadLabel.setName("gbUploadLabel"); // NOI18N
-        speedPanel.add(gbUploadLabel);
-        gbUploadLabel.setBounds(510, 20, 19, 30);
-
-        gbDownloadLabel.setText(resourceMap.getString("gbDownloadLabel.text")); // NOI18N
-        gbDownloadLabel.setName("gbDownloadLabel"); // NOI18N
-        speedPanel.add(gbDownloadLabel);
-        gbDownloadLabel.setBounds(510, 60, 19, 30);
-
-        uploadDownloadExplanation.setText(resourceMap.getString("uploadDownloadExplanation.text")); // NOI18N
-        uploadDownloadExplanation.setName("uploadDownloadExplanation"); // NOI18N
-        speedPanel.add(uploadDownloadExplanation);
-        uploadDownloadExplanation.setBounds(20, 100, 520, 70);
-
-        settingsPanel.addTab(resourceMap.getString("speedPanel.TabConstraints.tabTitle"), speedPanel); // NOI18N
-
-        updatesPanel.setName("updatesPanel"); // NOI18N
-
-        updateMethod.setText(resourceMap.getString("updateMethod.text")); // NOI18N
-        updateMethod.setName("updateMethod"); // NOI18N
-
-        updateButtonGroup.add(updateInform);
-        updateInform.setText(resourceMap.getString("updateInform.text")); // NOI18N
-        updateInform.setName("updateInform"); // NOI18N
-
-        updateButtonGroup.add(updateDownload);
-        updateDownload.setText(resourceMap.getString("updateDownload.text")); // NOI18N
-        updateDownload.setName("updateDownload"); // NOI18N
-
-        updateButtonGroup.add(updateDownloadRestart);
-        updateDownloadRestart.setText(resourceMap.getString("updateDownloadRestart.text")); // NOI18N
-        updateDownloadRestart.setName("updateDownloadRestart"); // NOI18N
-
-        checkUpdates.setText(resourceMap.getString("checkUpdates.text")); // NOI18N
-        checkUpdates.setName("checkUpdates"); // NOI18N
-        checkUpdates.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                checkUpdatesActionPerformed(evt);
-            }
-        });
-
-        updateNow.setText(resourceMap.getString("updateNow.text")); // NOI18N
-        updateNow.setName("updateNow"); // NOI18N
-        updateNow.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                updateNowActionPerformed(evt);
-            }
-        });
-
-        advancedUpdateConfig.setText(resourceMap.getString("advancedUpdateConfig.text")); // NOI18N
-        advancedUpdateConfig.setName("advancedUpdateConfig"); // NOI18N
-        advancedUpdateConfig.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                advancedUpdateConfigActionPerformed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout updatesPanelLayout = new javax.swing.GroupLayout(updatesPanel);
-        updatesPanel.setLayout(updatesPanelLayout);
-        updatesPanelLayout.setHorizontalGroup(
-            updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(updatesPanelLayout.createSequentialGroup()
-                .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(updatesPanelLayout.createSequentialGroup()
-                        .addGap(20, 20, 20)
-                        .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(updateMethod)
-                            .addGroup(updatesPanelLayout.createSequentialGroup()
-                                .addComponent(checkUpdates)
-                                .addGap(18, 18, 18)
-                                .addComponent(updateNow))))
-                    .addGroup(updatesPanelLayout.createSequentialGroup()
-                        .addGap(40, 40, 40)
-                        .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                            .addComponent(updateInform, javax.swing.GroupLayout.DEFAULT_SIZE, 377, Short.MAX_VALUE)
-                            .addComponent(updateDownload, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addComponent(updateDownloadRestart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                .addContainerGap())
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, updatesPanelLayout.createSequentialGroup()
-                .addContainerGap(339, Short.MAX_VALUE)
-                .addComponent(advancedUpdateConfig)
-                .addContainerGap())
-        );
-        updatesPanelLayout.setVerticalGroup(
-            updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(updatesPanelLayout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(updateMethod)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(updateInform)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(updateDownload)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(updateDownloadRestart)
-                .addGap(18, 18, 18)
-                .addGroup(updatesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(checkUpdates)
-                    .addComponent(updateNow))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 181, Short.MAX_VALUE)
-                .addComponent(advancedUpdateConfig)
-                .addContainerGap())
-        );
-
-        settingsPanel.addTab(resourceMap.getString("updatesPanel.TabConstraints.tabTitle"), updatesPanel); // NOI18N
-
-        tunnelPanel.setName("tunnelPanel"); // NOI18N
-
-        clientFrame.setName("clientFrame"); // NOI18N
-
-        clientTable.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
-
-            },
-            new String [] {
-                "Name", "Type", "Address", "Status"
-            }
-        ));
-        clientTable.setName("clientTable"); // NOI18N
-        clientTable.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                clientTableMouseClicked(evt);
-            }
-        });
-        clientFrame.setViewportView(clientTable);
-        clientTable.getColumnModel().getColumn(0).setHeaderValue(resourceMap.getString("clientTable.columnModel.title0")); // NOI18N
-        clientTable.getColumnModel().getColumn(1).setHeaderValue(resourceMap.getString("clientTable.columnModel.title1")); // NOI18N
-        clientTable.getColumnModel().getColumn(2).setHeaderValue(resourceMap.getString("clientTable.columnModel.title2")); // NOI18N
-        clientTable.getColumnModel().getColumn(3).setHeaderValue(resourceMap.getString("clientTable.columnModel.title3")); // NOI18N
-
-        serverFrame.setName("serverFrame"); // NOI18N
-
-        serverTable.setModel(new javax.swing.table.DefaultTableModel(
-            new Object [][] {
-                {null, null, null},
-                {null, null, null},
-                {null, null, null},
-                {null, null, null}
-            },
-            new String [] {
-                "Name", "Address", "Status"
-            }
-        ));
-        serverTable.setName("serverTable"); // NOI18N
-        serverTable.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                serverTableMouseClicked(evt);
-            }
-        });
-        serverFrame.setViewportView(serverTable);
-        serverTable.getColumnModel().getColumn(0).setHeaderValue(resourceMap.getString("serverTable.columnModel.title0")); // NOI18N
-        serverTable.getColumnModel().getColumn(1).setHeaderValue(resourceMap.getString("serverTable.columnModel.title1")); // NOI18N
-        serverTable.getColumnModel().getColumn(2).setHeaderValue(resourceMap.getString("serverTable.columnModel.title2")); // NOI18N
-
-        tunnelsExplanation.setText(resourceMap.getString("tunnelsExplanation.text")); // NOI18N
-        tunnelsExplanation.setName("tunnelsExplanation"); // NOI18N
-
-        clientTunnelLabel.setText(resourceMap.getString("clientTunnelLabel.text")); // NOI18N
-        clientTunnelLabel.setName("clientTunnelLabel"); // NOI18N
-
-        serverTunnelLabel.setText(resourceMap.getString("serverTunnelLabel.text")); // NOI18N
-        serverTunnelLabel.setName("serverTunnelLabel"); // NOI18N
-
-        javax.swing.GroupLayout tunnelPanelLayout = new javax.swing.GroupLayout(tunnelPanel);
-        tunnelPanel.setLayout(tunnelPanelLayout);
-        tunnelPanelLayout.setHorizontalGroup(
-            tunnelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, tunnelPanelLayout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(tunnelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(tunnelsExplanation, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
-                    .addComponent(serverFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
-                    .addComponent(clientTunnelLabel, javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(clientFrame, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
-                    .addComponent(serverTunnelLabel, javax.swing.GroupLayout.Alignment.LEADING))
-                .addContainerGap())
-        );
-        tunnelPanelLayout.setVerticalGroup(
-            tunnelPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(tunnelPanelLayout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(clientTunnelLabel)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(clientFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(serverTunnelLabel)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(serverFrame, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(tunnelsExplanation, javax.swing.GroupLayout.PREFERRED_SIZE, 45, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(32, 32, 32))
-        );
-
-        settingsPanel.addTab(resourceMap.getString("tunnelPanel.TabConstraints.tabTitle"), tunnelPanel); // NOI18N
-
-        networkPanel.setName("networkPanel"); // NOI18N
-
-        javax.swing.GroupLayout networkPanelLayout = new javax.swing.GroupLayout(networkPanel);
-        networkPanel.setLayout(networkPanelLayout);
-        networkPanelLayout.setHorizontalGroup(
-            networkPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 562, Short.MAX_VALUE)
-        );
-        networkPanelLayout.setVerticalGroup(
-            networkPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 388, Short.MAX_VALUE)
-        );
-
-        settingsPanel.addTab(resourceMap.getString("networkPanel.TabConstraints.tabTitle"), networkPanel); // NOI18N
-
-        advancedPanel.setName("advancedPanel"); // NOI18N
-
-        javax.swing.GroupLayout advancedPanelLayout = new javax.swing.GroupLayout(advancedPanel);
-        advancedPanel.setLayout(advancedPanelLayout);
-        advancedPanelLayout.setHorizontalGroup(
-            advancedPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 562, Short.MAX_VALUE)
-        );
-        advancedPanelLayout.setVerticalGroup(
-            advancedPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 388, Short.MAX_VALUE)
-        );
-
-        settingsPanel.addTab(resourceMap.getString("advancedPanel.TabConstraints.tabTitle"), advancedPanel); // NOI18N
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(applyPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(12, 12, 12)
-                .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 566, Short.MAX_VALUE))
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addComponent(settingsPanel)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(applyPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-        );
-
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void speedKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_speedKeyReleased
-    try {
-        String upload = "";
-        if(uploadkbps.getSelectedIndex() == KILOBIT)
-            upload = "" + Integer.parseInt(uploadspeed.getText())/8;
-        else
-            upload = uploadspeed.getText();
-        String download = "";
-        if(downloadkbps.getSelectedIndex() == KILOBIT)
-            download = "" + Integer.parseInt(downloadspeed.getText())/8;
-        else
-            download = downloadspeed.getText();
-        initUsage(upload, download);
-    }
-    catch(NumberFormatException e) {
-        e.printStackTrace();
-        return;
-    }
-}//GEN-LAST:event_speedKeyReleased
-
-private void uploadkbpsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_uploadkbpsActionPerformed
-    kbpsSwitchPerformed(uploadkbps, uploadspeed);
-}//GEN-LAST:event_uploadkbpsActionPerformed
-
-private void downloadkbpsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_downloadkbpsActionPerformed
-    kbpsSwitchPerformed(downloadkbps, downloadspeed);
-}//GEN-LAST:event_downloadkbpsActionPerformed
-
-private void monthKeyReleased(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_monthKeyReleased
-    try {
-        int uploadMonthValue = Integer.parseInt(uploadgb.getText());
-        int downloadMonthValue = Integer.parseInt(downloadgb.getText());
-
-        String upload = "";
-        String burstUpload = "";
-        String download = "";
-        String burstDownload = "";
-
-        if(uploadkbps.getSelectedIndex() == KILOBIT)
-            upload = "" + SpeedHelper.calculateSpeed(uploadMonthValue)*8; //kbit
-        else
-            upload = "" + SpeedHelper.calculateSpeed(uploadMonthValue); //kbyte
-
-        if(downloadkbps.getSelectedIndex() == KILOBIT)
-            download = "" + SpeedHelper.calculateSpeed(downloadMonthValue)*8; //kbit
-        else
-            download = "" + SpeedHelper.calculateSpeed(downloadMonthValue); //kbyte
-
-        initSpeeds(upload, download);
-    }
-    catch(NumberFormatException e) {
-        e.printStackTrace();
-        return;
-    }
-}//GEN-LAST:event_monthKeyReleased
-
-private void cancelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelMouseClicked
-    this.dispose();
-}//GEN-LAST:event_cancelMouseClicked
-
-private void okMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_okMouseClicked
-    saveSpeeds();
-    saveUpdatePolicy();
-    this.dispose();
-}//GEN-LAST:event_okMouseClicked
-
-private void checkUpdatesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkUpdatesActionPerformed
-    long current = new Date().getTime();
-    if(current < newsLastFetched + 5*60*1000) {
-        return;
-    }
-    checkUpdates.setText("Checking for updates");
-    checkUpdates.setEnabled(false);
-    newsLastFetched = current;
-    SwingWorker sw = new SwingWorker() {
-
-            @Override
-            protected Object doInBackground() throws Exception {
-                NewsFetcher.getInstance(RouterHelper.getContext()).fetchNews();
-                return null;
-            }
-
-            @Override
-            protected void done() {
-                checkUpdates.setText("Check for updates now");
-                checkUpdates.setEnabled(true);
-                if(NewsFetcher.getInstance(RouterHelper.getContext()).updateAvailable()) {
-                    updateNow.setVisible(true);
-                }
-            }
-
-    };
-}//GEN-LAST:event_checkUpdatesActionPerformed
-
-private void updateNowActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_updateNowActionPerformed
-    SwingWorker sw = new SwingWorker() {
-
-            @Override
-            protected Object doInBackground() throws Exception {
-                new net.i2p.router.web.UpdateHandler().update();
-                return null;
-            }
-        
-    };
-    updateNow.setEnabled(false);
-    updateNow.setText("Updating...");
-    checkUpdates.setEnabled(false);
-
-}//GEN-LAST:event_updateNowActionPerformed
-
-private void advancedUpdateConfigActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_advancedUpdateConfigActionPerformed
-    try {
-        Desktop.getDesktop().browse(new URI("http://127.0.0.1:7657/configupdate.jsp"));
-    } catch (URISyntaxException ex) {
-        Logger.getLogger(GeneralConfiguration.class.getName()).log(Level.SEVERE, null, ex);
-    }
-    catch (IOException ex) {
-            Logger.getLogger(GeneralConfiguration.class.getName()).log(Level.SEVERE, null, ex);
-    }
-}//GEN-LAST:event_advancedUpdateConfigActionPerformed
-
-private void clientTableMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_clientTableMouseClicked
-    int row = clientTable.getSelectedRow();
-    if(row == -1) { //No selected row
-        return;
-    }
-    else {
-        IndexBean bean = new IndexBean();
-        /*
-         * TODO: This is not entirely good: if one adds/removes a tunnel without desktopgui, this number will be wrong
-         */
-        int clientNumber = 0;
-        int i = 0;
-        for(clientNumber=0; clientNumber<bean.getTunnelCount(); clientNumber++) {
-            if(bean.isClient(clientNumber)) {
-                if(i == row) {
-                    break;
-                }
-                i++;
-            }
-        }
-        new ClientTunnelWindow(clientNumber, new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    initTunnelTab();
-                }
-            
-        });
-    }
-}//GEN-LAST:event_clientTableMouseClicked
-
-private void serverTableMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_serverTableMouseClicked
-    int row = serverTable.getSelectedRow();
-    if(row == -1) { //No selected row
-        return;
-    }
-    else {
-        IndexBean bean = new IndexBean();
-        /*
-         * TODO: This is not entirely good: if one adds/removes a tunnel without desktopgui, this number will be wrong
-         */
-        int serverNumber = 0;
-        int i = 0;
-        for(serverNumber=0; serverNumber<bean.getTunnelCount(); serverNumber++) {
-            if(!bean.isClient(serverNumber)) {
-                if(i == row) {
-                    break;
-                }
-                i++;
-            }
-        }
-        new ServerTunnelWindow(serverNumber, new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    initTunnelTab();
-                }
-
-        });
-    }
-}//GEN-LAST:event_serverTableMouseClicked
-
-    protected void initUsage(String upload, String download) {
-        uploadgb.setText("" + SpeedHelper.calculateMonthlyUsage(Integer.parseInt(upload)));
-        downloadgb.setText("" + SpeedHelper.calculateMonthlyUsage(Integer.parseInt(download)));
-    }
-
-    protected void initSpeeds(String upload, String download) {
-        uploadspeed.setText(upload);
-        downloadspeed.setText(download);
-    }
-
-    private void kbpsSwitchPerformed(JComboBox kbps, JTextField speed) {
-        int index = kbps.getSelectedIndex();
-        int previous = Integer.parseInt(speed.getText());
-        if(index == KILOBIT) {
-            speed.setText("" + previous*8);
-        }
-        else {
-            speed.setText("" + previous/8);
-        }
-    }
-
-    protected void saveSpeeds() {
-        int maxDownload = Integer.parseInt(downloadspeed.getText());
-        int maxUpload = Integer.parseInt(uploadspeed.getText());
-        if(uploadkbps.getSelectedIndex() == KILOBIT) {
-            SpeedHandler.setOutboundBandwidth(maxUpload/8);
-            SpeedHandler.setOutboundBurstBandwidth(maxUpload/8);
-        }
-        else {
-            SpeedHandler.setOutboundBandwidth(maxUpload);
-            SpeedHandler.setOutboundBurstBandwidth(maxUpload);
-        }
-        if(downloadkbps.getSelectedIndex() == KILOBIT) {
-            SpeedHandler.setInboundBandwidth(maxDownload/8);
-            SpeedHandler.setInboundBurstBandwidth(maxDownload/8);
-        }
-        else {
-            SpeedHandler.setInboundBandwidth(maxDownload);
-            SpeedHandler.setInboundBurstBandwidth(maxDownload);
-        }
-    }
-
-    protected void saveUpdatePolicy() {
-        ButtonModel policyButton = updateButtonGroup.getSelection();
-        if(policyButton.equals(updateInform.getModel())) {
-            UpdateHandler.setUpdatePolicy(UpdateHelper.NOTIFY_UPDATE_POLICY);
-        }
-        else if(policyButton.equals(updateDownload.getModel())) {
-            UpdateHandler.setUpdatePolicy(UpdateHelper.DOWNLOAD_UPDATE_POLICY);
-        }
-        else if(policyButton.equals(updateDownloadRestart.getModel())) {
-            UpdateHandler.setUpdatePolicy(UpdateHelper.INSTALL_UPDATE_POLICY);
-        }
-    }
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel advancedPanel;
-    private javax.swing.JToggleButton advancedUpdateConfig;
-    private javax.swing.JPanel applyPanel;
-    private javax.swing.JToggleButton cancel;
-    private javax.swing.JToggleButton checkUpdates;
-    private javax.swing.JScrollPane clientFrame;
-    private javax.swing.JTable clientTable;
-    private javax.swing.JLabel clientTunnelLabel;
-    private javax.swing.JLabel downloadSpeedLabel;
-    private javax.swing.JLabel downloadUsageLabel;
-    private javax.swing.JTextField downloadgb;
-    private javax.swing.JComboBox downloadkbps;
-    private javax.swing.JTextField downloadspeed;
-    private javax.swing.JLabel gbDownloadLabel;
-    private javax.swing.JLabel gbUploadLabel;
-    private javax.swing.JPanel networkPanel;
-    private javax.swing.JToggleButton ok;
-    private javax.swing.JScrollPane serverFrame;
-    private javax.swing.JTable serverTable;
-    private javax.swing.JLabel serverTunnelLabel;
-    private javax.swing.JTabbedPane settingsPanel;
-    private javax.swing.JPanel speedPanel;
-    private javax.swing.JPanel tunnelPanel;
-    private javax.swing.JLabel tunnelsExplanation;
-    private javax.swing.ButtonGroup updateButtonGroup;
-    private javax.swing.JRadioButton updateDownload;
-    private javax.swing.JRadioButton updateDownloadRestart;
-    private javax.swing.JRadioButton updateInform;
-    private javax.swing.JLabel updateMethod;
-    private javax.swing.JToggleButton updateNow;
-    private javax.swing.JPanel updatesPanel;
-    private javax.swing.JLabel uploadDownloadExplanation;
-    private javax.swing.JLabel uploadSpeedLabel;
-    private javax.swing.JLabel uploadUsageLabel;
-    private javax.swing.JTextField uploadgb;
-    private javax.swing.JComboBox uploadkbps;
-    private javax.swing.JTextField uploadspeed;
-    // End of variables declaration//GEN-END:variables
-
-    public static final int KILOBIT = 0;
-    public static final int KILOBYTE = 1;
-
-    private long newsLastFetched = 0;
-}
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/JPopupTrayIcon.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/JPopupTrayIcon.java
@@ -1,185 +0,0 @@
-/*
-* Created on Sep 15, 2008  5:51:33 PM
-*/
-
-/*
- * This class is part of fishfarm project: https://fishfarm.dev.java.net/
- * It is licensed under the GPL version 2.0 with Classpath Exception.
- * 
- * Copyright (C) 2008  Michael Bien
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- * 
- */
-
-package net.i2p.desktopgui.gui;
-
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.PopupMenu;
-import java.awt.TrayIcon;
-import java.awt.Window;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JDialog;
-import javax.swing.JPopupMenu;
-import javax.swing.JWindow;
-import javax.swing.RootPaneContainer;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import java.util.Date;
-
-
-
-/**
- * JPopupMenu compatible TrayIcon based on Alexander Potochkin's JXTrayIcon
- * (http://weblogs.java.net/blog/alexfromsun/archive/2008/02/jtrayicon_updat.html)
- * but uses a JWindow instead of a JDialog to workaround some bugs on linux.
- *
- * @author Michael Bien
- */
-public class JPopupTrayIcon extends TrayIcon {
-
-    private JPopupMenu menu;
-    
-    private Window window;
-    private PopupMenuListener popupListener;
-    
-    private final static boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().contains("windows");
-
-    private static MouseEvent previous = null;
-    private static Date previousTime = new Date();
-    private static Date time = new Date();
-
-    public JPopupTrayIcon(Image image) {
-        super(image);
-        init();
-    }
-
-    public JPopupTrayIcon(Image image, String tooltip) {
-        super(image, tooltip);
-        init();
-    }
-
-    public JPopupTrayIcon(Image image, String tooltip, PopupMenu popup) {
-        super(image, tooltip, popup);
-        init();
-    }
-
-    public JPopupTrayIcon(Image image, String tooltip, JPopupMenu popup) {
-        super(image, tooltip);
-        init();
-        setJPopupMenu(popup);
-    }
-
-
-    private final void init() {
-
-
-        popupListener = new PopupMenuListener() {
-
-            @Override
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                //System.out.println("popupMenuWillBecomeVisible");
-            }
-
-            @Override
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-                //System.out.println("popupMenuWillBecomeInvisible");
-                if(window != null) {
-                    window.dispose();
-                    window = null;
-                }
-            }
-
-            @Override
-            public void popupMenuCanceled(PopupMenuEvent e) {
-//                System.out.println("popupMenuCanceled");
-                if(window != null) {
-                    window.dispose();
-                    window = null;
-                }
-            }
-        };
-
-        addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                //System.out.println("Pressed " + e.getPoint());
-                showJPopupMenu(e, previous);
-                previous = e;
-                previousTime = time;
-                time = new Date();
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                //System.out.println("Released " + e.getPoint());
-                showJPopupMenu(e, previous);
-                previous = e;
-                previousTime = time;
-                time = new Date();
-            }
-        });
-
-    }
-
-    private final void showJPopupMenu(MouseEvent e, MouseEvent previous) {
-        if((e.isPopupTrigger() || previous.isPopupTrigger()) && (time.getTime() - previousTime.getTime() < 1000) && menu != null) {
-            if (window == null) {
-
-                if(IS_WINDOWS) {
-                    window = new JDialog((Frame)null);
-                    ((JDialog)window).setUndecorated(true);
-                }else{
-                    window = new JWindow((Frame)null);
-                }
-                window.setAlwaysOnTop(true);
-                Dimension size = menu.getPreferredSize();
-
-                Point centerPoint = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint();
-                if(e.getY() > centerPoint.getY())
-                    window.setLocation(e.getX(), e.getY() - size.height);
-                else
-                    window.setLocation(e.getX(), e.getY());
-
-                window.setVisible(true);
-                
-                menu.show(((RootPaneContainer)window).getContentPane(), 0, 0);
-
-                // popup works only for focused windows
-                window.toFront();
-
-            }
-        }
-    }
-
-
-    public final JPopupMenu getJPopupMenu() {
-        return menu;
-    }
-
-    public final void setJPopupMenu(JPopupMenu menu) {
-        if (this.menu != null) {
-            this.menu.removePopupMenuListener(popupListener);
-        }
-        this.menu = menu;
-        menu.addPopupMenuListener(popupListener);
-    }
-
-}
--- a/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.form
+++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/LogViewer.form
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.6" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
-  <Properties>
-    <Property name="defaultCloseOperation" type="int" value="3"/>
-    <Property name="title" type="java.lang.String" resourceKey="Form.title"/>
-    <Property name="name" type="java.lang.String" value="Form" noResource="true"/>
-  </Properties>
-  <SyntheticProperties>
-    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
-  </SyntheticProperties>
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="12" pref="12" max="12" attributes="0"/>
-              <Component id="explanationText" min="-2" pref="561" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
-          </Group>
-          <Component id="textScroll" alignment="1" pref="722" max="32767" attributes="0"/>
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="refreshButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Component id="clearButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="587" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="explanationText" min="-2" pref="45" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="refreshButton" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="clearButton" alignment="3" min="-2" max="-2" attributes="0"/>
-              </Group>
-              <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
-              <Component id="textScroll" pref="330" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Container class="javax.swing.JScrollPane" name="textScroll">
-      <Properties>
-        <Property name="name" type="java.lang.String" value="textScroll" noResource="true"/>
-      </Properties>
-      <AuxValues>
-        <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-      </AuxValues>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-      <SubComponents>
-        <Component class="javax.swing.JTextArea" name="logText">
-          <Properties>
-            <Property name="columns" type="int" value="20"/>
-            <Property name="rows" type="int" value="5"/>
-            <Property name="name" type="java.lang.String" value="logText" noResource="true"/>
-          </Properties>
-        </Component>
-      </SubComponents>
-    </Container>
-    <Component class="javax.swing.JLabel" name="explanationText">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="explanationText.text"/>
-        <Property name="name" type="java.lang.String" value="explanationText" noResource="true"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JButton" name="refreshButton">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="refreshButton.text"/>
-        <Property name="name" type="java.lang.String" value="refreshButton" noResource="true"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="refreshButtonActionPerformed"/>
-      </Events>
-    </Component>
-    <Component class="javax.swing.JButton" name="clearButton">
-      <Properties>
-        <Property name="text" type="java.lang.String" resourceKey="clearButton.text"/>
-        <Property name="name" type="java.lang.String" value="clearButton" noResource="true"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="clearButtonActionPerformed"/>
-      </Events>
-    </Component>
-  </SubComponents>
-</Form>
--- a/Show More
+++ b/Show More