- Adjust default configs, esp. ones on the settings page

- Update release notes
- Lower log levels
- Spelling fixes on settings page

.tx/config

@@ -1,67 +0,0 @@
-[I2P.i2ptunnel]
-source_file = apps/i2ptunnel/locale/messages_en.po
-source_lang = en
-trans.ar = apps/i2ptunnel/locale/messages_ar.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.nl = apps/i2ptunnel/locale/messages_nl.po
-trans.ru = apps/i2ptunnel/locale/messages_ru.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.de = apps/routerconsole/locale/messages_de.po
-trans.es = apps/routerconsole/locale/messages_es.po
-trans.fr = apps/routerconsole/locale/messages_fr.po
-trans.nl = apps/routerconsole/locale/messages_nl.po
-trans.ru = apps/routerconsole/locale/messages_ru.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.de = apps/i2psnark/locale/messages_de.po
-trans.es = apps/i2psnark/locale/messages_es.po
-trans.fr = apps/i2psnark/locale/messages_fr.po
-trans.nl = apps/i2psnark/locale/messages_nl.po
-trans.pt = apps/i2psnark/locale/messages_pt.po
-trans.ru = apps/i2psnark/locale/messages_ru.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.de = apps/susidns/locale/messages_de.po
-trans.es = apps/susidns/locale/messages_es.po
-trans.fr = apps/susidns/locale/messages_fr.po
-trans.nl = apps/susidns/locale/messages_nl.po
-trans.ru = apps/susidns/locale/messages_ru.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.de = apps/desktopgui/locale/messages_de.po
-trans.es = apps/desktopgui/locale/messages_es.po
-trans.fr = apps/desktopgui/locale/messages_fr.po
-trans.nl = apps/desktopgui/locale/messages_nl.po
-trans.ru = apps/desktopgui/locale/messages_ru.po
-trans.zh_CN = apps/desktopgui/locale/messages_zh.po
-
-[I2P.susimail]
-source_file = apps/susimail/locale/messages_en.po
-source_lang = en
-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.nl = apps/susimail/locale/messages_nl.po
-
-[main]
-host = http://www.transifex.net
-

AndroidManifest.xml.in

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="net.i2p.android.router"
+      android.versionCode="0"
+      android.versionName="0.0.0-0_b0-API8"
+      android:installLocation="auto"
+      >
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application android:label="@string/app_name"
+               android:icon="@drawable/ic_launcher_itoopie" >
+        <service android:name=".service.RouterService"
+                  android:label="@string/app_name"
+                  android:icon="@drawable/ic_launcher_itoopie" />
+        <provider android:name=".provider.CacheProvider"
+                  android:authorities="net.i2p.android.router" />
+        <activity android:name=".activity.MainActivity"
+                  android:label="@string/app_name"
+                  android:icon="@drawable/ic_launcher_itoopie"
+                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".activity.NewsActivity"
+                  android:label="I2P News"
+                  android:configChanges="orientation|keyboardHidden"
+                  android.theme="@android:style/Theme.NoTitleBar" >
+        </activity>
+        <activity android:name=".activity.TextResourceActivity"
+                  android:label="I2P Information"
+                  android.theme="@android:style/Theme.NoTitleBar" >
+        </activity>
+        <activity android:name=".activity.LicenseActivity"
+                  android:label="I2P License Information"
+                  android.theme="@android:style/Theme.NoTitleBar" >
+        </activity>
+        <activity android:name=".activity.WebActivity"
+                  android:label="I2P Web Browser"
+                  android:configChanges="orientation|keyboardHidden"
+                  android.theme="@android:style/Theme.NoTitleBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="*.i2p" android:scheme="http" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".activity.SettingsActivity"
+                  android:label="I2P Settings"
+                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.AddressbookSettingsActivity"
+                  android:label="I2P Addressbook Settings"
+                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.AddressbookActivity"
+                  android:label="I2P Address Book"
+                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:launchMode="singleTop" >
+        </activity>
+        <activity android:name=".activity.LogActivity"
+                  android:label="I2P Logs"
+                  android.theme="@android:style/Theme.NoTitleBar" >
+        </activity>
+        <activity android:name=".activity.PeersActivity"
+                  android:label="I2P Peers and Transport Status"
+                  android:configChanges="orientation|keyboardHidden"
+                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:launchMode="singleTop" >
+        </activity>
+    </application>
+</manifest>

INSTALL-headless.txt

@@ -1,45 +0,0 @@
-Headless I2P installation instructions
-
-1) java -jar i2pinstall.exe -console       (you've already done this)
-
-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
-you may use:
-  lynx http://localhost:7657/index.jsp
-to configure the router.
-
-If you're having trouble, swing by http://forum.i2p2.de/, 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
-~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
-when I2P is run for the first time. It also creates files in the system
-temporary directory specified by the Java Virtual Machine.
-To change the location of these directories, or to configure I2P to
-put all files in this directory (the so-called "portable" configuration),
-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:
-   (*nix): sh i2prouter start
-   (win*): I2P.exe
-   (Platforms unsupported by the wrapper - PPC, ARM, etc): sh runplain.sh
-
-To stop the router (gracefully):
-   lynx http://localhost:7657/configservice.jsp ("Shutdown gracefully")
-
-To stop the router (immediately):
-   sh i2prouter stop
-
-To uninstall I2P:
-   rm -rf $i2pInstallDir
-
-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)

INSTALL.txt

@@ -1,33 +0,0 @@
-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)
-	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/
-
-To build and install I2P from source, you must first build
-and package up the appropriate installer by running:
-
-  ant pkg
-
-
-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
-* i2pupdate.zip:  the update package
-
-From there, you can run the headless (console mode) installer:
-  java -jar i2pinstall.exe -console
-
-Or run the GUI installer:
-  java -jar i2pinstall.exe
-
-Or move the update file into an existing installation directory and restart.
-
-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)

LICENSE.txt

@@ -25,222 +25,26 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 
+===================================
 
-LICENSES
---------
+License for the Android App:
 
-Core:
-Public domain except as listed below:
+   Copyright 2011 The I2P Project
 
-   ElGamal and DSA code:
-   Copyright (c) 2003, TheCrypto
-   See licenses/LICENSE-ElGamalDSA.txt
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use these files except in compliance with the License.
+   You may obtain a copy of the License at
 
-   SHA256 and HMAC-SHA256:
-   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
-   See licenses/LICENSE-SHA256.txt
+       http://www.apache.org/licenses/LICENSE-2.0
 
-   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)
-
-   Crypto filters:
-   From the xlattice app - http://xlattice.sourceforge.net/
-   See licenses/LICENSE-BSD.txt
-
-   SNTP code:
-   Copyright (c) 2004, Adam Buckley
-   See licenses/LICENSE-SNTP.txt
-
-   PRNG:
-   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
-
-   GettextResource from gettext v0.18:
-   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
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 
-Router:
-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
-   See licenses/LICENSE-UPnP.txt
-
-   GeoIP data free to use, courtesy http://ip-to-country.webhosting.info/
+===================================
 
 
-Installer:
-   Launch4j 3.0.1:
-   Copyright (c) 2004, 2008 Grzegorz Kowal
-   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/)
-
-	Commons BeanUtils (http://jakarta.apache.org/commons/beanutils/)
-
- 	Commons Logging (http://jakarta.apache.org/commons/logging/)
-        See licenses/LICENSE-Apache1.1.txt
-        See licenses/NOTICE-Commons-Logging.txt
-
-	XStream (http://xstream.codehaus.org/)
-        Copyright (c) 2003-2004, Joe Walnes
-        See licenses/LICENSE-XStream.txt
-
-	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/)
-        Copyright (c) 2003 JGoodies Karsten Lentzsch. All rights reserved.
-        See licenses/LICENSE-JGoodies-Looks.txt
-
-	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)
-        See licenses/LICENSE-LGPLv2.1.txt
-
-	Forms were created using Abeille Forms Designer (https://abeille.dev.java.net/)
-
-   Izpack 4.3.0:
-   Copyright (c) 2001-2008 Julien Ponge
-   See licenses/LICENSE-Apache2.0.txt
-
-
-
-Wrapper 3.1.1:
-   Copyright (c) 1999, 2004 Tanuki Software
-   See licenses/LICENSE-Wrapper.txt
-
-
-
-Applications:
-
-   Addressbook:
-   Copyright (c) 2004 Ragnarok
-   See licenses/LICENSE-Addressbook.txt
-
-   BOB:
-   Copyright (C) sponge
-   DWTFYWTPL
-
-   I2PSnark:
-   Copyright (C) 2003 Mark J. Wielaard
-   See licenses/LICENSE-GPLv2.txt
-       Silk icons: See licenses/LICENSE-SilkIcons.txt
-
-   I2PTunnel:
-   (c) 2003 - 2004 mihi
-   GPLv2 with exception.
-   See licenses/LICENSE-I2PTunnel.txt
-   See licenses/LICENSE-GPLv2.txt
-
-   I2PTunnel SOCKS Proxy:
-   Copyright (c) 2004 by human
-   GPLv2 with exception.
-   See licenses/LICENSE-I2PTunnel.txt
-   See licenses/LICENSE-GPLv2.txt
-
-   I2PTunnel UDP and Streamr:
-   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
-   See licenses/LICENSE-Apache2.0.txt
-   See licenses/NOTICE-Commons-Logging.txt
-
-   JRobin 1.4.0:
-   See licenses/LICENSE-LGPLv2.1.txt
-
-   Ministreaming Lib:
-   By mihi.
-   See licenses/LICENSE-BSD.txt
-
-   Proxyscript:
-   By Cervantes.
-   Public domain.
-
-   Router console:
-   Public domain.
-       Flag icons: public domain, courtesy mjames@gmail.com http://www.famfamfam.com/
-       Silk icons: See licenses/LICENSE-SilkIcons.txt
-
-       GeoIP Data:
-       Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
-       See licenses/LICENSE-GeoIP.txt
-
-   SAM:
-   Public domain.
-
-   Streaming Lib:
-   Public domain.
-
-   SusiDNS:
-   Copyright (C) 2005 <susi23@mail.i2p>
-   See licenses/LICENSE-GPLv2.txt
-
-   SusiMail:
-   Copyright (C) 2004-2005  <susi23@mail.i2p>
-   See licenses/LICENSE-GPLv2.txt
-
-   Systray:
-   Public domain.
-      Bundles systray4j code:
-      See licenses/LICENSE-GPLv2.txt
-
-
-
-Other Applications and Libraries
---------------------------------
-The following applications and libraries are not used or bundled in
-binary packages, therefore the licenses are not included in binary
-distributions. See the source package for the additional license information.
-
-   Admin Manager:
-   Public domain
-
-   Atalk:
-   Public domain
-
-   Desktopgui
-   Copyright (c) Mathias De Maré
-   See apps/desktopgui/LICENSE
-
-   SAM C Library:
-   Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>
-   See apps/sam/c/doc/license.txt
-
-   SAM C# Library:
-   Public domain.
-   See apps/sam/csharp/README
-
-   SAM Perl Library:
-   See licenses/LICENSE-GPLv2.txt
-
-   SAM Python Library:
-   Public domain.
-   
-   I2PSnark/Console 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
+See the file licenses/LICENSE-Apache2.0.txt

Makefile.gcj

@@ -1,132 +0,0 @@
-# Makefile for building native I2P binaries and libraries with GCJ
-#
-# WARNING: Do not use this yet, as it may explode (etc).
-#
-GCJ=gcj #/usr/local/gcc-4.0.2/bin/gcj
-EXTRA_LD_PATH= #/usr/local/gcc-4.0.2/lib
-ANT=ant #/opt/apache-ant-1.6.5/bin/ant
-ANT_TARGET=build2
-NATIVE_DIR=native
-
-## 
-# Define what jar files get into libi2p.so.  The current setup is
-# *incredibly* lazy, throwing everything in the .so, rather than
-# give each .jar file its own .so.
-#  i2p.jar: base SDK
-#  mstreaming.jar: streaming API
-#  streaming.jar: full streaming lib implementation
-#  i2ptunnel.jar: I2PTunnel proxy
-#  sam.jar: SAM bridge and API
-#  i2psnark.jar: bittorrent client
-#  router.jar: full I2P router
-#  jbigi.jar: collection of native optimized GMP routines for crypto
-JAR_BASE=i2p.jar mstreaming.jar streaming.jar
-JAR_CLIENTS=i2ptunnel.jar sam.jar
-JAR_ROUTER=router.jar
-JAR_JBIGI=jbigi.jar
-JAR_CONSOLE=\
-            javax.servlet.jar \
-            commons-el.jar \
-            commons-logging.jar \
-	    jasper-runtime.jar \
-            jasper-compiler.jar \
-            org.mortbay.jetty.jar \
-	    routerconsole.jar
-LIBI2P_JARS=${JAR_BASE} ${JAR_CLIENTS} ${JAR_ROUTER} ${JAR_JBIGI}
-LIBSAM_JARS=${JAR_BASE} sam.jar
-LIBROUTER_JARS=i2p.jar ${JAR_ROUTER} ${JAR_JBIGI}
-LIBCONSOLE_JARS=${LIBROUTER_JARS} ${JAR_CONSOLE}
-LIBSNARK_JARS=${LIBROUTER_JARS} i2psnark.jar
-# update:
-# similar error with gcj 4.3.3.
-#
-# unfortunately, its not quite ready for most end users, as the
-# ${JAR_CONSOLE} fails to compile with: 
-# org/apache/commons/logging/impl/LogKitLogger.java: In class 'org.apache.commons.logging.impl.LogKitLogger':
-# .../LogKitLogger.java: In constructor '(java.lang.String)':
-# .../LogKitLogger.java:91: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:91: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:104: error: cannot find file for class org.apache.log.Hierarchy
-# .../LogKitLogger.java:104: confused by earlier errors, bailing out
-
-#${JAR_CONSOLE}\
-#${JAR_XML} \
-#${JAR_SUCKER}
-#${JAR_CONSOLE}
-
-SYSTEM_PROPS=-DloggerFilenameOverride=logs/log-router-@.txt \
-             -Dorg.mortbay.http.Version.paranoid=true \
-	     -Dorg.mortbay.util.FileResource.checkAliases=false \
-	     -Dorg.mortbay.xml.XmlParser.NotValidating=true
-#SYSTEM_PROPS=-Di2p.weakPRNG=true
-OPTIMIZE=-O2
-#OPTIMIZE=-O3
-
-LD_LIBRARY_PATH=${EXTRA_LD_PATH}:.
-
-all: jars native
-	@echo "* Build complete"
-
-jars:
-	@${ANT} ${ANT_TARGET}
-
-clean: native_clean
-
-native: native_clean native_shared
-	@echo "* Native code build in ${NATIVE}"
-
-native_clean:
-	@rm -rf ${NATIVE_DIR}
-	@mkdir ${NATIVE_DIR}
-
-native_shared: libi2p.so
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2p_dsa --main=net.i2p.crypto.DSAEngine 
-	@echo "* i2p_dsa is a simple test app with the DSA engine and Fortuna PRNG to make sure crypto is working"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/prng --main=gnu.crypto.prng.FortunaStandalone
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnel --main=net.i2p.i2ptunnel.I2PTunnel 
-	@echo "* i2ptunnel is mihi's I2PTunnel CLI"
-	@echo "  run it as ./i2ptunnel -cli to avoid awt complaints"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2ptunnelctl --main=net.i2p.i2ptunnel.TunnelControllerGroup 
-	@echo "* i2ptunnelctl is a controller for I2PTunnel, reading i2ptunnel.config"
-	@echo "  and launching the appropriate proxies"
-	#@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2psnark --main=org.klomp.snark.Snark
-	#@echo "* i2psnark is an anonymous bittorrent client"
-	@cd build ; ${GCJ} ${OPTIMIZE} -fjni -L../${NATIVE_DIR} -li2p ${SYSTEM_PROPS} -o ../${NATIVE_DIR}/i2prouter --main=net.i2p.router.Router 
-	@echo "* i2prouter is the main I2P router"
-	@echo "  it can be used, and while the router console won't load,"
-	@echo "  i2ptunnel will, so it will start all the proxies defined in i2ptunnel.config"
-
-libi2p.so:
-	@echo "* Building $@"
-	@(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/$@ ${LIBI2P_JARS} ; cd .. )
-	@ls -l ${NATIVE_DIR}/$@
-	@echo "* $@ built"
-
-sam: jars libi2psam.so
-
-libi2psam.so:
-	@echo "* Building $@"
-	@rm -f ${NATIVE_DIR}/$@
-	@(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/$@ ${LIBSAM_JARS} ; cd .. )
-	@ls -l ${NATIVE_DIR}/$@
-	@echo "* $@ built"
-
-router: jars libi2prouter.so
-
-libi2prouter.so:
-	@echo "* Building $@"
-	@rm -f ${NATIVE_DIR}/$@
-	@(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/$@ ${LIBROUTER_JARS} ; cd .. )
-	@ls -l ${NATIVE_DIR}/$@
-	@echo "* $@ built"
-
-console: jars libi2pconsole.so
-
-# doesn't work, see above
-libi2pconsole.so:
-	@echo "* Building $@"
-	@rm -f ${NATIVE_DIR}/$@
-	@(cd build ; time ${GCJ} ${OPTIMIZE} -fPIC -fjni -shared -o ../${NATIVE_DIR}/$@ ${LIBCONSOLE_JARS} ; cd .. )
-	@ls -l ${NATIVE_DIR}/$@
-	@echo "* $@ built"
-

README.txt

@@ -1,32 +1,102 @@
-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)
-	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/
+These instructions are for a recent Android SDK (Rev 20 or better) on Linux.
+Windows building is not currently supported.
 
-To build:
-	ant pkg
-	Run 'ant' with no arguments to see other build options.
-	See INSTALL.txt or http://www.i2p2.de/download.html for installation instructions.
+These instructions were last updated for SDK Tools Version 20 with
+SDK Platform-tools Version 12 from updates.
 
-Documentation:
-	http://www.i2p2.de/
-	API: run 'ant javadoc' then start at build/javadoc/index.html
+The i2p source must be installed in ../i2p.i2p,
+or else add i2psrc=/path/to/source in the local.properties file.
 
-Latest release:
-	http://www.i2p2.de/download.html
+=====================
 
-To get development branch from source control:
-	http://www.i2p2.de/newdevelopers.html
+Dependencies:
 
-FAQ:
-	http://www.i2p2.de/faq.html
+- Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
+- Apache Ant 1.8.0 or higher
+- I2P source in ../i2p.i2p
+- Android SDK (tested with Rev 20 and platform-tools version 12)
 
-Need help?
-	IRC irc.freenode.net #i2p
-	http://forum.i2p2.de/
+=====================
 
-Licenses:
-	See LICENSE.txt
+Instructions:
 
+# 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/tools/
+#
+# Run the GUI updater, which you must do to get an SDK Platform:
+../android-sdk-linux/tools/android &
+
+# 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 2.2 or higher
+# (API 8) download at least that one. Otherwise you must change the
+# target in project.properties from android-8 to andriod-x
+# where x is the API version.
+
+# To run the debugger (ddms) you also need to download the
+# "Android SDK Platform-Tools" package from the GUI updater.
+
+# create a file local.properties with the following line (without the leading # of course),
+# do NOT use a relative path
+# sdk.dir=/path/to/your/android-sdk-linux
+# Copy this file to the routerjars/ directory, it is needed in both places.
+
+# DO NOT create a new project or anything. It's all set up right here for you.
+
+# Create the android 2.2 (API 8) virtual device
+# (don't make a custom hardware profile)
+../android-sdk-linux/tools/android create avd --name i2p --target 8
+
+# then run the emulator:
+#  This may take a LONG time the first time (half an hour or more)...
+#  Run the debugger to ensure it is making progress
+#   -no-boot-anim for faster boot
+#   -dns-server 8.8.8.8 if the router can't reseed
+#     ../android-sdk-linux/tools/emulator -avd i2p -no-boot-anim -dns-server 8.8.8.8 &
+../android-sdk-linux/tools/emulator -avd i2p &
+
+# or to talk to a real device in debug mode:
+# You have to do this if you get a permission error -
+# Stop ddms, unplug the device, do the following,
+# then plug in the device, then start ddms
+adb kill-server
+sudo adb start-server
+adb devices
+
+# then wait a couple minutes until the emulator or device is up
+# compile and install for a release
+ant release
+ant installr
+
+# or compile and install for a debug version
+ant debug
+ant installd
+
+# then run the debugger
+../android-sdk-linux/tools/ddms &
+
+# to rebuild and reinstall to emulator or device:
+ant clean
+# then do which ever from the above compile and install choices.
+
+
+# to uninstall
+ant uninstall
+# or use your device's menu.
+
+# Other ant tagets are available, just type
+ant
+
+# Anyway, with I2P installed, click on the I2P icon on your device and enjoy!
+
+#other helpful commands
+../android-sdk-linux/platform-tools/adb shell
+../android-sdk-linux/platform-tools/adb pull /some/file/on/emulator some-local-dir/
+
+# copy the Dev Tools app from the emulator to your device
+adb -e pull /system/app/Development.apk ./Development.apk
+adb -d install Development.apk
+
+# reinstall an existing apk onto the emulator
+adb -e install -r bin/I2PAndroid-debug.apk

Slackware/README

@@ -1,30 +0,0 @@
-ou will need atleast monotone > = 0.41 to get the most recent build source
-and connect it to an already running i2p router.
-
-OR:
-
-You may download the actual "stable" source from
-http://code.google.com/p/i2p/downloads/list
-
-You will need to follwing tools to build the i2p and i2p-base packages:
-
-bash >= 3.1.017
-requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html )
-jre >= 6u11
-jdk >= 6u11
-apache-ant >= 1.7.1
-perl >= 5.10.0
-python >= 2.5.2
-
-Reccomended:
-monotone >= 0.41 ( http://pkgs.dr.ea.ms )
-
-See also:
-
-i2p/readme.txt
-
-AND
-
-i2p-base/readme.txt
-
-for information and handy tips.

Slackware/i2p-base/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project basedir="." default="slackpkg">
-    <target name="slackpkg">
-        <echo message="Building Slackware package." />
-        <exec executable="./i2p-base.SlackBuild">
-        </exec>
-    </target>
-</project>

Slackware/i2p-base/doinst.sh

@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-#
-# Now in the future we only need to look for '#I2P' and '#/I2P' 
-# for modifications to rc.local and rc.local_shutdown. 
-# I was a moron for not doing it this way in the first place :-) -- Sponge
-#
-#
-
-touch /etc/rc.d/rc.local
-touch /etc/rc.d/rc.local_shutdown
-
-echo
-echo -n "Check 1: /etc/rc.d/rc.local "
-I2PRCA=`grep -c /etc/rc.d/rc.local -e '/etc/rc.d/rc.i2p'`
-
-if [ $I2PRCA -eq 0 ] ; then
-	echo '#I2P' >> /etc/rc.d/rc.local
-	echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-	echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-	echo "fi" >> /etc/rc.d/rc.local
-	echo '#/I2P' >> /etc/rc.d/rc.local
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs, or where people have modified.
-
-	echo -n " Check 1A: "
-	I2PRCC=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-
-	if [ $I2PRCC -eq 0 ] ; then
-		DATA=$(cat /etc/rc.d/rc.local | sed -re 's/if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/#I2P\n\( cd \/tmp ; rm -Rf i2p-*.tmp \)\nif \[ -x \/etc\/rc.d\/rc.i2p \] ; then/')
-		echo "${DATA}" > /etc/rc.d/rc.local
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-
-	echo -n " Check 1B: "
-	I2PRCE=`grep -c /etc/rc.d/rc.local -e 'i2p-\*\.tmp'`
-	if [ $I2PRCE -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/i2p-\*\.tmp/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/i2p-\*\.tmp/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-		
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo -n " Check 1C: "
-	I2PRCF=`grep -c /etc/rc.d/rc.local -e '#/I2P'`
-	if [ $I2PRCF -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local
-		echo '#I2P' >> /etc/rc.d/rc.local
-		echo '( cd /tmp ; rm -Rf i2p-*.tmp )' >> /etc/rc.d/rc.local
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
-		echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
-		echo "fi" >> /etc/rc.d/rc.local
-		echo '#/I2P' >> /etc/rc.d/rc.local
-		echo "${DATABOT}" >> /etc/rc.d/rc.local
-
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks ok so far,"
-	fi
-	echo " Done."
-fi
-
-echo -n "Check 2: /etc/rc.d/rc.local_shutdown "
-I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e '/etc/rc.d/rc.i2p'`
-if [ $I2PRCB -eq 0 ] ; then
-	echo "#I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-	echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-	echo "fi" >> /etc/rc.d/rc.local_shutdown
-	echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-	echo "modified."
-else
-	echo -n "looks OK so far,"
-	# Fix old installs
-
-	echo -n " Check 1A: "
-	I2PRCG=`grep -c /etc/rc.d/rc.local_shutdown -e '#I2P'`
-	if [ $I2PRCG -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^if \[ -x \/etc\/rc\.d\/rc\.i2p \] ; then/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo -n " Check 1B: "
-	I2PRCH=`grep -c /etc/rc.d/rc.local_shutdown -e '#/I2P'`
-	if [ $I2PRCH -eq 0 ] ; then
-		DATATOP=$(cat /etc/rc.d/rc.local_shutdown | sed -n '0,/^#I2P/p' | sed '$d' )
-		DATABOT=$(cat /etc/rc.d/rc.local_shutdown | sed -n '/^#I2P/,$p' | sed -n '/^fi/,$p' | sed "1d")
-		echo "${DATATOP}" > /etc/rc.d/rc.local_shutdown
-		echo '#I2P' >> /etc/rc.d/rc.local_shutdown
-		echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
-		echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
-		echo "fi" >> /etc/rc.d/rc.local_shutdown
-		echo "#/I2P" >> /etc/rc.d/rc.local_shutdown
-		echo "${DATABOT}" >> /etc/rc.d/rc.local_shutdown
-		echo -n "additional modifications applied,"
-	else
-		echo -n "looks OK so far,"
-	fi
-	echo " Done."
-fi
-
-if [ -f /etc/rc.d/rc.i2p ] ; then
-	if [ -x /etc/rc.d/rc.i2p ] ; then
-		chmod +x /etc/rc.d/rc.i2p.new
-	fi
-	# Hopefully get admin's attention.
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-	echo "It apears that you already have /etc/rc.d/rc.i2p"
-	echo "You should replace it with /etc/rc.d/rc.i2p.new as soon as possible"
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -ne "\007" ; sleep 0.3
-	echo -e "\007" ; sleep 0.3
-else
-	mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
-	echo
-	echo "Installation finished. The i2p start/stop script has been"
-	echo "installed in /etc/rc.d . You should chmod +x"
-	echo '/etc/rc.d/rc.i2p to start it on boot.'
-	echo
-fi
-
-exit

Slackware/i2p-base/i2p-base.SlackBuild

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Heavily based on the Slackware 12.2 SlackBuild
-# Slackware build script for I2P
-#
-# PLEASE READ THIS:
-# How to start I2P:
-# After installpkg command, doinst.sh will execute a post-installation script
-# needed by I2P. After that you have to chmod +x /etc/rc.d/rc.i2p and start
-# I2P service with /etc/rc.d/rc.i2p start.
-#
-# Now tell your browser to user this proxy: localhost on port 4444 and open
-# this page: http://localhost:7657/index.jsp
-#
-# Here you can configure I2P, watch network status and navigate anonimously.
-# It's suggested to subscribe to various dns host, like i2host.i2p
-# For any additional information, visit i2host.i2p and forum.i2p
-#
-
-CWD=$(pwd)
-TMP=/tmp
-PKG=/$TMP/package-base-i2p
-NAME=i2p-base
-VERSION=0.0.4
-BUILD=1sponge
-ARCH=noarch
-INSTALL_DIR=opt
-
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-rm -rf $PKG
-mkdir -p $PKG
-cd $PKG
-chown -R root:root .
-
-mkdir -p $PKG/etc/rc.d
-mkdir -p $PKG/install
-sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" "$CWD/rc.i2p_def" > $PKG/etc/rc.d/rc.i2p.new
-chmod 644 $PKG/etc/rc.d/rc.i2p.new
-cat "$CWD/doinst.sh" > $PKG/install/doinst.sh
-cat "$CWD/slack-desc" > $PKG/install/slack-desc
-
-cd $PKG
-#
-# Not really that important to exec this 
-# as there aren't any deps we don't know.
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat "$CWD/slack-required" > $PKG/install/slack-required
-makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

Slackware/i2p-base/rc.i2p_def

@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop i2p service.
-
-i2p_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 "/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() {
- # We want a FULL cycle here, not the wrappers idea of this!
- i2p_stop
- i2p_start
-}
-
-i2p_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 "/bin/bash -l -c '( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\" ; directory console )'"
-}
-
-i2p_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
-'start')
-  i2p_start
-  ;;
-'stop')
-  i2p_stop
-  ;;
-'restart')
-  i2p_restart
-  ;;
-'status')
-  i2p_status
-  ;;
-'console')
-  i2p_console
-  ;;
-'dump')
-  i2p_dump
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status|console|dump"
-  ;;
-esac
-

Slackware/i2p-base/readme.txt

@@ -1,10 +0,0 @@
-An rc file called rc.i2p has been placed into the /etc/rc.d directory.
-If you want to change installation dir, change the variable INSTALL_DIR
-on base-i2p.SlackBuild and rebuild the package. You also will need to do the
-same for the i2p package.
-
-The install script will insert everything needed into /etc/rc.d/rc.local and
-into /etc/rc.d/rc.local_shutdown automatically.
-
-If you want to start I2P at boot you have to chmod +x /etc/rc.d/rc.i2p
-

Slackware/i2p-base/slack-desc

@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-base-i2p: base-i2p (I2P anonymizing network base config files)
-base-i2p:
-base-i2p: I2P is an anonymizing network, offering a simple layer that
-base-i2p: identity-sensitive applications can use to securely communicate. All
-base-i2p: data is wrapped with several layers of encryption, and the network is
-base-i2p: both distributed and dynamic, with no trusted parties.
-base-i2p: Many applications are available that interface with I2P, including 
-base-i2p: mail, peer-peer file sharing, IRC chat, and others.
-base-i2p:
-base-i2p: This package provides the startup files.
-base-i2p:

Slackware/i2p-base/slack-required

@@ -1 +0,0 @@
-bash >= 3.1.017

Slackware/i2p/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project basedir="." default="slackpkg">
-    <target name="slackpkg">
-        <echo message="Building Slackware package." />
-        <exec executable="./i2p.SlackBuild">
-        </exec>
-    </target>
-</project>

Slackware/i2p/doinst.sh

@@ -1,72 +0,0 @@
-#!/bin/sh
-
-INST_DIR=directory
-
-( cd install
-
-echo
-for i in *.config ; {
-	if [ -f $INST_DIR/$i ] ; then
-		echo "Please check ${INST_DIR}${i}, as there is a new version."
-		cp $i $INST_DIR/$i.new
-	else
-		cp $i $INST_DIR/$i
-	fi
-}
-
-)
-
-( cd $INST_DIR
-	if [ -f blocklist.txt ] ; then
-		echo "Please check ${INST_DIR}blocklist.txt, as there is a new version."
-	else
-		mv blocklist.txt.new blocklist.txt
-	fi
-)
-
-( cd $INST_DIR/eepsite
-	if [ -f jetty.xml ] ; then
-		rm jetty.xml.new
-	else
-		mv jetty.xml.new jetty.xml
-	fi
-)
-
-( cd $INST_DIR/eepsite/docroot
-	if [ -f index.html ] ; then
-		rm index.html.new
-	else
-		mv index.html.new index.html
-	fi
-	if [ -f favicon.ico ] ; then
-		rm favicon.ico.new
-	else
-		mv favicon.ico.new favicon.ico
-	fi
-)
-
-echo
-echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
-
-cd $INST_DIR
-
-
-
-OS_ARCH=`uname -m`
-X86_64=`echo "$OS_ARCH" | grep x86_64`
-if [ "X$X86_64" = "X" ]; then
-        wrapperpath="./lib/wrapper/linux"
-else
-        wrapperpath="./lib/wrapper/linux64"
-fi
-cp $wrapperpath/libwrapper.so ./lib/
-cp $wrapperpath/wrapper.jar ./lib/
-cp $wrapperpath/i2psvc .
-rm -rf ./lib/wrapper
-chmod 744 ./i2psvc
-
-echo
-echo "Installation finished."
-echo
-
-exit

Slackware/i2p/i2p.SlackBuild

@@ -1,133 +0,0 @@
-#!/bin/sh
-#
-# Heavily based on the Slackware 12.2 SlackBuild
-# Slackware build script for I2P
-#
-# PLEASE READ THIS:
-# Probably you will never have to update I2P packages with upgradepkg,
-# just because I2P has an auto-update function.
-# Really you should not ever use any "upgrade" method.
-#
-# The correct way to upgrade is to: 
-# 1: install the upgrade
-# 2: remove the old package
-#
-# It is a terrible shame that upgradepkg doesn't do this, infact, 
-# it would actually be the correct way for *any* package!
-#
-#
-
-BUILD=1sponge
-INSTALL_DIR=opt
-NAME=i2p
-ARCH=noarch
-
-# Less than slackware 13?
-SLKPLT=$(cat /etc/slackware-version | sed -re "s/(Slackware )([0-9]*)(.*)/\2/")
-if [ $SLKPLT -lt 13 ] ; then
-	EXT=tgz
-else
-	EXT=txz
-fi
-
-
-#
-# This mess is here due to the totally moronic way i2p does versioning.
-# We correct it here.
-#
-ROUTER=$(echo -ne "_")$(cat ../../router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
-if [ "$ROUTER" == "_" ] ;  then
-	ROUTER="_0"
-fi
-
-#
-# That was the easy one, now for the tough one.
-#
-
-CORE=$(cat ../../core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
-CORE1=$(echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-CORE2=$(echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
-
-if [ "$CORE.x.x" == "$CORE1" ] ; then
-	CORE=$(echo -ne $CORE".0.0")
-fi
-if [ "$CORE.x" == "$CORE2" ] ; then
-	CORE=$(echo -ne $CORE".0")
-fi
-
-VERSION=$(echo $CORE$ROUTER)
-#
-# Whew!
-# OK, let's build i2p
-#
-
-CWD=$(pwd)
-TMP=/tmp
-
-PKG=$TMP/package-i2p
-rm -rf $PKG
-mkdir -p $PKG
-
-cd $CWD/../../
-
-ant distclean
-#ant dist
-ant tarball
-
-tar xjvf i2p.tar.bz2 -C $TMP
-
-cd $TMP/i2p
-chown -R root:root .
-
-mkdir -p $PKG/$INSTALL_DIR/
-cp -a ../i2p $PKG/$INSTALL_DIR/
-
-mkdir -p $PKG/install
-
-#############################################################################
-# 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|/$INSTALL_DIR/i2p|g" a > wrapper.config
-# eepget %INSTALL_PATH
-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|/$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|/$INSTALL_DIR/i2p|g" a > i2prouter
-
-chmod 744 ./i2prouter
-chmod 744 ./osid
-chmod 744 ./runplain.sh
-chmod 744 ./eepget
-chmod 744 ./scripts/i2pbench.sh
-chmod 744 ./scripts/i2ptest.sh
-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
-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
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-#
-# requiredbuilder fucks up REALLY bad, and thinks java is perl?!
-# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
-#
-# requiredbuilder -v -y -s $CWD $PKG
-#
-cat $CWD/slack-required > $PKG/install/slack-required
-makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.$EXT

Slackware/i2p/readme.txt

@@ -1,47 +0,0 @@
-Building:
-The i2p package will be installed in /opt/i2p 
-
-If you want to change installation dir, change the variable INSTALL_DIR
-on i2p.SlackBuild and rebuild the package. You will also need to do the same
-in the base-i2p package.
-
-Installation and Upgrade:
-Probably you will never have to update i2p packages. However if you do,
-be sure to installpkg first, then removepkg or custom config files can
-be lost with upgradepkg. I2P has an auto-update function. However using
-installpkg then removepkg lowers the demand on the I2P network as a 
-whole, and is by far faster.
-
-After installpkg command, doinst.sh will execute a postinstallation script
-needed by I2P.  Be sure to also install the base-i2p package.
-
-Optional:
-
-chmod +x /etc/rc.d/rc.i2p only if you want it to start on boot and stop on
-shutdown.
-
-How to start I2P:
-
-Start I2P service with-
-sh /etc/rc.d/rc.i2p start
-
-Now tell your browser to user this proxy: localhost on port 4444 and open
-this page: http://localhost:7657/index.jsp
-Here you can configure I2P, watch network status and navigate anonimously.
-It's suggested to subscribe to various addressbook hosts so that you can
-get to the many available eepsites and other service on I2P. These are not
-set up by default for security reasons. 
-
-Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how
-to subscribe to the various addressbook services.
-
-To stop I2P:
- /etc/rc.d/rc.i2p stop
-
-
-For any additional information:
-
-Within I2P- http://www.i2p2.i2p/, http://forum.i2p/, http://zzz.i2p
-
-Internet (not reccomended!) - http://www.i2p2.de/, http://forum.i2p2.de/
-

Slackware/i2p/slack-desc

@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-   |-----handy-ruler----------------------------------------------------------|
-i2p: i2p (an anonymizing network)
-i2p:
-i2p: I2P is an anonymizing network, offering a simple layer that
-i2p: identity-sensitive applications can use to securely communicate. All
-i2p: data is wrapped with several layers of encryption, and the network is
-i2p: both distributed and dynamic, with no trusted parties.
-i2p: Many applications are available that interface with I2P, including 
-i2p: mail, peer-peer file sharing, IRC chat, and others.
-i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg.
-i2p: For more information, see:  http://www.i2p2.de/
-i2p:

Slackware/i2p/slack-required

@@ -1,4 +0,0 @@
-jre >= 5
-i2p-base >= 0.0.1
-bash >= 3.1.017
-

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> 

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

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>

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

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

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

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

ant.properties

@@ -0,0 +1,5 @@
+application-package=net.i2p.router
+key.store=${user.home}/.android/${application-package}.keystore
+key.alias=${application-package}
+android.library.reference.1=./routerjars
+key.store.password=android

apps/BOB/Demos/echo/echoclient/build.xml

@@ -1,69 +0,0 @@
-<?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.) -->
-<project name="echoclient" default="default" basedir=".">
-    <description>Builds, tests, and runs the project echoclient.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    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: 
-
-      -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
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -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="echoclient-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. 
-
-    -->
-</project>

apps/BOB/Demos/echo/echoclient/client.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-(
-cd dist
-java -jar echoclient.jar main 37338 testclient $1
-)

apps/BOB/Demos/echo/echoclient/manifest.mf

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-

apps/BOB/Demos/echo/echoclient/nbproject/build-impl.xml

@@ -1,629 +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="echoclient-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="" 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 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="dt_socket">
-                    <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>
-    </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=dt_socket,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,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,-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,-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>

apps/BOB/Demos/echo/echoclient/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=8ce3cee9
-build.xml.script.CRC32=d1de2df3
-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=8ce3cee9
-nbproject/build-impl.xml.script.CRC32=22d1fbbb
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9

apps/BOB/Demos/echo/echoclient/nbproject/private/private.properties

@@ -1,2 +0,0 @@
-jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
-user.properties.file=/root/.netbeans/6.1/build.properties

apps/BOB/Demos/echo/echoclient/nbproject/private/private.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/root/NetBeansProjects/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java</file>
-    </open-files>
-</project-private>

apps/BOB/Demos/echo/echoclient/nbproject/project.properties

@@ -1,60 +0,0 @@
-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}/echoclient.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.BOB.jar=../../../dist/BOB.jar
-includes=**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-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.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=net.i2p.BOB.Demos.echo.echoclient.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

apps/BOB/Demos/echo/echoclient/nbproject/project.xml

@@ -1,16 +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>echoclient</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>
-    </configuration>
-</project>

apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java

@@ -1,201 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB.Demos.echo.echoclient;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author sponge
- */
-public class Main {
-
-	public static String Lread(InputStream in) throws IOException {
-		String S;
-		int b;
-		char c;
-
-		S = new String();
-
-		while(true) {
-			b = in.read();
-			if(b == 13) {
-				//skip CR
-				continue;
-			}
-			if(b < 20 || b > 126) {
-				// exit on anything not legal
-				break;
-			}
-			c = (char)(b & 0x7f); // We only really give a fuck about ASCII
-			S = new String(S + c);
-		}
-		return S;
-	}
-
-	/**
-	 * Check for "ERROR" and if so, throw RuntimeException
-	 * @param line
-	 * @throws java.lang.RuntimeException
-	 */
-	static void checkline(String line) throws RuntimeException {
-		System.out.println(line); // print status
-		if(line.startsWith("ERROR")) {
-			throw new RuntimeException(line);
-		}
-	}
-
-	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
-		CMDout.write('\n');
-		CMDout.flush();
-	}
-
-	static void setupconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// setup the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		try {
-			wrtxt(CMDout, "status " + args[2]);
-			line = Lread(CMDin); // get the status of this nickname, if it's an error, create it
-			checkline(line);
-		} catch(RuntimeException rte) {
-			wrtxt(CMDout, "setnick " + args[2]);
-			line = Lread(CMDin); // create a new nickname
-			checkline(line);
-			wrtxt(CMDout, "newkeys");
-			line = Lread(CMDin); // set up new keys
-			checkline(line);
-			wrtxt(CMDout, "inport " + args[1]);
-			line = Lread(CMDin); // set the port we connect in on
-			checkline(line);
-		}
-		wrtxt(CMDout, "getnick " + args[2]);
-		line = Lread(CMDin); // Set to our nick
-		try {
-			checkline(line);
-		} catch(RuntimeException rte) {
-			System.out.println("Continuing on existing tunnel..");
-			return;
-		}
-		wrtxt(CMDout, "start");
-		line = Lread(CMDin); // an error here is OK
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void deleteconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		// Wait for things to flush
-		try {
-			Thread.sleep(10000);
-		} catch(InterruptedException ex) {
-			// nop
-		}
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// delete the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		wrtxt(CMDout, "getnick " + args[2]); // Set to our nick
-		line = Lread(CMDin);
-		checkline(line);
-		wrtxt(CMDout, "stop");
-		line = Lread(CMDin);
-		checkline(line);
-		try {
-			Thread.sleep(2000); //sleep for 2000 ms (Two seconds)
-		} catch(Exception e) {
-			// nop
-		}
-
-		wrtxt(CMDout, "clear");
-		line = Lread(CMDin);
-		while(line.startsWith("ERROR")) {
-			wrtxt(CMDout, "clear");
-			line = Lread(CMDin);
-		}
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void chatter(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket sock = new Socket("localhost", Integer.parseInt(args[1]));
-		InputStream in = sock.getInputStream();
-		OutputStreamWriter out = new OutputStreamWriter(sock.getOutputStream());
-		out.write(args[3] + "\n"); // send out the i2p address to connect to
-		out.flush();
-		System.out.println("Connecting to " + args[3]);
-		line = Lread(in); // get server greeting
-		System.out.println("Got " + line); // show user
-		out.write("Test complete.\n"); // send something back
-		out.flush(); // make sure it's sent.
-		sock.close(); // done.
-	}
-
-	/**
-	 *
-	 * @param args tunnelport tunnelnickname I2Pdestkey
-	 */
-	public static void main(String[] args) {
-		// I'm lazy, and want to exit on any failures.
-		try {
-			setupconn(args); // talk to BOB, set up an outbound port
-			chatter(args);  // talk over the connection
-
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-		try {
-			deleteconn(args);
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(RuntimeException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-	}
-}

apps/BOB/Demos/echo/echoserver/build.xml

@@ -1,69 +0,0 @@
-<?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.) -->
-<project name="echoserver" default="default" basedir=".">
-    <description>Builds, tests, and runs the project echoserver.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    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: 
-
-      -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
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -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="echoserver-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. 
-
-    -->
-</project>

apps/BOB/Demos/echo/echoserver/manifest.mf

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-

apps/BOB/Demos/echo/echoserver/nbproject/build-impl.xml

@@ -1,629 +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="echoserver-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="" 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 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="dt_socket">
-                    <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>
-    </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=dt_socket,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,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,-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,-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>

apps/BOB/Demos/echo/echoserver/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=4ce39738
-build.xml.script.CRC32=c1deb82c
-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=4ce39738
-nbproject/build-impl.xml.script.CRC32=555cdd2d
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9

apps/BOB/Demos/echo/echoserver/nbproject/private/private.properties

@@ -1,2 +0,0 @@
-jaxws.endorsed.dir=/usr/local/netbeans-6.1/java2/modules/ext/jaxws21/api
-user.properties.file=/root/.netbeans/6.1/build.properties

apps/BOB/Demos/echo/echoserver/nbproject/private/private.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/root/NetBeansProjects/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java</file>
-    </open-files>
-</project-private>

apps/BOB/Demos/echo/echoserver/nbproject/project.properties

@@ -1,60 +0,0 @@
-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}/echoserver.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.BOB.jar=../../../dist/BOB.jar
-includes=**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-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.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=net.i2p.BOB.Demos.echo.echoserver.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

apps/BOB/Demos/echo/echoserver/nbproject/project.xml

@@ -1,16 +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>echoserver</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>
-    </configuration>
-</project>

apps/BOB/Demos/echo/echoserver/server.sh

@@ -1,4 +0,0 @@
-(
-cd dist
-java -jar echoserver.jar main 37337 testserver
-)

apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java

@@ -1,197 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB.Demos.echo.echoserver;
-
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author sponge
- */
-public class Main {
-	public static String Lread(InputStream in) throws IOException {
-		String S;
-		int b;
-		char c;
-
-		S = new String();
-
-		while(true) {
-			b = in.read();
-			if(b < 20) {
-				break;
-			}
-			c = (char)(b & 0x7f); // We only really give a fuck about ASCII
-			S = new String(S + c);
-		}
-		return S;
-	}
-
-	/**
-	 * Check for "ERROR" and if so, throw RuntimeException
-	 * @param line
-	 * @throws java.lang.RuntimeException
-	 */
-	static void checkline(String line) throws RuntimeException {
-		System.out.println(line); // print status
-		if(line.startsWith("ERROR")) {
-			throw new RuntimeException(line);
-		}
-	}
-
-	static void wrtxt(OutputStream CMDout, String s) throws IOException {
-		CMDout.write(s.getBytes());
-		CMDout.write('\n');
-		CMDout.flush();
-	}
-
-	static void setupconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// setup the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		try {
-			wrtxt(CMDout, "status " + args[2]);
-			line =Lread(CMDin); // get the status of this nickname, if it's an error, create it
-			checkline(line);
-		} catch(RuntimeException rte) {
-			wrtxt(CMDout, "setnick " + args[2]);
-			line =Lread(CMDin); // create a new nickname
-			checkline(line);
-			wrtxt(CMDout, "newkeys ");
-			line =Lread(CMDin); // set up new keys
-			checkline(line);
-			wrtxt(CMDout, "outport " + args[1]);
-			line = Lread(CMDin); // set the port we connect out on
-			checkline(line);
-		}
-		wrtxt(CMDout, "getnick " + args[2]);
-		line = Lread(CMDin); // Set to our nick
-		checkline(line);
-		wrtxt(CMDout, "start ");
-		line = Lread(CMDin); // an error here is OK
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void deleteconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// delete the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		wrtxt(CMDout, "getnick " + args[2]); // Set to our nick
-		line = Lread(CMDin);
-		checkline(line);
-		wrtxt(CMDout, "stop");
-		line = Lread(CMDin);
-		checkline(line);
-		try {
-			Thread.sleep(2000); //sleep for 2000 ms (Two seconds)
-		} catch(Exception e) {
-			// nop
-		}
-
-		wrtxt(CMDout, "clear");
-		line = Lread(CMDin);
-		while(line.startsWith("ERROR")) {
-			wrtxt(CMDout, "clear");
-			line = Lread(CMDin);
-		}
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void chatter(Socket sock) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		InputStream in = sock.getInputStream();
-		OutputStreamWriter out = new OutputStreamWriter(new BufferedOutputStream(sock.getOutputStream()));
-
-		line = Lread(in); // get remote I2P address
-		System.out.println("Connect from: " + line); // show user
-
-		out.write("Hello, You are connecting from " + line + "\n"); // send greeting
-		out.flush(); // make sure it's sent.
-		line = Lread(in); // get test text from client
-		System.out.println("Got "+line); // show user
-		sock.close(); // done.
-	}
-
-	private static void serverlistener(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		ServerSocket listener = new ServerSocket(Integer.parseInt(args[1]), 10, InetAddress.getByName("localhost"));
-		Socket server;
-
-		while(true) {
-			server = listener.accept();
-			chatter(server);
-		}
-	}
-
-	/**
-	 *
-	 * @param args tunnelport tunnelnickname
-	 */
-	public static void main(String[] args) {
-		// I'm lazy, and want to exit on any failures.
-		try {
-			setupconn(args); // talk to BOB, set up an inbound port
-			serverlistener(args);  // talk over the connection
-
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-		try {
-			deleteconn(args);
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(RuntimeException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-	}
-}

apps/BOB/bob.config

@@ -1,14 +0,0 @@
-#bob.config
-#Tue Dec 30 00:00:00 UTC 2008
-# Please leave this file here for testing.
-# Thank you,
-# Sponge
-i2cp.tcp.port=7654
-BOB.host=localhost
-inbound.lengthVariance=0
-i2cp.messageReliability=BestEffort
-BOB.port=45678
-outbound.length=1
-inbound.length=1
-outbound.lengthVariance=0
-i2cp.tcp.host=localhost

apps/BOB/build.xml

@@ -1,114 +0,0 @@
-<?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="BOB" default="default" basedir=".">
-    <description>Builds, tests, and runs the project BOB.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    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: 
-
-      -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
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -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. 
-
-    -->
-    <target depends="jar" description="Build BOB into a SINGLE JAR." name="onejar">
-	<!-- Make needed working dirs -->
-	<mkdir dir="${dist.dir}/lib" />
-	<mkdir dir="${dist.dir}/classes" />
-
-	<!-- Copy jars -->
-	<copy todir="${dist.dir}/lib" flatten="true" >
-	    <path>
-	        <pathelement path="${javac.classpath}" />
-	    </path>
-	</copy>
-	<copy todir="${dist.dir}/lib" file="../../installer/lib/jbigi/jbigi.jar" />
-
-	<!-- Extract the classes inside the jar files -->
-	<unjar dest="${dist.dir}/classes" >
-            <fileset dir="${dist.dir}/lib" >
-                <include name="**/*.jar" />
-            </fileset>
-        </unjar>
-
-        <!-- Recombine the classes into a new jar file -->
-	<jar jarfile="${dist.dir}/lib/all-in-one.jar" >
-	    <fileset dir="${dist.dir}/classes" />
-        </jar>
-
-        <!-- Clean up work area -->        
-        <delete dir="${dist.dir}/classes" followsymlinks="false" includeemptydirs="true"/>
-
-        <!-- Make the single jar file -->
-        <jar jarfile="dist/BOB-one.jar" >
-            <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-            <zipfileset src="${dist.dir}/lib/all-in-one.jar" excludes="**/META-INF/*" />
-            <manifest>
-                <attribute name="Main-Class" value="net.i2p.BOB.Main" />
-            </manifest>
-        </jar>
-
-        <!-- Clean up the fake jar file -->
-        <delete file="${dist.dir}/lib/all-in-one.jar" />
-    </target>
-</project>

apps/BOB/manifest.mf

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-

apps/BOB/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="BOB-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>

apps/BOB/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=209349b6
-build.xml.script.CRC32=403e69e6
-build.xml.stylesheet.CRC32=958a1d3e
-# 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=209349b6
-nbproject/build-impl.xml.script.CRC32=c51e188e
-nbproject/build-impl.xml.stylesheet.CRC32=65b8de21

apps/BOB/nbproject/project.properties

@@ -1,92 +0,0 @@
-application.homepage=http://bob.i2p/
-application.title=BOB
-application.vendor=Sponge
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-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
-build.generated.sources.dir=${build.dir}/generated-sources
-# 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}/BOB.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-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.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
-includes=**
-jar.compress=true
-javac.classpath=\
-    ${file.reference.router.jar}:\
-    ${file.reference.i2ptunnel.jar}:\
-    ${file.reference.mstreaming.jar}:\
-    ${file.reference.streaming.jar}:\
-    ${file.reference.wrapper.jar}:\
-    ${file.reference.i2p.jar}:\
-    ${file.reference.router.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-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.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/dist
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=net.i2p.BOB.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

apps/BOB/nbproject/project.xml

@@ -1,16 +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>BOB</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>
-    </configuration>
-</project>

apps/BOB/src/net/i2p/BOB/BOB.java

@@ -1,382 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.Properties;
-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;
-
-/**
- * <span style="font-size:8px;font-family:courier;color:#EEEEEE;background-color:#000000">
- * ################################################################################<br>
- * ############################.#..........#..#..........##########################<br>
- * #######################......................................###################<br>
- * ####################...........................#.......#........################<br>
- * #################..................##...................#.........##############<br>
- * ###############................###...####.....#..###.....#.........#############<br>
- * #############...........###..#..###...#####...###.##........#.......############<br>
- * ###########................#......##...#####...##..##.......#..#........########<br>
- * ##########.........................#....##.##..#...##.....................######<br>
- * #########...................................#....#.........................#####<br>
- * ########.........................................#...............#..........####<br>
- * ########.........................................#..........#######..........###<br>
- * #######.................................................############..........##<br>
- * #######..........................................####################.........##<br>
- * #######............####################......########################.........##<br>
- * ######.............###############################################.##.........##<br>
- * ######............################################################..##........##<br>
- * ######............################################################..##........##<br>
- * ######.............##############################################..##.........##<br>
- * ######............##############################################...##..........#<br>
- * ######............#..###########################################...##..........#<br>
- * ######.............#############################################....#..........#<br>
- * #######...........###############################################..##.........##<br>
- * #######...........#####.#.#.#.########################.....#.####...##........##<br>
- * ######............#..............##################.................##.........#<br>
- * ######................####.........###############........#####......##........#<br>
- * ######..............####..#.........############.......##.#.######...##.......##<br>
- * ######.................#.####.........########...........##....###...##.......##<br>
- * #######....#....###...................#######...............#...###..##.......##<br>
- * #######.........###..###.....###.......######.##.#####.........####..##.......##<br>
- * #######.....#...##############.........############......###########.###......##<br>
- * #######....##...##########.......##...##############......#.############.....###<br>
- * ########....#..########......######...##################################....####<br>
- * ########....##.####################...##################################....####<br>
- * ########..#.##..###################..##################################..#..####<br>
- * ##########..###..#################...##################################...#.####<br>
- * #########....##...##############....########..#####.################.##..#.#####<br>
- * ############.##....##########.......#########.###.......###########..#.#########<br>
- * ###############.....#######...#.......########.....##.....######.....###########<br>
- * ###############......###....##..........##.......######....#.........#.#########<br>
- * ##############............##..................##########..............##########<br>
- * ##############..............................##########..#.............##########<br>
- * ###############.......##..................#####..............####....###########<br>
- * ###############.......#####.......#.............####.....#######.....###########<br>
- * ################...#...####......##################.....########....############<br>
- * ################...##..#####.........####.##.....#....##########....############<br>
- * ##################..##..####...........#####.#....############.....#############<br>
- * ##################......#####.................################....##############<br>
- * ###################.....####..........##########..###########....###############<br>
- * ####################..#..#..........................########.....###############<br>
- * #####################.##.......###.................########....#################<br>
- * ######################.........#.......#.##.###############....#################<br>
- * #############.#######...............#####################....###################<br>
- * ###..#.....##...####..........#.....####################....####################<br>
- * ####......##........................##################....######################<br>
- * #.##...###..............###.........###############......#######################<br>
- * #...###..##............######...........................########################<br>
- * ##.......###..........##########....#...#...........############################<br>
- * ##.........##.......############################################################<br>
- * ###........##.....##############################################################<br>
- * ####.............###############################################################<br>
- * ######.........#################################################################<br>
- * #########....###################################################################<br>
- * ################################################################################<br>
- * </span>
- * BOB, main command socket listener, launches the command parser engine.
- *
- * @author sponge
- */
-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);
-	private static final String P_RUNNING = "RUNNING";
-	private static final String P_STARTING = "STARTING";
-	private static final String P_STOPPING = "STOPPING";
-	private static AtomicBoolean lock = new AtomicBoolean(false);
-	// no longer used.
-	// private static int maxConnections = 0;
-
-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void info(String arg) {
-		System.out.println("INFO:" + arg);
-		_log.info(arg);
-	}
-
-	/**
-	 * Log a warning
-	 *
-	 * @param arg
-	 */
-	public static void warn(String arg) {
-		System.out.println("WARNING:" + arg);
-		_log.warn(arg);
-	}
-
-	/**
-	 * Log an error
-	 *
-	 * @param arg
-	 */
-	public static void error(String arg) {
-		System.out.println("ERROR: " + arg);
-		_log.error(arg);
-	}
-
-	/**
-	 * Stop BOB gracefully
-	 */
-	public static void stop() {
-		spin.set(false);
-	}
-
-	/**
-	 * Listen for incoming connections and handle them
-	 *
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		database = new NamedDB();
-		ServerSocket listener = null;
-		int i = 0;
-		boolean save = false;
-		// Set up all defaults to be passed forward to other threads.
-		// 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();
-		try {
-			{
-				File cfg = new File(configLocation);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					FileInputStream fi = new FileInputStream(cfg);
-					props.load(fi);
-					fi.close();
-				} catch (FileNotFoundException fnfe) {
-					warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.");
-					warn(fnfe.toString());
-					save = true;
-				} catch (IOException ioe) {
-					warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.");
-					warn(ioe.toString());
-				}
-			}
-			// 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");
-				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);
-				if (!cfg.isAbsolute()) {
-					cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
-				}
-				try {
-					warn("Writing new defaults file " + cfg.getAbsolutePath());
-					FileOutputStream fo = new FileOutputStream(cfg);
-					props.store(fo, cfg.getAbsolutePath());
-					fo.close();
-				} catch (IOException ioe) {
-					error("IOException on BOB config file " + cfg.getAbsolutePath() + ", " + ioe);
-				}
-			}
-
-			i = 0;
-			boolean g = false;
-			try {
-				info("BOB is now running.");
-				listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
-				Socket server = null;
-				listener.setSoTimeout(500); // .5 sec
-				
-				while (spin.get()) {
-					//DoCMDS connection;
-
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-
-					if (g) {
-						DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-						Thread t = new Thread(conn_c);
-						t.setName("BOB.DoCMDS " + i);
-						t.start();
-						i++;
-					}
-				}
-			} catch (IOException ioe) {
-				error("IOException on socket listen: " + ioe);
-				ioe.printStackTrace();
-			}
-		} finally {
-			info("BOB is now shutting down...");
-			// Clean up everything.
-			try {
-				listener.close();
-			} catch (Exception ex) {
-				// nop
-			}
-			// Find all our "BOB.DoCMDS" threads, wait for them to be finished.
-			// We could order them to stop, but that could cause nasty issues in the locks.
-			visitAllThreads();
-			database.getReadLock();
-			int all = database.getcount();
-			database.releaseReadLock();
-			NamedDB nickinfo;
-			for (i = 0; i < all; i++) {
-				database.getReadLock();
-				nickinfo = (NamedDB) database.getnext(i);
-				nickinfo.getReadLock();
-				if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
-					database.getWriteLock();
-					nickinfo.getWriteLock();
-					nickinfo.add(P_STOPPING, new Boolean(true));
-					nickinfo.releaseWriteLock();
-					database.releaseWriteLock();
-				} else {
-					nickinfo.releaseReadLock();
-					database.releaseReadLock();
-				}
-			}
-			info("BOB is now stopped.");
-
-		}
-	}
-
-	/**
-	 *	Find the root thread group,
-	 *	then find all theads with certain names and wait for them all to be dead.
-	 *
-	 */
-	private static void visitAllThreads() {
-		ThreadGroup root = Thread.currentThread().getThreadGroup().getParent();
-		while (root.getParent() != null) {
-			root = root.getParent();
-		}
-
-		// Visit each thread group
-		waitjoin(root, 0, root.getName());
-	}
-
-	private static void waitjoin(ThreadGroup group, int level, String tn) {
-		// Get threads in `group'
-		int numThreads = group.activeCount();
-		Thread[] threads = new Thread[numThreads * 2];
-		numThreads = group.enumerate(threads, false);
-		// Enumerate each thread in `group' and wait for it to stop if it is one of ours.
-		for (int i = 0; i < numThreads; i++) {
-			// Get thread
-			Thread thread = threads[i];
-			if (thread.getName().startsWith("BOB.DoCMDS ")) {
-				try {
-					if (thread.isAlive()) {
-						try {
-							thread.join();
-						} catch (InterruptedException ex) {
-						}
-					}
-				} catch (SecurityException se) {
-					//nop
-				}
-			}
-		}
-
-		// Get thread subgroups of `group'
-		int numGroups = group.activeGroupCount();
-		ThreadGroup[] groups = new ThreadGroup[numGroups * 2];
-		numGroups = group.enumerate(groups, false);
-
-		// Recursively visit each subgroup
-		for (int i = 0; i < numGroups; i++) {
-			waitjoin(groups[i], level + 1, groups[i].getName());
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/I2Plistener.java

@@ -1,109 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.Log;
-
-/**
- * Listen on I2P and connect to TCP
- *
- * @author sponge
- */
-public class I2Plistener implements Runnable {
-
-	private NamedDB info,  database;
-	private Log _log;
-//	private int tgwatch;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param SS
-	 * @param S
-	 * @param info
-	 * @param database
-	 * @param _log
-	 */
-	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
-		this.database = database;
-		this.info = info;
-		this._log = _log;
-		this.socketManager = S;
-		this.serverSocket = SS;
-		this.lives = lives;
-	}
-
-	/**
-	 * Simply listen on I2P port, and thread connections
-	 *
-	 */
-	public void run() {
-		boolean g = false;
-		I2PSocket sessSocket = null;
-		int conn = 0;
-		try {
-			try {
-				serverSocket.setSoTimeout(50);
-
-				while (lives.get()) {
-					try {
-						sessSocket = serverSocket.accept();
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-					if (g) {
-						g = false;
-						conn++;
-						// toss the connection to a new thread.
-						I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
-						t.start();
-					}
-
-				}
-			} catch (I2PException e) {
-				// bad shit
-				System.out.println("Exception " + e);
-			}
-		} finally {
-			try {
-				serverSocket.close();
-			} catch (I2PException ex) {
-			}
-		// System.out.println("I2Plistener: Close");
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/I2PtoTCP.java

@@ -1,182 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.concurrent.atomic.AtomicBoolean;
-import net.i2p.client.streaming.I2PSocket;
-
-/**
- * Process I2P->TCP
- *
- * @author sponge
- */
-public class I2PtoTCP implements Runnable {
-
-	private I2PSocket I2P;
-	private NamedDB info,  database;
-	private Socket sock;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 *
-	 * @param I2Psock
-	 * @param info
-	 * @param database
-	 */
-	I2PtoTCP(I2PSocket I2Psock, NamedDB info, NamedDB database, AtomicBoolean lives) {
-		this.I2P = I2Psock;
-		this.info = info;
-		this.database = database;
-		this.lives = lives;
-	}
-
-	private void rlock() {
-		database.getReadLock();
-		info.getReadLock();
-	}
-
-	private void runlock() {
-		database.releaseReadLock();
-		info.releaseReadLock();
-	}
-
-	/**
-	 * I2P stream to TCP stream thread starter
-	 *
-	 */
-	public void run() {
-		String host;
-		int port;
-		boolean tell;
-		InputStream in = null;
-		OutputStream out = null;
-		InputStream Iin = null;
-		OutputStream Iout = null;
-		Thread t = null;
-		Thread q = null;
-		try {
-			die:
-			{
-				try {
-					try {
-						rlock();
-					} catch (Exception e) {
-						break die;
-					}
-					try {
-						host = info.get("OUTHOST").toString();
-						port = Integer.parseInt(info.get("OUTPORT").toString());
-						tell = info.get("QUIET").equals(Boolean.FALSE);
-					} catch (Exception e) {
-						runlock();
-						break die;
-					}
-					try {
-						runlock();
-					} catch (Exception e) {
-						break die;
-					}
-					sock = new Socket(host, port);
-					sock.setKeepAlive(true);
-					// make readers/writers
-					in = sock.getInputStream();
-					out = sock.getOutputStream();
-					Iin = I2P.getInputStream();
-					Iout = I2P.getOutputStream();
-					I2P.setReadTimeout(0); // temp bugfix, this *SHOULD* be the default
-
-					if (tell) {
-						// tell who is connecting
-						out.write(I2P.getPeerDestination().toBase64().getBytes());
-						out.write(10); // nl
-						out.flush(); // not really needed, but...
-					}
-					// setup to cross the streams
-					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
-					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
-					// Fire!
-					t.start();
-					q.start();
-					while (t.isAlive() && q.isAlive() && lives.get()) { // AND is used here to kill off the other thread
-						try {
-							Thread.sleep(10); //sleep for 10 ms
-						} catch (InterruptedException e) {
-							break die;
-						}
-					}
-				// System.out.println("I2PtoTCP: Going away...");
-				} catch (Exception e) {
-					// System.out.println("I2PtoTCP: Owch! damn!");
-					break die;
-				}
-			} // die
-		} finally {
-			try {
-				in.close();
-			} catch (Exception ex) {
-			}
-			try {
-				out.close();
-			} catch (Exception ex) {
-			}
-			try {
-				Iin.close();
-			} catch (Exception ex) {
-			}
-			try {
-				Iout.close();
-			} catch (Exception ex) {
-			}
-			try {
-				t.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				q.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				// System.out.println("I2PtoTCP: Close I2P");
-				I2P.close();
-			} catch (Exception e) {
-				tell = false;
-			}
-			//System.out.println("I2PtoTCP: Closed I2P");
-			try {
-				// System.out.println("I2PtoTCP: Close sock");
-				sock.close();
-			} catch (Exception e) {
-				tell = false;
-			}
-		// System.out.println("I2PtoTCP: Done");
-
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/Lifted.java

@@ -1,56 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Sets of "friendly" utilities to make life easier.
- * Any "Lifted" code will apear here, and credits given.
- * It's better to "Lift" a small chunk of "free" code than add in piles of
- * code we don't need, and don't want.
- *
- * @author sponge
- */
-public class Lifted {
-
-	/**
-	 * Copy a set of properties from one Property to another.
-	 * Lifted from Apache Derby code svn repository.
-	 * Liscenced as follows:
-	 * http://svn.apache.org/repos/asf/db/derby/code/trunk/LICENSE
-	 *
-	 * @param src_prop  Source set of properties to copy from.
-	 * @param dest_prop Dest Properties to copy into.
-	 *
-	 **/
-	public static void copyProperties(Properties src_prop, Properties dest_prop) {
-		for (Enumeration propertyNames = src_prop.propertyNames();
-			propertyNames.hasMoreElements();) {
-			Object key = propertyNames.nextElement();
-			dest_prop.put(key, src_prop.get(key));
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/MUXlisten.java

@@ -1,435 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
-import net.i2p.util.Log;
-
-/**
- *
- * Multiplex listeners for TCP and I2P
- *
- * @author sponge
- */
-public class MUXlisten implements Runnable {
-
-	private NamedDB database,  info;
-	private Log _log;
-	private I2PSocketManager socketManager;
-	private ByteArrayInputStream prikey;
-	private ThreadGroup tg;
-	private String N;
-	private ServerSocket listener = null;
-	private int backlog = 50; // should this be more? less?
-	boolean go_out;
-	boolean come_in;
-	private AtomicBoolean lock;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor Will fail if INPORT is occupied.
-	 *
-	 * @param info DB entry for this tunnel
-	 * @param database master database of tunnels
-	 * @param _log
-	 * @throws net.i2p.I2PException
-	 * @throws java.io.IOException
-	 */
-	MUXlisten(AtomicBoolean lock, NamedDB database, NamedDB info, Log _log) throws I2PException, IOException, RuntimeException {
-		try {
-			int port = 0;
-			InetAddress host = null;
-			this.lock = lock;
-			this.tg = null;
-			this.database = database;
-			this.info = info;
-			this._log = _log;
-			lives = new AtomicBoolean(false);
-
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(true));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			this.database.getReadLock();
-			this.info.getReadLock();
-
-			N = this.info.get("NICKNAME").toString();
-			prikey = new ByteArrayInputStream((byte[]) info.get("KEYS"));
-			// Make a new copy so that anything else won't muck with our database.
-			Properties R = (Properties) info.get("PROPERTIES");
-			Properties Q = new Properties();
-			Lifted.copyProperties(R, Q);
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
-
-			this.database.getReadLock();
-			this.info.getReadLock();
-			this.go_out = info.exists("OUTPORT");
-			this.come_in = info.exists("INPORT");
-			if (this.come_in) {
-				port = Integer.parseInt(info.get("INPORT").toString());
-				host = InetAddress.getByName(info.get("INHOST").toString());
-			}
-			this.database.releaseReadLock();
-			this.info.releaseReadLock();
-
-			if (this.come_in) {
-				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();
-			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			throw new IOException(e.toString());
-		} catch (RuntimeException 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 RuntimeException(e);
-		} catch (Exception e) {
-			// Something else went bad.
-			this.database.getWriteLock();
-			this.info.getWriteLock();
-			this.info.add("STARTING", new Boolean(false));
-			this.info.releaseWriteLock();
-			this.database.releaseWriteLock();
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void rlock() throws Exception {
-		database.getReadLock();
-		info.getReadLock();
-	}
-
-	private void runlock() throws Exception {
-		database.releaseReadLock();
-		info.releaseReadLock();
-	}
-
-	private void wlock() throws Exception {
-		database.getWriteLock();
-		info.getWriteLock();
-	}
-
-	private void wunlock() throws Exception {
-		info.releaseWriteLock();
-		database.releaseWriteLock();
-	}
-
-	/**
-	 * MUX sockets, fire off a thread to connect, get destination info, and do I/O
-	 *
-	 */
-	public void run() {
-		I2PServerSocket SS = null;
-		Thread t = null;
-		Thread q = null;
-		try {
-			try {
-				wlock();
-				try {
-					info.add("RUNNING", new Boolean(true));
-				} catch (Exception e) {
-					lock.set(false);
-					wunlock();
-					return;
-				}
-			} catch (Exception e) {
-				lock.set(false);
-				return;
-			}
-			try {
-				wunlock();
-			} catch (Exception e) {
-				lock.set(false);
-				return;
-			}
-//		socketManager.addDisconnectListener(new DisconnectListener());
-			lives.set(true);
-			lock.set(false);
-			quit:
-			{
-				try {
-					tg = new ThreadGroup(N);
-					{
-						// toss the connections to a new threads.
-						// will wrap with TCP and UDP when UDP works
-
-						if (go_out) {
-							// I2P -> TCP
-							SS = socketManager.getServerSocket();
-							I2Plistener conn = new I2Plistener(SS, socketManager, info, database, _log, lives);
-							t = new Thread(tg, conn, "BOBI2Plistener " + N);
-							t.start();
-						}
-
-						if (come_in) {
-							// TCP -> I2P
-							TCPlistener conn = new TCPlistener(listener, socketManager, info, database, _log, lives);
-							q = new Thread(tg, conn, "BOBTCPlistener " + N);
-							q.start();
-						}
-
-						try {
-							wlock();
-							try {
-								info.add("STARTING", new Boolean(false));
-							} catch (Exception e) {
-								wunlock();
-								break quit;
-							}
-						} catch (Exception e) {
-							break quit;
-						}
-						try {
-							wunlock();
-						} catch (Exception e) {
-							break quit;
-						}
-						boolean spin = true;
-						while (spin && lives.get()) {
-							try {
-								Thread.sleep(1000); //sleep for 1 second
-							} catch (InterruptedException e) {
-								break quit;
-							}
-							try {
-								rlock();
-								try {
-									spin = info.get("STOPPING").equals(Boolean.FALSE);
-								} catch (Exception e) {
-									runlock();
-									break quit;
-								}
-							} catch (Exception e) {
-								break quit;
-							}
-							try {
-								runlock();
-							} catch (Exception e) {
-								break quit;
-							}
-						}
-					} // die
-
-				} catch (Exception e) {
-					// System.out.println("MUXlisten: Caught an exception" + e);
-					break quit;
-				}
-			} // quit
-		} finally {
-			lives.set(false);
-			// Some grace time.
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException ex) {
-			}
-			try {
-				wlock();
-				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(true));
-					info.add("RUNNING", new Boolean(false));
-				} catch (Exception e) {
-					lock.set(false);
-					wunlock();
-					return;
-				}
-				wunlock();
-			} catch (Exception e) {
-			}
-			// Start cleanup.
-			while (!lock.compareAndSet(false, true)) {
-				// wait
-			}
-			if (SS != null) {
-				try {
-					SS.close();
-				} catch (I2PException ex) {
-				}
-			}
-			if (listener != null) {
-				try {
-					listener.close();
-				} catch (IOException e) {
-				}
-			}
-
-			// Some grace time.
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException ex) {
-			}
-
-			// Hopefully nuke stuff here...
-			{
-				String boner = tg.getName();
-				try {
-					_log.warn("destroySocketManager " + boner);
-					socketManager.destroySocketManager();
-					_log.warn("destroySocketManager Successful" + boner);
-				} catch (Exception e) {
-					// nop
-					_log.warn("destroySocketManager Failed" + boner);
-					_log.warn(e.toString());
-				}
-			}
-			// zero out everything.
-			try {
-				wlock();
-				try {
-					info.add("STARTING", new Boolean(false));
-					info.add("STOPPING", new Boolean(false));
-					info.add("RUNNING", new Boolean(false));
-				} catch (Exception e) {
-					lock.set(false);
-					wunlock();
-					return;
-				}
-				wunlock();
-			} catch (Exception e) {
-			}
-
-			lock.set(false); // Should we force waiting for all threads??
-
-			// 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.
-				if (tg.activeCount() + tg.activeGroupCount() != 0) {
-					// visit(tg, 0, boner);
-					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");
-					// 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");
-						// }
-						// bar = lives;
-						try {
-							Thread.sleep(100); //sleep for 100 ms (One tenth second)
-						} catch (InterruptedException ex) {
-							// nop
-						}
-					}
-				}
-				// System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner);
-				_log.warn("BOB: MUXlisten: Threads went away. Success: " + boner);
-				tg.destroy();
-				// Zap reference to the ThreadGroup so the JVM can GC it.
-				tg = null;
-			}
-			try {
-				socketManager.destroySocketManager();
-			} catch (Exception e) {
-				// nop
-			}
-
-		}
-	}
-
-
-	// Debugging... None of this is normally used.
-	/**
-	 *	Find the root thread group and print them all.
-	 *
-	 */
-	private void visitAllThreads() {
-		ThreadGroup root = Thread.currentThread().getThreadGroup().getParent();
-		while (root.getParent() != null) {
-			root = root.getParent();
-		}
-
-		// Visit each thread group
-		visit(root, 0, root.getName());
-	}
-
-	/**
-	 * Recursively visits all thread groups under `group' and dumps them.
-	 * @param group ThreadGroup to visit
-	 * @param level Current level
-	 */
-	private static void visit(ThreadGroup group, int level, String tn) {
-		// Get threads in `group'
-		int numThreads = group.activeCount();
-		Thread[] threads = new Thread[numThreads * 2];
-		numThreads = group.enumerate(threads, false);
-		String indent = "------------------------------------".substring(0, level) + "-> ";
-		// Enumerate each thread in `group' and print it.
-		for (int i = 0; i < numThreads; i++) {
-			// Get thread
-			Thread thread = threads[i];
-			System.out.println("BOB: MUXlisten: " + tn + ": " + indent + thread.toString());
-		}
-
-		// Get thread subgroups of `group'
-		int numGroups = group.activeGroupCount();
-		ThreadGroup[] groups = new ThreadGroup[numGroups * 2];
-		numGroups = group.enumerate(groups, false);
-
-		// Recursively visit each subgroup
-		for (int i = 0; i < numGroups; i++) {
-			visit(groups[i], level + 1, groups[i].getName());
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/Main.java

@@ -1,53 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import net.i2p.client.streaming.RetransmissionTimer;
-import net.i2p.util.SimpleScheduler;
-import net.i2p.util.SimpleTimer2;
-
-/**
- * Start from command line
- *
- * @author sponge
- *
- */
-public class Main {
-
-	/**
-	 * @param args the command line arguments, these are not used yet
-	 */
-	public static void main(String[] args) {
-		// THINK THINK THINK THINK THINK THINK
-		RetransmissionTimer Y = RetransmissionTimer.getInstance();
-		SimpleScheduler Y1 = SimpleScheduler.getInstance();
-		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-
-		BOB.main(args);
-
-		Y2.stop();
-		Y1.stop();
-		Y.stop();
-	}
-}

apps/BOB/src/net/i2p/BOB/NamedDB.java

@@ -1,195 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-/**
- * Internal database to relate nicknames to options to values
- *
- * @author sponge
- */
-public class NamedDB {
-
-	private volatile Object[][] data;
-	private volatile int index,  writersWaiting,  readers;
-
-	/**
-	 * make initial NULL object
-	 *
-	 */
-	public NamedDB() {
-		this.data = new Object[1][2];
-		this.index = this.writersWaiting = this.readers = 0;
-	}
-
-	synchronized public void getReadLock() {
-		while ((writersWaiting != 0)) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
-		readers++;
-	}
-
-	synchronized public void releaseReadLock() {
-		readers--;
-		notifyAll();
-	}
-
-	synchronized public void getWriteLock() {
-		writersWaiting++;
-		while (readers != 0 && writersWaiting != 1) {
-			try {
-				wait();
-			} catch (InterruptedException ie) {
-			}
-		}
-	}
-
-	synchronized public void releaseWriteLock() {
-		writersWaiting--;
-		notifyAll();
-	}
-
-	/**
-	 * Find objects in the array, returns it's index or throws exception
-	 * @param key
-	 * @return an objects index
-	 * @throws ArrayIndexOutOfBoundsException when key does not exist
-	 */
-	public int idx(Object key) throws ArrayIndexOutOfBoundsException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return i;
-			}
-		}
-		throw new ArrayIndexOutOfBoundsException("Can't locate key for index");
-	}
-
-	/**
-	 * Delete an object from array if it exists
-	 *
-	 * @param key
-	 */
-	public void kill(Object key) {
-
-		int i, j, k, l;
-		Object[][] olddata;
-		int didsomething = 0;
-
-		try {
-			k = idx(key);
-		} catch (ArrayIndexOutOfBoundsException b) {
-			return;
-		}
-		olddata = new Object[index + 2][2];
-		// copy to olddata, skipping 'k'
-		for (i = 0, l = 0; l < index; i++, l++) {
-			if (i == k) {
-				l++;
-				didsomething++;
-			}
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[l][j];
-			}
-		}
-		index -= didsomething;
-		data = olddata;
-	}
-
-	/**
-	 * Add object to the array, deletes the old one if it exists
-	 *
-	 * @param key
-	 * @param val
-	 */
-	public void add(Object key, Object val) {
-		Object[][] olddata;
-		int i, j;
-		i = 0;
-		kill(key);
-
-		olddata = new Object[index + 2][2];
-		// copy to olddata
-		for (i = 0; i < index; i++) {
-			for (j = 0; j < 2; j++) {
-				olddata[i][j] = data[i][j];
-			}
-		}
-		data = olddata;
-		data[index++] = new Object[]{key, val};
-	}
-
-	/**
-	 * Get the object, and return it, throws RuntimeException
-	 *
-	 * @param key
-	 * @return Object
-	 * @throws java.lang.RuntimeException
-	 */
-	public Object get(Object key) throws RuntimeException {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return data[i][1];
-			}
-		}
-		throw new RuntimeException("Key not found");
-	}
-
-	/**
-	 * returns true if an object exists, else returns false
-	 *
-	 * @param key
-	 * @return true if an object exists, else returns false
-	 */
-	public boolean exists(Object key) {
-		for (int i = 0; i < index; i++) {
-			if (key.equals(data[i][0])) {
-				return true;
-			}
-		}
-		return false;
-
-	}
-
-	/**
-	 *
-	 * @param i index
-	 * @return an indexed Object
-	 * @throws java.lang.RuntimeException
-	 */
-	public Object getnext(int i) throws RuntimeException {
-		if (i < index && i > -1) {
-			return data[i][1];
-		}
-		throw new RuntimeException("No more data");
-	}
-
-	/**
-	 * @return the count of how many objects
-	 */
-	public int getcount() {
-		return index;
-	}
-}

apps/BOB/src/net/i2p/BOB/TCPio.java

@@ -1,135 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Shove data from one stream to the other.
- *
- * @author sponge
- */
-public class TCPio implements Runnable {
-
-	private InputStream Ain;
-	private OutputStream Aout;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 *
-	 * @param Ain InputStream
-	 * @param Aout OutputStream
-	 *
-	 * param database
-	 */
-	TCPio(InputStream Ain, OutputStream Aout, AtomicBoolean lives) {
-		this.Ain = Ain;
-		this.Aout = Aout;
-		this.lives = lives;
-	}
-
-	/**
-	 * Copy from source to destination...
-	 * and yes, we are totally OK to block here on writes,
-	 * The OS has buffers, and I intend to use them.
-	 * We send an interrupt signal to the threadgroup to
-	 * unwedge any pending writes.
-	 *
-	 */
-	public void run() {
-		/*
-		 * NOTE:
-		 * The write method of OutputStream calls the write method of
-		 * one argument on each of the bytes to be written out.
-		 * Subclasses are encouraged to override this method and provide
-		 * a more efficient implementation.
-		 *
-		 * So, is this really a performance problem?
-		 * Should we expand to several bytes?
-		 * I don't believe there would be any gain, since read method
-		 * has the same reccomendations. If anyone has a better way to
-		 * do this, I'm interested in performance improvements.
-		 *
-		 * --Sponge
-		 *
-		 * Tested with 128 bytes, and there was no performance gain.
-		 * 8192 bytes did lower load average across many connections.
-		 * Should I raise it higer? The correct thing to do would be to
-		 * override... perhaps use NTCP, but I2P's streaming lib lacks
-		 * anything NTCP compatable.
-		 *
-		 * --Sponge
-		 */
-
-		int b;
-		byte a[] = new byte[8192];
-		try {
-			try {
-				while (lives.get()) {
-					b = Ain.read(a, 0, 8192);
-					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:
-						 *
-						 * The total number of bytes read into the buffer,
-						 * or -1 if there is no more data because the end of
-						 * the stream has been reached.
-						 *
-						 */
-						// System.out.println("TCPio: End Of Stream");
-						break;
-					}
-				}
-			} catch (Exception e) {
-			}
-		// System.out.println("TCPio: Leaving.");
-		} finally {
-			// Eject!!! Eject!!!
-			//System.out.println("TCPio: Caught an exception " + e);
-			try {
-				Ain.close();
-			} catch (IOException ex) {
-			}
-			try {
-				Aout.close();
-			} catch (IOException ex) {
-			}
-			return;
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/TCPlistener.java

@@ -1,105 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-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;
-import net.i2p.util.Log;
-
-/**
- * Listen on TCP port and connect to I2P
- *
- * @author sponge
- */
-public class TCPlistener implements Runnable {
-
-	private NamedDB info,  database;
-	private Log _log;
-	public I2PSocketManager socketManager;
-	public I2PServerSocket serverSocket;
-	private ServerSocket listener;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param S
-	 * @param info
-	 * @param database
-	 * @param _log
-	 */
-	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Log _log, AtomicBoolean lives) {
-		this.database = database;
-		this.info = info;
-		this._log = _log;
-		this.socketManager = S;
-		this.listener = listener;
-		this.lives = lives;
-	}
-
-	/**
-	 * Simply listen on TCP port, and thread connections
-	 *
-	 */
-	public void run() {
-		boolean g = false;
-		int conn = 0;
-		Socket server = null;
-		try {
-			try {
-				listener.setSoTimeout(50); // We don't block, we cycle and check.
-				while (lives.get()) {
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-					if (g) {
-						conn++;
-						// toss the connection to a new thread.
-						TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives);
-						Thread t = new Thread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
-						t.start();
-						g = false;
-					}
-				}
-			} catch (IOException ioe) {
-			}
-		} finally {
-			try {
-				listener.close();
-			} catch (IOException ex) {
-			}
-		//System.out.println("TCPlistener: " + Thread.currentThread().getName() +  "Done.");
-		}
-	}
-}

apps/BOB/src/net/i2p/BOB/TCPtoI2P.java

@@ -1,245 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.NoRouteToHostException;
-import java.net.Socket;
-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.I2PAppContext;
-
-/**
- *
- * Process TCP->I2P
- *
- * @author sponge
- */
-public class TCPtoI2P implements Runnable {
-
-	private I2PSocket I2P;
-	private NamedDB info,  database;
-	private Socket sock;
-	private I2PSocketManager socketManager;
-	private AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param i2p
-	 * @param socket
-	 * param info
-	 * param database
-	 */
-	TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database, AtomicBoolean lives) {
-		this.sock = socket;
-		this.info = info;
-		this.database = database;
-		this.socketManager = i2p;
-		this.lives = lives;
-	}
-
-	/**
-	 * This is a more forgiving readline,
-	 * it works on unbuffered streams
-	 *
-	 * @param in
-	 * @return line of text as a String
-	 * @throws IOException
-	 */
-	private static String lnRead(InputStream in) throws IOException {
-		String S;
-		int b;
-		char c;
-
-		S = new String();
-
-		while (true) {
-			b = in.read();
-			if (b == 13) {
-				//skip CR
-				continue;
-			}
-			if (b < 20 || b > 126) {
-				// exit on anything not legal
-				break;
-			}
-			c = (char) (b & 0x7f); // We only really give a fuck about ASCII
-			S = new String(S + c);
-		}
-		return S;
-	}
-
-	/**
-	 * Print an error message to out
-	 *
-	 * @param e
-	 * @param out
-	 * @throws java.io.IOException
-	 */
-	private void Emsg(String e, OutputStream out) throws IOException {
-// 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();
-	}
-
-	/**
-	 * TCP stream to I2P stream thread starter
-	 *
-	 */
-	public void run() {
-		String line, input;
-		InputStream Iin = null;
-		OutputStream Iout = null;
-		InputStream in = null;
-		OutputStream out = null;
-		Thread t = null;
-		Thread q = null;
-		try {
-			try {
-
-				in = sock.getInputStream();
-				out = sock.getOutputStream();
-				line = lnRead(in);
-				input = line.toLowerCase();
-				Destination dest = null;
-				if (input.endsWith(".i2p")) {
-					//dest = I2PTunnel.destFromName(input);
-					dest = I2PAppContext.getGlobalContext().namingService().lookup(input);
-					if (dest != null) {
-						line = dest.toBase64();
-					} else {
-						Emsg("Can't find destination: " + input, out);
-						return;
-					}
-				}
-				dest = new Destination();
-				dest.fromBase64(line);
-
-				try {
-					// get a client socket
-					I2P = socketManager.connect(dest);
-					I2P.setReadTimeout(0); // temp bugfix, this *SHOULD* be the default
-					// make readers/writers
-					Iin = I2P.getInputStream();
-					Iout = I2P.getOutputStream();
-					// setup to cross the streams
-					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
-					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
-					// Fire!
-					t.start();
-					q.start();
-					while (t.isAlive() && q.isAlive() && lives.get()) { // AND is used here to kill off the other thread
-						Thread.sleep(10); //sleep for 10 ms
-					}
-				} catch (I2PException e) {
-					Emsg(e.toString(), out);
-				} catch (ConnectException e) {
-					Emsg(e.toString(), out);
-				} catch (NoRouteToHostException e) {
-					Emsg(e.toString(), out);
-				}
-
-			} catch (InterruptedIOException e) {
-				// We're breaking away.
-			} catch (InterruptedException e) {
-				// ditto
-			} catch (IOException e) {
-				try {
-					Emsg(e.toString(), out);
-				} catch (IOException ex) {
-					// ditto
-				}
-			} catch (DataFormatException e) {
-				try {
-					Emsg(e.toString(), out);
-				} catch (IOException ex) {
-					// ditto
-				}
-			}
-
-		} finally {
-			try {
-				t.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				q.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				in.close();
-			} catch (Exception e) {
-			}
-			try {
-				out.close();
-			} catch (Exception e) {
-			}
-			try {
-				Iin.close();
-			} catch (Exception e) {
-			}
-			try {
-				Iout.close();
-			} catch (Exception e) {
-			}
-			try {
-				// System.out.println("TCPtoI2P: Close I2P");
-				I2P.close();
-			} catch (Exception e) {
-			}
-
-			try {
-				// System.out.println("TCPtoI2P: Close sock");
-				sock.close();
-			} catch (Exception e) {
-			}
-		}
-	// System.out.println("TCPtoI2P: Done.");
-	}
-}

apps/BOB/src/net/i2p/BOB/UDPIOthread.java

@@ -1,144 +0,0 @@
-/**
- *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
- *                    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...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and liscense questions.
- */
-package net.i2p.BOB;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import net.i2p.client.I2PSession;
-import net.i2p.client.I2PSessionException;
-import net.i2p.client.I2PSessionListener;
-import net.i2p.data.Destination;
-import net.i2p.util.Log;
-
-/**
- * UDP IO on I2P
- *
- *  FIX ME: Untested, and incomplete!
- *  I have no personal need to UDP yet,
- *  however alot of p2p apps pretty much demand it.
- *  The skeletal frame is here, just needs to be finished.
- *
- * @author sponge
- */
-public class UDPIOthread implements I2PSessionListener, Runnable {
-
-	private NamedDB info;
-	private Log _log;
-	private Socket socket;
-	private DataInputStream in;
-	private DataOutputStream out;
-	private I2PSession _session;
-	private Destination _peerDestination;
-	private boolean up;
-
-	/**
-	 * Constructor
-	 * @param info
-	 * @param _log
-	 * @param socket
-	 * @param _session
-	 */
-	UDPIOthread(NamedDB info, Log _log, Socket socket, I2PSession _session) {
-		this.info = info;
-		this._log = _log;
-		this.socket = socket;
-		this._session = _session;
-
-	}
-
-	/**
-	 *
-	 */
-	public void run() {
-		byte data[] = new byte[1024];
-		up = true;
-		try {
-			in = new DataInputStream(socket.getInputStream());
-			out = new DataOutputStream(socket.getOutputStream());
-			while (up) {
-				int c = in.read(data);
-				// Note: could do a loopback test here with a wrapper.
-				boolean ok = _session.sendMessage(_peerDestination, data, 0, c);
-
-				if (!ok) {
-					up = false; // Is this the right thing to do??
-				}
-			}
-		} 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 {
-			if (_session != null) {
-				try {
-					_session.destroySession();
-				} catch (I2PSessionException ise) {
-					// ignored
-				}
-			}
-		}
-	}
-
-	/**
-	 *
-	 * @param session
-	 * @param msgId
-	 * @param size
-	 */
-	public void messageAvailable(I2PSession session, int msgId, long size) {
-//		_log.debug("Message available: id = " + msgId + " size = " + size);
-		try {
-			byte msg[] = session.receiveMessage(msgId);
-			out.write(msg);
-			out.flush();
-		} catch (I2PSessionException ise) {
-			up = false;
-		} catch (IOException ioe) {
-			up = false;
-		}
-	}
-
-	// Great, can these be used to kill ourselves.
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of disconnect */
-	public void disconnected(I2PSession session) {
-		_log.debug("Disconnected");
-	// up = false;
-	}
-
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of error */
-	public void errorOccurred(I2PSession session, String message, Throwable error) {
-		_log.debug("Error occurred: " + message, error);
-	// up = false;
-	}
-
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of abuse */
-	public void reportAbuse(I2PSession session, int severity) {
-		_log.debug("Abuse reported of severity " + severity);
-	// up = false;
-	}
-}

apps/BOB/src/net/i2p/BOB/license-WTFPL.txt

@@ -1,21 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    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...
-
-	http://sam.zoy.org/wtfpl/
-	and
-	http://en.wikipedia.org/wiki/WTFPL
-
-...for any additional details and license questions.

apps/BOB/src/net/i2p/BOB/package.html

@@ -1,5 +0,0 @@
-<html>
-  <body>
-	  <p>BOB, the Basic Open Bridge, allows TCP applications to talk over I2P.</p>  
-  </body>
-</html>

apps/addressbook/README.txt

@@ -1,43 +0,0 @@
-addressbook v2.0.2 - A simple name resolution mechanism for I2P
-
-addressbook is a simple implementation of subscribable address books for I2P.  
-Addresses are stored in userhosts.txt and a second copy of the address book is 
-placed on your eepsite as hosts.txt. 
-
-subscriptions.txt contains a list of urls to check for new addresses.
-Since the urls are checked in order, and conflicting addresses are not added,
-addressbook.subscriptions can be considered to be ranked in order of trust.
-
-The system created by addressbook is similar to the early days of DNS,
-when everyone ran a local name server.  The major difference is the lack of
-authority.  Name cannot be guaranteed to be globally unique, but in practise 
-they probably will be, for a variety of social reasons.
-
-Requirements
-************
-
-i2p with a running http proxy
-
-Installation and Usage
-**********************
-
-1. Unzip addressbook-%ver.zip into your i2p directory. 
-2. Restart your router.
-
-The addressbook daemon will automatically run while the router is up.
-
-Aside from the daemon itself, the other elements of the addressbook interface
-are the config.txt, myhosts.txt, and subscriptions.txt files found in the addressbook 
-directory. 
-
-config.txt is the configuration file for addressbook.
-
-myhosts.txt is the addressbook master address book.  Addresses placed in this file 
-take precidence over those in the router address book and in remote address books.  
-If changes are made to this file, they will be reflected in the router address book 
-and published address book after the next update. Do not make changes directly to the 
-router address book, as they could be lost during an update.
-
-subscriptions.txt is the subscription list for addressbook.  Each entry is an absolute 
-url to a file in hosts.txt format. Since the list is checked in order, url's should be 
-listed in order of trust.

apps/addressbook/build.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<project name="addressbook" default="war" basedir=".">
-
-	<property name="src" value="java/src"/>
-	<property name="build" value="build"/>
-	<property name="dist"  location="dist"/>
-	<property name="jar" value="addressbook.jar"/>
-	<property name="war" value="addressbook.war"/>
-	<property name="javac.compilerargs" value="" />
-	
-	<target name="init">
-		<mkdir dir="${build}"/>
-		<mkdir dir="${dist}"/>
-	</target>
-
-	<target name="clean">
-		<delete dir="${build}"/>
-		<delete dir="${dist}"/>
-	</target>
-
-	<target name="distclean" depends="clean" />
-
-        <condition property="depend.available">
-            <typefound name="depend" />
-        </condition>
-        <target name="depend" if="depend.available">
-            <depend
-                cache="../../build"
-                srcdir="${src}"
-                destdir="${build}" >
-                <!-- Depend on classes instead of jars where available -->
-                <classpath>
-                    <pathelement location="../../core/java/build/obj" />
-                    <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-                </classpath>
-            </depend>
-        </target>
-
-	<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>
-                <pathelement location="../../core/java/build/i2p.jar" />
-                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
-            </classpath>
-		</javac>
-	</target>
-
-        <!-- unused for now, as we oddly ship addressbook as a .war -->
-	<target name="jar" depends="compile, changes">
-		<jar basedir="${build}" destfile="${dist}/${jar}">
-			<manifest>
-				<attribute name="Main-Class" value="addressbook.Daemon"/>
-		                <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, 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}">
-			<manifest>
-		                <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>
-	
-	<target name="warUpToDate">
-	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
-		            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
-	        </uptodate>
-	</target>
-
-	<target name="changes">
-	        <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>

apps/addressbook/config.txt

@@ -1,48 +0,0 @@
-# This is the configuration file for addressbook.
-#
-# Options
-# *******
-# All paths are realitive to i2p/addressbook.  Default value for
-# each option is given in parentheses.
-#
-# proxy_host                 The hostname of your I2P http proxy. 
-#                            (localhost)
-#
-# proxy_port                 The port of your I2P http proxy. (4444)
-#
-# master_addressbook         The path to your master address book, used for local
-#                            changes only. (myhosts.txt)
-#
-# router_addressbook         The path to the address book used by the router.  
-#                            Contains the addresses from your master address book
-#                            and your subscribed address books. (../userhosts.txt)
-#
-# private_addressbook        The path to the private address book used by the router.  
-#                            This is used only by the router and SusiDNS.
-#                            It is not published by addressbook. (../privatehosts.txt)
-#
-# published_addressbook      The path to the copy of your address book made 
-#                            available on i2p. (../eepsite/docroot/hosts.txt)
-#
-# log                        The path to your addressbook log. (log.txt)
-#
-# subscriptions              The path to your subscription file. (subscriptions.txt)
-#
-# etags                      The path to the etags header storage file. (etags)
-#
-# last_modified              The path to the last-modified header storage file. 
-#                            (last_modified)
-#
-# update_delay               The time (in hours) between each update. (1)
-
-proxy_host=localhost
-proxy_port=4444
-master_addressbook=myhosts.txt
-router_addressbook=../userhosts.txt
-private_addressbook=../privatehosts.txt
-published_addressbook=../eepsite/docroot/hosts.txt
-log=log.txt
-subscriptions=subscriptions.txt
-etags=etags
-last_modified=last_modified
-update_delay=1

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -1,274 +0,0 @@
-/*
- * 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.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import net.i2p.I2PAppContext;
-import net.i2p.util.EepGet;
-
-/**
- * An address book for storing human readable names mapped to base64 i2p
- * destinations. AddressBooks can be created from local and remote files, merged
- * together, and written out to local files.
- * 
- * @author Ragnarok
- *  
- */
-class AddressBook {
-
-    private String location;
-
-    private Map addresses;
-
-    private boolean modified;
-
-    /**
-     * Construct an AddressBook from the contents of the Map addresses.
-     * 
-     * @param addresses
-     *            A Map containing human readable addresses as keys, mapped to
-     *            base64 i2p destinations.
-     */
-    public AddressBook(Map addresses) {
-        this.addresses = addresses;
-    }
-
-    /*
-     * Construct an AddressBook from the contents of the file at url. If the
-     * remote file cannot be read, construct an empty AddressBook
-     * 
-     * @param url
-     *            A URL pointing at a file with lines in the format "key=value",
-     *            where key is a human readable name, and value is a base64 i2p
-     *            destination.
-     */
-/* unused
-    public AddressBook(String url, String proxyHost, int proxyPort) {
-        this.location = url;
-        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
-                proxyHost, proxyPort, 0, "addressbook.tmp", url, true, 
-                null);
-        get.fetch();
-        try {
-            this.addresses = ConfigParser.parse(new File("addressbook.tmp"));
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-        new File("addressbook.tmp").delete();
-    }
-*/
-    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.
-     * 
-     * @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");
-        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());
-            subscription.setLastFetched(I2PAppContext.getGlobalContext().clock().now());
-        }
-        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
-     * 
-     * @param file
-     *            A File pointing at a file with lines in the format
-     *            "key=value", where key is a human readable name, and value is
-     *            a base64 i2p destination.
-     */
-    public AddressBook(File file) {
-        this.location = file.toString();
-        try {
-            this.addresses = ConfigParser.parse(file);
-        } catch (IOException exp) {
-            this.addresses = new HashMap();
-        }
-    }
-
-    /**
-     * 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.
-     */
-    public Map getAddresses() {
-        return this.addresses;
-    }
-
-    /**
-     * Return the location of the file this AddressBook was constructed from.
-     * 
-     * @return A String representing either an abstract path, or a url,
-     *         depending on how the instance was constructed.
-     */
-    public String getLocation() {
-        return this.location;
-    }
-
-    /**
-     * Return a string representation of the contents of the AddressBook.
-     * 
-     * @return A String representing the contents of the AddressBook.
-     */
-    @Override
-    public String toString() {
-        return this.addresses.toString();
-    }
-
-    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
-     * hostname was already converted to lower case by ConfigParser.parse()
-     */
-    private static boolean valid(String host, String dest) {
-	return
-		host.endsWith(".i2p") &&
-		host.length() > 4 &&
-		host.length() <= 67 &&          // 63 + ".i2p"
-                (! host.startsWith(".")) &&
-                (! host.startsWith("-")) &&
-                host.indexOf(".-") < 0 &&
-                host.indexOf("-.") < 0 &&
-		host.indexOf("..") < 0 &&
-                // IDN - basic check, not complete validation
-                (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
-                host.replaceAll("[a-z0-9.-]", "").length() == 0 &&
-                // Base32 spoofing (52chars.i2p)
-                (! (host.length() == 56 && host.substring(0,52).replaceAll("[a-z2-7]", "").length() == 0)) &&
-                // ... or maybe we do Base32 this way ...
-                (! host.equals("b32.i2p")) &&
-                (! host.endsWith(".b32.i2p")) &&
-                // some reserved names that may be used for local configuration someday
-                (! host.equals("proxy.i2p")) &&
-                (! host.equals("router.i2p")) &&
-                (! host.equals("console.i2p")) &&
-                (! host.endsWith(".proxy.i2p")) &&
-                (! host.endsWith(".router.i2p")) &&
-                (! host.endsWith(".console.i2p")) &&
-
-                // 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
-                ;	
-    }
-
-    /**
-     * Merge this AddressBook with AddressBook other, writing messages about new
-     * addresses or conflicts to log. Addresses in AddressBook other that are
-     * not in this AddressBook are added to this AddressBook. In case of a
-     * conflict, addresses in this AddressBook take precedence
-     * 
-     * @param other
-     *            An AddressBook to merge with.
-     * @param overwrite True to overwrite
-     * @param log
-     *            The log to write messages about new addresses or conflicts to.
-     */
-    public void merge(AddressBook other, boolean overwrite, Log log) {
-        Iterator otherIter = other.addresses.keySet().iterator();
-
-        while (otherIter.hasNext()) {
-            String otherKey = (String) otherIter.next();
-            String otherValue = (String) other.addresses.get(otherKey);
-
-            if (valid(otherKey, otherValue)) {
-                if (this.addresses.containsKey(otherKey) && !overwrite) {
-                    if (!this.addresses.get(otherKey).equals(otherValue)
-                            && log != null) {
-                        log.append("Conflict for " + otherKey + " from "
-                                + other.location
-                                + ". Destination in remote address book is "
-                                + otherValue);
-                    }
-                } else if (!this.addresses.containsKey(otherKey)
-                            || !this.addresses.get(otherKey).equals(otherValue)) {
-                    this.addresses.put(otherKey, otherValue);
-                    this.modified = true;
-                    if (log != null) {
-                        log.append("New address " + otherKey
-                            + " added to address book. From: " + other.location);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Write the contents of this AddressBook out to the File file. If the file
-     * cannot be writen to, this method will silently fail.
-     * 
-     * @param file
-     *            The file to write the contents of this AddressBook too.
-     */
-    public void write(File file) {
-        if (this.modified) {
-            try {
-                ConfigParser.write(this.addresses, file);
-            } catch (IOException exp) {
-                System.err.println("Error writing addressbook " + file.getAbsolutePath() + " : " + exp.toString());
-            }
-        }
-    }
-
-    /**
-     * 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.
-     */
-    public void write() {
-        this.write(new File(this.location));
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java

@@ -1,349 +0,0 @@
-/*
- * 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.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-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.Map;
-
-import net.i2p.util.SecureFile;
-import net.i2p.util.SecureFileOutputStream;
-
-/**
- * Utility class providing methods to parse and write files in config file
- * format, and subscription file format.
- * 
- * TODO: Change file encoding from default to UTF-8?
- *       Or switch to the DataHelper loadProps/storeProps methods?
- * 
- * @author Ragnarok
- */
-class ConfigParser {
-
-    private static final boolean isWindows = System.getProperty("os.name").startsWith("Win");
-
-    /**
-     * Strip the comments from a String. Lines that begin with '#' and ';' are
-     * considered comments, as well as any part of a line after a '#'.
-     * 
-     * @param inputLine
-     *            A String to strip comments from.
-     * @return A String without comments, but otherwise identical to inputLine.
-     */
-    public static String stripComments(String inputLine) {
-        if (inputLine.startsWith(";")) {
-            return "";
-        }
-        if (inputLine.split("#").length > 0) {
-            return inputLine.split("#")[0];
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Return a Map using the contents of BufferedReader input. input must have
-     * a single key, value pair on each line, in the format: key=value. Lines
-     * starting with '#' or ';' are considered comments, and ignored. Lines that
-     * are obviously not in the format key=value are also ignored.
-     * The key is converted to lower case.
-     * 
-     * @param input
-     *            A BufferedReader with lines in key=value format to parse into
-     *            a Map.
-     * @return A Map containing the key, value pairs from input.
-     * @throws IOException
-     *             if the BufferedReader cannot be read.
-     *  
-     */
-    public static Map parse(BufferedReader input) throws IOException {
-        Map 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());
-            }
-            inputLine = input.readLine();
-        }
-        input.close();
-        return result;
-    }
-
-    /**
-     * Return a Map using the contents of the File file. See parseBufferedReader
-     * for details of the input format.
-     * 
-     * @param file
-     *            A File to parse.
-     * @return A Map containing the key, value pairs from file.
-     * @throws IOException
-     *             if file cannot be read.
-     */
-    public static Map parse(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        Map rv = ConfigParser.parse(input);
-        try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
-    }
-
-    /**
-     * Return a Map using the contents of the String string. See
-     * parseBufferedReader for details of the input format.
-     * 
-     * @param string
-     *            A String to parse.
-     * @return A Map containing the key, value pairs from string.
-     * @throws IOException
-     *             if file cannot be read.
-     */
-    public static Map parse(String string) throws IOException {
-        StringReader stringReader = new StringReader(string);
-        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parse(input);
-    }
-    
-    /**
-     * Return a Map using the contents of the File file. If file cannot be read,
-     * use map instead, and write the result to where file should have been.
-     * 
-     * @param file
-     *            A File to attempt to parse.
-     * @param map
-     *            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;
-        try {
-            result = ConfigParser.parse(file);
-            for (Iterator iter = map.keySet().iterator(); iter.hasNext(); ) {
-                String key = (String) iter.next();
-                if (!result.containsKey(key))
-                    result.put(key, map.get(key));
-            }
-        } catch (IOException exp) {
-            result = map;
-            try {
-                ConfigParser.write(result, file);
-            } catch (IOException exp2) {
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return a List where each element is a line from the BufferedReader input.
-     * 
-     * @param input
-     *            A BufferedReader to parse.
-     * @return A List consisting of one element for each line in input.
-     * @throws IOException
-     *             if input cannot be read.
-     */
-    public static List parseSubscriptions(BufferedReader input)
-            throws IOException {
-        List result = new LinkedList();
-        String inputLine = input.readLine();
-        while (inputLine != null) {
-            inputLine = ConfigParser.stripComments(inputLine).trim();
-            if (inputLine.length() > 0) {
-                result.add(inputLine);
-            }
-            inputLine = input.readLine();
-        }
-        input.close();
-        return result;
-    }
-
-    /**
-     * Return a List where each element is a line from the File file.
-     * 
-     * @param file
-     *            A File to parse.
-     * @return A List consisting of one element for each line in file.
-     * @throws IOException
-     *             if file cannot be read.
-     */
-    public static List parseSubscriptions(File file) throws IOException {
-        FileInputStream fileStream = new FileInputStream(file);
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                fileStream));
-        List rv = ConfigParser.parseSubscriptions(input);
-        try {
-            fileStream.close();
-        } catch (IOException ioe) {}
-        return rv;
-    }
-
-    /**
-     * Return a List where each element is a line from the String string.
-     * 
-     * @param string
-     *            A String to parse.
-     * @return A List consisting of one element for each line in string.
-     * @throws IOException
-     *             if string cannot be read.
-     */
-    public static List parseSubscriptions(String string) throws IOException {
-        StringReader stringReader = new StringReader(string);
-        BufferedReader input = new BufferedReader(stringReader);
-        return ConfigParser.parseSubscriptions(input);
-    }
-    
-    /**
-     * Return a List using the contents of the File file. If file cannot be
-     * read, use list instead, and write the result to where file should have
-     * been.
-     * 
-     * @param file
-     *            A File to attempt to parse.
-     * @param list list of files to parse
-     * @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;
-        try {
-            result = ConfigParser.parseSubscriptions(file);
-        } catch (IOException exp) {
-            result = list;
-            try {
-                ConfigParser.writeSubscriptions(result, file);
-            } catch (IOException exp2) {
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Write contents of Map map to BufferedWriter output. Output is written
-     * with one key, value pair on each line, in the format: key=value.
-     * 
-     * @param map
-     *            A Map to write to output.
-     * @param output
-     *            A BufferedWriter to write the Map to.
-     * @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));
-            output.newLine();
-        }
-        output.close();
-    }
-
-    /**
-     * 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
-     *            A File to write the Map to.
-     * @throws IOException
-     *             if file cannot be written to.
-     */
-    public static void write(Map 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")));
-        }
-    }
-
-    /**
-     * Write contents of List list to BufferedReader output. Output is written
-     * with each element of list on a new line.
-     * 
-     * @param list
-     *            A List to write to file.
-     * @param output
-     *            A BufferedReader to write list to.
-     * @throws IOException
-     *             if output cannot be written to.
-     */
-    public static void writeSubscriptions(List list, BufferedWriter output)
-            throws IOException {
-        Iterator iter = list.iterator();
-
-        while (iter.hasNext()) {
-            output.write((String) iter.next());
-            output.newLine();
-        }
-        output.close();
-    }
-    
-    /**
-     * Write contents of List list to File file. Output is written with each
-     * element of list on a new line.
-     * 
-     * @param list
-     *            A List to write to file.
-     * @param file
-     *            A File to write list to.
-     * @throws IOException
-     *             if output cannot be written to.
-     */
-    public static void writeSubscriptions(List list, File file)
-            throws IOException {
-        ConfigParser.writeSubscriptions(list, new BufferedWriter(
-                new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
-    }
-
-}

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -1,216 +0,0 @@
-/*
- * 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.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import net.i2p.I2PAppContext;
-import net.i2p.util.SecureDirectory;
-
-/**
- * Main class of addressbook.  Performs updates, and runs the main loop.
- * 
- * @author Ragnarok
- *
- */
-public class Daemon {
-    public static final String VERSION = "2.0.4";
-    private static final Daemon _instance = new Daemon();
-    private boolean _running;
-    
-    /**
-     * Update the router and published address books using remote data from the
-     * subscribed address books listed in subscriptions.
-     * 
-     * @param master
-     *            The master AddressBook. This address book is never
-     *            overwritten, so it is safe for the user to write to.
-     * @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.
-     * @param subscriptions
-     *            A SubscriptionList listing the remote address books to update
-     *            from.
-     * @param log
-     *            The log to write changes and conflicts to.
-     */
-    public void update(AddressBook master, AddressBook router,
-            File published, SubscriptionList subscriptions, Log log) {
-        router.merge(master, true, null);
-        Iterator iter = subscriptions.iterator();
-        while (iter.hasNext()) {
-            // yes, the EepGet fetch() is done in next()
-            router.merge((AddressBook) iter.next(), false, log);
-        }
-        router.write();
-        if (published != null)
-            router.write(published);
-        subscriptions.write();
-    }
-
-    /**
-     * Run an update, using the Map settings to provide the parameters.
-     * 
-     * @param settings
-     *            A Map containg the parameters needed by update.
-     * @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"));
-        File published = null;
-        if ("true".equals(settings.get("should_publish"))) 
-            published = new File(home, (String) settings
-                .get("published_addressbook"));
-        File subscriptionFile = new File(home, (String) 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
-                .get("last_modified"));
-        File lastFetchedFile = new File(home, (String) settings
-                .get("last_fetched"));
-        long delay;
-        try {
-            delay = Long.parseLong((String) settings.get("update_delay"));
-        } catch (NumberFormatException nfe) {
-            delay = 12;
-        }
-        delay *= 60 * 60 * 1000;
-
-        AddressBook master = new AddressBook(masterFile);
-        AddressBook router = new AddressBook(routerFile);
-        
-        List 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, lastFetchedFile, delay, defaultSubs, (String) settings
-                .get("proxy_host"), Integer.parseInt((String) settings.get("proxy_port")));
-        Log log = new Log(logFile);
-
-        update(master, router, published, subscriptions, log);
-    }
-
-    /**
-     * Load the settings, set the proxy, then enter into the main loop. The main
-     * loop performs an immediate update, and then an update every number of
-     * hours, as configured in the settings file.
-     * 
-     * @param args
-     *            Command line arguments. If there are any arguments provided,
-     *            the first is taken as addressbook's home directory, and the
-     *            others are ignored.
-     */
-    public static void main(String[] args) {
-        _instance.run(args);
-    }
-    
-    public void run(String[] args) {
-        _running = true;
-        String settingsLocation = "config.txt";
-        File homeFile;
-        if (args.length > 0) {
-            homeFile = new SecureDirectory(args[0]);
-            if (!homeFile.isAbsolute())
-                homeFile = new SecureDirectory(I2PAppContext.getGlobalContext().getRouterDir(), args[0]);
-        } else {
-            homeFile = new SecureDirectory(System.getProperty("user.dir"));
-        }
-        
-        Map defaultSettings = new HashMap();
-        defaultSettings.put("proxy_host", "127.0.0.1");
-        defaultSettings.put("proxy_port", "4444");
-        defaultSettings.put("master_addressbook", "../userhosts.txt");
-        defaultSettings.put("router_addressbook", "../hosts.txt");
-        defaultSettings.put("published_addressbook", "../eepsite/docroot/hosts.txt");
-        defaultSettings.put("should_publish", "false");
-        defaultSettings.put("log", "log.txt");
-        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");
-        
-        if (!homeFile.exists()) {
-            boolean created = homeFile.mkdirs();
-            if (created)
-                System.out.println("INFO:  Addressbook directory " + homeFile.getName() + " created");
-            else
-                System.out.println("ERROR: Addressbook directory " + homeFile.getName() + " could not be created");
-        }
-        
-        File settingsFile = new File(homeFile, settingsLocation);
-        
-        Map settings = ConfigParser.parse(settingsFile, defaultSettings);
-        // wait
-        try {
-            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"));
-            if (delay < 1) {
-                delay = 1;
-            }
-            
-            update(settings, homeFile.getAbsolutePath());
-            try {
-                synchronized (this) {
-                    wait(delay * 60 * 60 * 1000);
-                }
-            } catch (InterruptedException exp) {
-            }
-            if (!_running)
-                break;
-            settings = ConfigParser.parse(settingsFile, defaultSettings);
-        }
-    }
- 
-    /**
-     * Call this to get the addressbook to reread its config and 
-     * refetch its subscriptions.
-     */
-    public static void wakeup() {
-        synchronized (_instance) {
-            _instance.notifyAll();
-        }
-    }
-
-    public static void stop() {
-        _instance._running = false;
-        wakeup();
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java

@@ -1,59 +0,0 @@
-/*
- * 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;
-
-/**
- * A thread that waits five minutes, then runs the addressbook daemon.  
- * 
- * @author Ragnarok
- *
- */
-class DaemonThread extends Thread {
-
-    private String[] args;
-
-    /**
-     * Construct a DaemonThread with the command line arguments args.
-     * @param args
-     * A String array to pass to Daemon.main().
-     */
-    public DaemonThread(String[] args) {
-        this.args = args;
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Runnable#run()
-     */
-    @Override
-    public void run() {
-        //try {
-        //    Thread.sleep(5 * 60 * 1000);
-        //} catch (InterruptedException exp) {
-        //}
-        Daemon.main(this.args);
-    }
-
-    public void halt() {
-        Daemon.stop();
-        interrupt();
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/Log.java

@@ -1,79 +0,0 @@
-/*
- * 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.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-
-/**
- * A simple log with automatic time stamping.
- * 
- * @author Ragnarok
- *  
- */
-class Log {
-
-    private File file;
-
-    /**
-     * Construct a Log instance that writes to the File file.
-     * 
-     * @param file
-     *            A File for the log to write to.
-     */
-    public Log(File file) {
-        this.file = file;
-    }
-
-    /**
-     * Write entry to a new line in the log, with appropriate time stamp.
-     * 
-     * @param entry
-     *            A String containing a message to append to the log.
-     */
-    public void append(String entry) {
-        BufferedWriter bw = null;
-        try {
-            bw = new BufferedWriter(new FileWriter(this.file,
-                    true));
-            String timestamp = new Date().toString();
-            bw.write(timestamp + " -- " + entry);
-            bw.newLine();
-        } catch (IOException exp) {
-        } finally {
-            if (bw != null)
-                try { bw.close(); } catch (IOException ioe) {}
-        }
-    }
-
-    /**
-     * Return the File that the Log is writing to.
-     * 
-     * @return The File that the log is writing to.
-     */
-    public File getFile() {
-        return this.file;
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/Servlet.java

@@ -1,96 +0,0 @@
-/*
- * 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.IOException;
-import java.io.PrintWriter;
-import java.util.Random;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A wrapper for addressbook to allow it to be started as a web application.
- * 
- * This was a GenericServlet, we make it an HttpServlet solely to provide a hook
- * for SusiDNS to wake us up when the subscription list changes.
- * 
- * @author Ragnarok
- *
- */
-public class Servlet extends HttpServlet {
-    private DaemonThread thread;
-    private String nonce;
-    private static final String PROP_NONCE = "addressbook.nonce";
-
-    /**
-     * Hack to allow susidns to kick the daemon when the subscription list changes.
-     * URL must be /addressbook/ with wakeup param set, and nonce param set from system property.
-     *
-     * (non-Javadoc)
-     * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
-     */
-    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 {
-            PrintWriter out = response.getWriter();
-            out.write("I2P addressbook OK");
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    @Override
-    public void init(ServletConfig config) {
-        try {
-            super.init(config);
-        } catch (ServletException exp) {
-            System.err.println("Addressbook init exception: " + exp);
-        }
-        this.nonce = "" + Math.abs((new Random()).nextLong());
-        // put the nonce where susidns can get it
-        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: config root under " + args[0]);
-    }
-
-    @Override
-    public void destroy() {
-        this.thread.halt();
-        super.destroy();
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/Subscription.java

@@ -1,122 +0,0 @@
-/*
- * 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;
-
-/**
- * A subscription to a remote address book.
- * 
- * @author Ragnarok
- *  
- */
-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
-     * was last read at the time represented by etag and lastModified.
-     * 
-     * @param location
-     *            A String representing a url to a remote address book.
-     * @param etag
-     *            The etag header that we recieved the last time we read this
-     *            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, String lastFetched) {
-        this.location = location;
-        this.etag = etag;
-        this.lastModified = lastModified;
-        if (lastFetched != null) {
-            try {
-                this.lastFetched = Long.parseLong(lastFetched);
-            } catch (NumberFormatException nfe) {}
-        }
-    }
-
-    /**
-     * Return the location this Subscription points at.
-     * 
-     * @return A String representing a url to a remote address book.
-     */
-    public String getLocation() {
-        return this.location;
-    }
-
-    /**
-     * Return the etag header that we recieved the last time we read this
-     * subscription.
-     * 
-     * @return A String containing the etag header.
-     */
-    public String getEtag() {
-        return this.etag;
-    }
-
-    /**
-     * Set the etag header.
-     * 
-     * @param etag
-     *            A String containing the etag header.
-     */
-    public void setEtag(String etag) {
-        this.etag = etag;
-    }
-
-    /**
-     * Return the last-modified header that we recieved the last time we read
-     * this subscription.
-     * 
-     * @return A String containing the last-modified header.
-     */
-    public String getLastModified() {
-        return this.lastModified;
-    }
-
-    /**
-     * Set the last-modified header.
-     * 
-     * @param lastModified
-     *            A String containing the last-modified header.
-     */
-    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;
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java

@@ -1,95 +0,0 @@
-/*
- * 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.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import net.i2p.I2PAppContext;
-import net.i2p.data.DataHelper;  // debug
-
-/**
- * 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
- */
-class SubscriptionIterator implements Iterator {
-
-    private Iterator 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, long delay, String proxyHost, int proxyPort) {
-        this.subIterator = subscriptions.iterator();
-        this.delay = delay;
-        this.proxyHost = proxyHost;
-        this.proxyPort = proxyPort;
-    }
-
-    
-    /* (non-Javadoc)
-     * @see java.util.Iterator#hasNext()
-     */
-    public boolean hasNext() {
-        return this.subIterator.hasNext();
-    }
-
-    /**
-     * 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();
-        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)
-     * @see java.util.Iterator#remove()
-     */
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}

apps/addressbook/java/src/net/i2p/addressbook/SubscriptionList.java

@@ -1,150 +0,0 @@
-/*
- * 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.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;
-
-/**
- * A list of Subscriptions loaded from a file.
- * 
- * @author Ragnarok
- *  
- */
-class SubscriptionList {
-
-    private List subscriptions;
-
-    private File etagsFile;
-
-    private File lastModifiedFile;
-    private File lastFetchedFile;
-    private final long delay;
-    
-    private String proxyHost;
-    
-    private int proxyPort;
-
-    /**
-     * Construct a SubscriptionList using the urls from locationsFile and, if
-     * available, the etags and last-modified headers loaded from etagsFile and
-     * lastModifiedFile.
-     * 
-     * @param locationsFile
-     *            A file containing one url on each line.
-     * @param etagsFile
-     *            A file containg the etag headers used for conditional GET. The
-     *            file is in the format "url=etag".
-     * @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, File lastFetchedFile, long delay, List 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;
-        Map lastFetched;
-        String location;
-        List locations = ConfigParser.parseSubscriptions(locationsFile, 
-                defaultSubs);
-        try {
-            etags = ConfigParser.parse(etagsFile);
-        } catch (IOException exp) {
-            etags = new HashMap();
-        }
-        try {
-            lastModified = ConfigParser.parse(lastModifiedFile);
-        } catch (IOException exp) {
-            lastModified = new HashMap();
-        }
-        try {
-            lastFetched = ConfigParser.parse(lastFetchedFile);
-        } catch (IOException exp) {
-            lastFetched = 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),
-                                   (String) lastFetched.get(location)));
-        }
-    }
-    
-    /**
-     * Return an iterator over the AddressBooks represented by the Subscriptions
-     * in this SubscriptionList.
-     * 
-     * @return A SubscriptionIterator.
-     */
-    public SubscriptionIterator iterator() {
-        return new SubscriptionIterator(this.subscriptions, this.delay, this.proxyHost, 
-                this.proxyPort);
-    }
-
-    /**
-     * 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();
-        Map lastFetched = new HashMap();
-        while (iter.hasNext()) {
-            sub = (Subscription) iter.next();
-            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) {
-        }
-    }
-}

apps/addressbook/myhosts.txt

@@ -1,10 +0,0 @@
-# addressbook master address book.  Addresses placed in this file take precidence
-# over those in the router address book and in remote address books.  If changes
-# are made to this file, they will be reflected in the router address book and 
-# published address book after the next update.
-#
-# Do not make changes directly to the router address book, as they could be lost
-# during an update.
-#
-# This file takes addresses in the hosts.txt format, i.e.
-# example.i2p=somereallylongbase64thingAAAA

apps/addressbook/subscriptions.txt

@@ -1,7 +0,0 @@
-# Subscription list for addressbook
-#
-# Each entry is an absolute url to a file in hosts.txt format.
-# Since the list is checked in order, url's should be listed in order of trust.
-#
-http://dev.i2p/i2p/hosts.txt
-http://duck.i2p/hosts.txt

apps/addressbook/web.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
-<web-app>
-	<servlet>
-		<servlet-name>addressbook</servlet-name>
-		<servlet-class>net.i2p.addressbook.Servlet</servlet-class>
-		<init-param>
-		    <param-name>home</param-name>
-		    <param-value>./addressbook</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-    <servlet-mapping> 
-      <servlet-name>addressbook</servlet-name>
-      <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>

apps/admin/java/src/net/i2p/router/admin/AdminListener.java

@@ -1,126 +0,0 @@
-package net.i2p.router.admin;
-/*
- * 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.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import net.i2p.router.RouterContext;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Listen for connections on the specified port, and toss them onto the client manager's
- * set of connections once they are established.
- *
- * @author jrandom
- */
-public class AdminListener implements Runnable {
-    private Log _log;
-    private RouterContext _context;
-    private ServerSocket _socket;
-    private int _port;
-    private boolean _running;
-    private long _nextFailDelay = 1000;
-    
-    public AdminListener(RouterContext context, int port) {
-        _context = context;
-        _log = context.logManager().getLog(AdminListener.class);
-        _port = port;
-        _running = false;
-    }
-    
-    public void restart() {
-        // this works by taking advantage of the auto-retry mechanism in the 
-        // startup() loop (which we reset to wait 1s).  by failing the socket
-        // (through close()) and nulling it, we will have to try to build a new
-        // serverSocket (using the *new* _port)
-        _nextFailDelay = 1000;
-        ServerSocket s = _socket;
-        try {
-            _socket = null;
-            s.close();
-        } catch (IOException ioe) {}
-    }
-    
-    public void setPort(int port) { _port = port; }
-    public int getPort() { return _port; }
-    
-    /** max time to bind */
-    private final static int MAX_FAIL_DELAY = 5*60*1000;
-    
-    /**
-     * Start up the socket listener, listens for connections, and
-     * fires those connections off via {@link #runConnection runConnection}.
-     * This only returns if the socket cannot be opened or there is a catastrophic
-     * failure.
-     *
-     */
-    public void startup() {
-        _running = true;
-        int curDelay = 0;
-        while ( (_running) && (curDelay < MAX_FAIL_DELAY) ) {
-            try {
-                _log.info("Starting up listening for connections on port " + _port);
-                _socket = new ServerSocket(_port);
-                curDelay = 0;
-                while (_running && (_socket != null) )  {
-                    try {
-                        Socket socket = _socket.accept();
-                        _log.debug("Connection received");
-                        runConnection(socket);
-                    } catch (IOException ioe) {
-                        _log.error("Server error accepting", ioe);
-                    } catch (Throwable t) {
-                        _log.error("Fatal error running client listener - killing the thread!", t);
-                        return;
-                    }
-                }
-            } catch (IOException ioe) {
-                _log.error("Error listening on port " + _port, ioe);
-            }
-            
-            if (_socket != null) {
-                try { _socket.close(); } catch (IOException ioe) {}
-                _socket = null;
-            }
-            
-            _log.error("Error listening, waiting " + _nextFailDelay + "ms before we try again");
-            try { Thread.sleep(_nextFailDelay); } catch (InterruptedException ie) {}
-            curDelay += _nextFailDelay;
-            _nextFailDelay *= 5;
-        }
-        
-        _log.error("CANCELING ADMIN LISTENER.  delay = " + curDelay, new Exception("ADMIN LISTENER cancelled!!!"));
-        _running = false;
-    }
-    
-    /**
-     * Handle the connection by passing it off to an AdminRunner
-     *
-     */
-    protected void runConnection(Socket socket) throws IOException {
-        AdminRunner runner = new AdminRunner(_context, socket);
-        I2PThread t = new I2PThread(runner);
-        t.setName("Admin Runner");
-        //t.setPriority(Thread.MIN_PRIORITY);
-        t.setDaemon(true);
-        t.start();
-    }
-    
-    public void shutdown() {
-        _running = false;
-        if (_socket != null) try {
-            _socket.close();
-            _socket = null;
-        } catch (IOException ioe) {}
-    }
-    public void run() { startup(); }
-}

apps/admin/java/src/net/i2p/router/admin/AdminManager.java

@@ -1,67 +0,0 @@
-package net.i2p.router.admin;
-
-import java.io.Writer;
-
-import net.i2p.router.RouterContext;
-import net.i2p.router.Service;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-public class AdminManager implements Service {
-    private Log _log;
-    private RouterContext _context;
-    public final static String PARAM_ADMIN_PORT = "router.adminPort";
-    public final static int DEFAULT_ADMIN_PORT = 7655;
-    
-    private AdminListener _listener;
-    
-    public AdminManager(RouterContext context) {
-        _context = context;
-        _log = context.logManager().getLog(AdminManager.class);
-    }
-    
-    public void renderStatusHTML(Writer out) { }
-    
-    public void shutdown() {
-        if (_listener != null) {
-            _log.info("Shutting down admin listener");
-            _listener.shutdown();
-            _listener = null;
-        }
-    }
-    
-    public void restart() {
-        startup();
-    }
-    
-    public void startup() {
-        int port = DEFAULT_ADMIN_PORT;
-        String str = _context.router().getConfigSetting(PARAM_ADMIN_PORT);
-        if (str != null) {
-            try {
-                int val = Integer.parseInt(str);
-                port = val;
-                _log.info("Starting up admin listener on port " + port);
-            } catch (NumberFormatException nfe) {
-                _log.warn("Invalid admin port specified [" + str + "], using the default " + DEFAULT_ADMIN_PORT, nfe);
-            }
-        } else {
-            _log.warn("Router admin port not specified, using the default " + DEFAULT_ADMIN_PORT);
-        }
-        startup(port);
-    }
-    
-    private void startup(int port) {
-        if (_listener == null) {
-            _listener = new AdminListener(_context, port);
-            I2PThread t = new I2PThread(_listener);
-            t.setName("Admin Listener:" + port);
-            t.setDaemon(true);
-            //t.setPriority(Thread.MIN_PRIORITY);
-            t.start();
-        } else {
-            _listener.setPort(port);
-            _listener.restart();
-        }
-    }
-}

apps/admin/java/src/net/i2p/router/admin/AdminRunner.java

@@ -1,150 +0,0 @@
-package net.i2p.router.admin;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.util.Iterator;
-import java.util.Set;
-
-import net.i2p.data.Hash;
-import net.i2p.router.Router;
-import net.i2p.router.RouterContext;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-class AdminRunner implements Runnable {
-    private Log _log;
-    private RouterContext _context;
-    private Socket _socket;
-    private StatsGenerator _generator;
-    
-    public AdminRunner(RouterContext context, Socket socket) {
-        _context = context;
-        _log = context.logManager().getLog(AdminRunner.class);
-        _socket = socket;
-        _generator = new StatsGenerator(context);
-    }
-    
-    public void run() {
-        try {
-            BufferedReader in = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
-            OutputStream out = _socket.getOutputStream();
-            
-            String command = in.readLine();
-            runCommand(command, out);
-        } catch (IOException ioe) {
-            _log.error("Error running admin command", ioe);
-        }
-    }
-    
-    private void runCommand(String command, OutputStream out) throws IOException {
-        _log.debug("Command [" + command + "]");
-        if (command.indexOf("favicon") >= 0) {
-            reply(out, "this is not a website");
-        } else if ( (command.indexOf("routerStats.html") >= 0) || (command.indexOf("oldstats.jsp") >= 0) ) {
-            try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
-                _generator.generateStatsPage(new OutputStreamWriter(out));
-                out.close();
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Error writing out the admin reply");
-                throw ioe;
-            }
-        } else if (command.indexOf("/profile/") >= 0) {
-            replyText(out, getProfile(command));
-        } else if (command.indexOf("/shutdown") >= 0) {
-            reply(out, shutdown(command));
-        } else if (true || command.indexOf("routerConsole.html") > 0) {
-            try {
-                out.write("HTTP/1.1 200 OK\nConnection: close\nCache-control: no-cache\nContent-type: text/html\n\n".getBytes());
-                _context.router().renderStatusHTML(new OutputStreamWriter(out));
-                out.close();
-            } catch (IOException ioe) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Error writing out the admin reply");
-                throw ioe;
-            }
-        }
-    }
-    
-    private void reply(OutputStream out, String content) throws IOException {
-        StringBuilder reply = new StringBuilder(10240);
-        reply.append("HTTP/1.1 200 OK\n");
-        reply.append("Connection: close\n");
-        reply.append("Cache-control: no-cache\n");
-        reply.append("Content-type: text/html\n\n");
-        reply.append(content);
-        try {
-            out.write(reply.toString().getBytes());
-            out.close();
-        } catch (IOException ioe) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Error writing out the admin reply:\n" + content);
-            throw ioe;
-        }
-    }
-    
-    private void replyText(OutputStream out, String content) throws IOException {
-        StringBuilder reply = new StringBuilder(10240);
-        reply.append("HTTP/1.1 200 OK\n");
-        reply.append("Connection: close\n");
-        reply.append("Cache-control: no-cache\n");
-        reply.append("Content-type: text/plain\n\n");
-        reply.append(content);
-        try {
-            out.write(reply.toString().getBytes());
-            out.close();
-        } catch (IOException ioe) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Error writing out the admin reply:\n" + content);
-            throw ioe;
-        }
-    }
-    
-    private String getProfile(String cmd) {
-        Set peers = _context.profileOrganizer().selectAllPeers();
-        for (Iterator iter = peers.iterator(); iter.hasNext(); ) {
-            Hash peer = (Hash)iter.next();
-            if (cmd.indexOf(peer.toBase64().substring(0,10)) >= 0) {
-                try {
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream(64*1024);
-                    _context.profileOrganizer().exportProfile(peer, baos);
-                    return new String(baos.toByteArray());
-                } catch (IOException ioe) {
-                    _log.error("Error exporting the profile", ioe);
-                    return "Error exporting the peer profile\n";
-                }
-            }
-        }
-        
-        return "No such peer is being profiled\n";
-    }
-    
-    private static final String SHUTDOWN_PASSWORD_PROP = "router.shutdownPassword";
-    private String shutdown(String cmd) {
-        String password = _context.router().getConfigSetting(SHUTDOWN_PASSWORD_PROP);
-        if (password == null)
-            password = _context.getProperty(SHUTDOWN_PASSWORD_PROP);
-        if (password == null) 
-            return "No shutdown password specified in the config or context - <b>REFUSING SHUTDOWN</b>." +
-                   "<a href=\"/routerConsole.html\">back</a>";
-        if (cmd.indexOf(password) > 0) {
-            I2PThread t = new I2PThread(new Runnable() {
-                public void run() { 
-                    try { Thread.sleep(30*1000); } catch (InterruptedException ie) {}
-                    _context.router().shutdown(Router.EXIT_HARD);
-                }
-            });
-            t.start();
-            return "Shutdown request accepted.  Killing the router in 30 seconds";
-        } else {
-            return "Incorrect shutdown password specified.  Please edit your router.config appropriately." +
-                   "<a href=\"/routerConsole.html\">back</a>";
-        }
-    }
-}

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);
-    }
-}
-

apps/desktopgui/LICENSE

@@ -1,15 +0,0 @@
-Desktop GUI: provides a simple GUI for I2P.
-Copyright (C) 2009  Mathias De Maré
-
-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; only version 2 of the License.
-
-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.

apps/desktopgui/README

@@ -1,13 +0,0 @@
-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

apps/desktopgui/TODO

@@ -1,55 +0,0 @@
-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).

apps/desktopgui/build.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="all" name="desktopgui">
-
-	<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"/>
-
-	<property name="javac.compilerargs" value=""/>
-
-	<target name="init">
-		<mkdir dir="${build}"/>
-        <mkdir dir="${build}/${resources}"/>
-        <mkdir dir="${build}/${javadoc}"/>
-		<mkdir dir="${dist}"/>
-	</target>
-
-	<target name="clean">
-		<delete dir="${build}"/>
-		<delete dir="${dist}"/>
-	</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" />
-                <!-- doesn't matter if we're not on win32, we just need the java classes, not the platform-dependent code -->
-                <pathelement location="../../installer/lib/wrapper/win32/wrapper.jar" />
-            	<pathelement location="../../router/java/build/router.jar" />
-            </classpath>
-		</javac>
-        <copy todir="${build}/desktopgui/${resources}">
-            <fileset dir="${resources}" />
-        </copy>
-	</target>
-
-	<target name="jar" depends="compile">
-        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-		<!-- multi-lang is optional -->
-        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
-            <arg value="./bundle-messages.sh" />
-        </exec>
-        <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>
-		<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>
-
-    <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" >
-            <arg value="./bundle-messages.sh" />
-            <arg value="-p" />
-        </exec>
-        <exec executable="sh" osfamily="mac" failifexecutionfails="true" >
-            <arg value="./bundle-messages.sh" />
-            <arg value="-p" />
-        </exec>
-        <exec executable="sh" osfamily="windows" failifexecutionfails="true" >
-            <arg value="./bundle-messages.sh" />
-            <arg value="-p" />
-        </exec>
-    </target>
-
-	<target name="dist" depends="jar" />	
-	<target name="all" depends="jar" />
-</project>
-

apps/desktopgui/bundle-messages.sh

@@ -1,111 +0,0 @@
-#
-# 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
-
-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 'Warning - xgettext failed, not updating translations'
-			rm -f ${i}t
-			break
-		fi
-		msgmerge -U --backup=none $i ${i}t
-		if [ $? -ne 0 ]
-		then
-			echo 'Warning - msgmerge failed, not updating translations'
-			rm -f ${i}t
-			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 'Warning - msgfmt failed, not updating translations'
-            break
-        fi
-    fi
-done
-rm -f $TMPFILE
-# todo: return failure
-exit 0

apps/desktopgui/locale/messages_ar.po

@@ -1,55 +0,0 @@
-# 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 "هل ترغب في تفعيل الأيقونة؟"
-

apps/desktopgui/locale/messages_de.po

@@ -1,55 +0,0 @@
-# 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?"

apps/desktopgui/locale/messages_en.po

@@ -1,55 +0,0 @@
-# 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 ""

apps/desktopgui/locale/messages_es.po

@@ -1,56 +0,0 @@
-# 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?"
-

apps/desktopgui/locale/messages_fr.po

@@ -1,56 +0,0 @@
-# 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"
-

apps/desktopgui/locale/messages_nl.po

@@ -1,55 +0,0 @@
-# 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?"