* Update versions, package release, fix typo in comment

external applications that need it.

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,201 @@
+/**
+ *            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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,197 @@
+/**
+ *            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/build.xml

@@ -0,0 +1,74 @@
+<?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. 
+
+    -->
+</project>

apps/BOB/manifest.mf

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

apps/BOB/nbproject/build-impl.xml

@@ -0,0 +1,642 @@
+<?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="" 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

@@ -0,0 +1,8 @@
+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=75fac64c
+nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5

apps/BOB/nbproject/private/private.properties

@@ -0,0 +1,6 @@
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
+user.properties.file=/root/.netbeans/6.5/build.properties

apps/BOB/nbproject/private/private.xml

@@ -0,0 +1,4 @@
+<?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"/>
+</project-private>

apps/BOB/nbproject/project.properties

@@ -0,0 +1,77 @@
+application.title=BOB
+application.vendor=root
+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}/BOB.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.core.jar=../i2p.i2p/core/dist/core.jar
+file.reference.i2p.jar=../../bob/i2p/i2p.i2p/build/i2p.jar
+file.reference.i2p.jar-1=../../core/java/build/i2p.jar
+file.reference.i2p.jar-2=../i2p.i2p/core/java/build/i2p.jar
+file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
+file.reference.java-src=../i2p.i2p/core/java/src/
+file.reference.jbigi.jar=../../bob/i2p/i2p.i2p/build/jbigi.jar
+file.reference.mstreaming.jar=../../bob/i2p/i2p.i2p/build/mstreaming.jar
+file.reference.mstreaming.jar-1=../ministreaming/java/build/mstreaming.jar
+file.reference.NetBeansProjects-i2p.i2p=../i2p.i2p/
+file.reference.streaming.jar=../../bob/i2p/i2p.i2p/build/streaming.jar
+file.reference.streaming.jar-1=../streaming/java/build/streaming.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.i2p.jar-1}:\
+    ${file.reference.i2ptunnel.jar}:\
+    ${file.reference.mstreaming.jar-1}:\
+    ${file.reference.streaming.jar-1}
+# 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.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

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

@@ -0,0 +1,227 @@
+/**
+ *            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.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Properties;
+import net.i2p.client.I2PClient;
+import net.i2p.client.streaming.RetransmissionTimer;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
+/**
+ * <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";
+	private static int maxConnections = 0;
+	private static NamedDB database;
+
+	/**
+	 * Log a warning
+	 *
+	 * @param arg
+	 */
+	public static void warn(String arg) {
+		System.out.println(arg);
+		_log.warn(arg);
+	}
+
+	/**
+	 * Log an error
+	 *
+	 * @param arg
+	 */
+	public static void error(String arg) {
+		System.out.println(arg);
+		_log.error(arg);
+	}
+
+	/**
+	 * Listen for incoming connections and handle them
+	 *
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		database = new NamedDB();
+		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.
+		// I2PClient client = I2PClientFactory.createClient();
+		Properties props = new Properties();
+		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
+
+		// This is here just to ensure there is no interference with our threadgroups.
+		SimpleTimer Y = RetransmissionTimer.getInstance();
+		i = Y.hashCode();
+		{
+			try {
+				FileInputStream fi = new FileInputStream(configLocation);
+				props.load(fi);
+				fi.close();
+			} catch(FileNotFoundException fnfe) {
+				warn("Unable to load up the BOB config file " + configLocation + ", Using defaults.");
+				warn(fnfe.toString());
+				save = true;
+			} catch(IOException ioe) {
+				warn("IOException on BOB config file " + configLocation + ", 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");
+		}
+		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);
+		}
+		if(!props.containsKey(PROP_BOB_PORT)) {
+			props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
+		}
+		if(!props.containsKey("inbound.length")) {
+			props.setProperty("inbound.length", "1");
+		}
+		if(!props.containsKey("outbound.length")) {
+			props.setProperty("outbound.length", "1");
+		}
+		if(!props.containsKey("inbound.lengthVariance")) {
+			props.setProperty("inbound.lengthVariance", "0");
+		}
+		if(!props.containsKey("outbound.lengthVariance")) {
+			props.setProperty("outbound.lengthVariance", "0");
+		}
+		if(!props.containsKey(PROP_BOB_HOST)) {
+			props.setProperty(PROP_BOB_HOST, "localhost");
+		}
+		if(save) {
+			try {
+				warn("Writing new defaults file " + configLocation);
+				FileOutputStream fo = new FileOutputStream(configLocation);
+				props.store(fo, configLocation);
+				fo.close();
+			} catch(IOException ioe) {
+				warn("IOException on BOB config file " + configLocation + ", " + ioe);
+			}
+		}
+
+		try {
+			warn("BOB is now running.");
+			ServerSocket listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
+			Socket server;
+
+			while((i++ < maxConnections) || (maxConnections == 0)) {
+				//DoCMDS connection;
+
+				server = listener.accept();
+				DoCMDS conn_c = new DoCMDS(server, props, database, _log);
+				Thread t = new Thread(conn_c);
+				t.start();
+			}
+		} catch(IOException ioe) {
+			warn("IOException on socket listen: " + ioe);
+			ioe.printStackTrace();
+		}
+	}
+}

apps/BOB/src/net/i2p/BOB/COPYING

@@ -0,0 +1,21 @@
+            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/I2Plistener.java

@@ -0,0 +1,138 @@
+/**
+ *            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 net.i2p.I2PException;
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+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;
+
+	/**
+	 * Constructor
+	 * @param S
+	 * @param info
+	 * @param database
+	 * @param _log
+	 */
+	I2Plistener(I2PSocketManager S, NamedDB info, NamedDB database, Log _log) {
+		this.database = database;
+		this.info = info;
+		this._log = _log;
+		this.socketManager = S;
+		serverSocket = this.socketManager.getServerSocket();
+		tgwatch = 1;
+	}
+
+	/**
+	 * Simply listen on I2P port, and thread connections
+	 *
+	 */
+	public void run() {
+		boolean g = false;
+		I2PSocket sessSocket = null;
+
+		serverSocket.setSoTimeout(1000);
+		database.getReadLock();
+		info.getReadLock();
+		if(info.exists("INPORT")) {
+			tgwatch = 2;
+		}
+		info.releaseReadLock();
+		database.releaseReadLock();
+		boolean spin = true;
+		while(spin) {
+
+			database.getReadLock();
+			info.getReadLock();
+			spin = info.get("RUNNING").equals(Boolean.TRUE);
+			info.releaseReadLock();
+			database.releaseReadLock();
+			try {
+				try {
+					sessSocket = serverSocket.accept();
+					g = true;
+				} catch(ConnectException ce) {
+					g = false;
+				} catch(SocketTimeoutException ste) {
+					g = false;
+				}
+				if(g) {
+					g = false;
+					// toss the connection to a new thread.
+					I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database);
+					Thread t = new Thread(conn_c, "BOBI2PtoTCP");
+					t.start();
+				}
+
+			} catch(I2PException e) {
+				//	System.out.println("Exception " + e);
+			}
+		}
+
+		try {
+			serverSocket.close();
+		} catch(I2PException e) {
+			// nop
+		}
+
+		while(Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
+//			System.out.println("STOP Thread count " + Thread.activeCount());
+			try {
+				Thread.sleep(1000); //sleep for 1000 ms (One second)
+			} catch(Exception e) {
+				// nop
+				}
+		}
+
+		//		System.out.println("STOP Thread count " + Thread.activeCount());
+		// need to kill off the socket manager too.
+		I2PSession session = socketManager.getSession();
+		if(session != null) {
+			try {
+				session.destroySession();
+			} catch(I2PSessionException ex) {
+				// nop
+			}
+//			System.out.println("destroySession Thread count " + Thread.activeCount());
+		}
+	}
+}

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

@@ -0,0 +1,138 @@
+/**
+ *            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 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;
+
+	/**
+	 * Constructor
+	 *
+	 * @param I2Psock
+	 * @param info
+	 * @param database
+	 */
+	I2PtoTCP(I2PSocket I2Psock, NamedDB info, NamedDB database) {
+		this.I2P = I2Psock;
+		this.info = info;
+		this.database = database;
+	}
+
+	private void rlock() throws Exception {
+		database.getReadLock();
+		info.getReadLock();
+	}
+
+	private void runlock() throws Exception {
+		database.releaseReadLock();
+		info.releaseReadLock();
+	}
+
+	/**
+	 * I2P stream to TCP stream thread starter
+	 *
+	 */
+	public void run() {
+		String host;
+		int port;
+		boolean tell;
+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);
+				// make readers/writers
+				InputStream in = sock.getInputStream();
+				OutputStream out = sock.getOutputStream();
+				InputStream Iin = I2P.getInputStream();
+				OutputStream 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, info, database); // app -> I2P
+				TCPio conn_a = new TCPio(Iin, out, info, database); // I2P -> app
+				Thread t = new Thread(conn_c, "TCPioA");
+				Thread q = new Thread(conn_a, "TCPioB");
+				// Fire!
+				t.start();
+				q.start();
+				while(t.isAlive() && q.isAlive()) { // AND is used here to kill off the other thread
+					try {
+						Thread.sleep(10); //sleep for 10 ms
+					} catch(InterruptedException e) {
+						// nop
+					}
+				}
+
+			} catch(Exception e) {
+				break die;
+			}
+		} // die
+		try {
+			I2P.close();
+		} catch(Exception e) {
+			tell = false;
+		}
+		try {
+			sock.close();
+		} catch(Exception e) {
+			tell = false;
+		}
+	}
+}

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

@@ -0,0 +1,242 @@
+/**
+ *            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 net.i2p.I2PException;
+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;
+	private int backlog = 50; // should this be more? less?
+	boolean go_out;
+	boolean come_in;
+
+	/**
+	 * Constructor Will fail if INPORT is occupied.
+	 *
+	 * @param info
+	 * @param database
+	 * @param _log
+	 * @throws net.i2p.I2PException
+	 * @throws java.io.IOException
+	 */
+	MUXlisten(NamedDB database, NamedDB info, Log _log) throws I2PException, IOException, RuntimeException {
+		int port = 0;
+		InetAddress host = null;
+		this.database = database;
+		this.info = info;
+		this._log = _log;
+
+		this.database.getReadLock();
+		this.info.getReadLock();
+		N = this.info.get("NICKNAME").toString();
+		prikey = new ByteArrayInputStream((byte[])info.get("KEYS"));
+		Properties Q = (Properties)info.get("PROPERTIES");
+		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();
+
+		socketManager = I2PSocketManagerFactory.createManager(prikey, Q);
+		if(this.come_in) {
+			this.listener = new ServerSocket(port, backlog, host);
+		}
+
+		// Everything is OK as far as we can tell.
+		this.database.getWriteLock();
+		this.info.getWriteLock();
+		this.info.add("STARTING", Boolean.TRUE);
+		this.info.releaseWriteLock();
+		this.database.releaseWriteLock();
+	}
+
+	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() {
+
+		try {
+			wlock();
+			try {
+				info.add("RUNNING", Boolean.TRUE);
+				info.add("STARTING", Boolean.FALSE);
+			} catch(Exception e) {
+				wunlock();
+				return;
+			}
+		} catch(Exception e) {
+			return;
+		}
+		try {
+			wunlock();
+		} catch(Exception e) {
+			return;
+		}
+
+quit:           {
+			try {
+				tg = new ThreadGroup(N);
+die:                            {
+					// toss the connections to a new threads.
+					// will wrap with TCP and UDP when UDP works
+
+					if(go_out) {
+						// I2P -> TCP
+						I2Plistener conn = new I2Plistener(socketManager, info, database, _log);
+						Thread t = new Thread(tg, conn, "BOBI2Plistener " + N);
+						t.start();
+					}
+
+					if(come_in) {
+						// TCP -> I2P
+						TCPlistener conn = new TCPlistener(listener, socketManager, info, database, _log);
+						Thread q = new Thread(tg, conn, "BOBTCPlistener" + N);
+						q.start();
+					}
+
+					boolean spin = true;
+					while(spin) {
+						try {
+							Thread.sleep(1000); //sleep for 1000 ms (One second)
+						} catch(InterruptedException e) {
+							// nop
+						}
+						try {
+							rlock();
+							try {
+								spin = info.get("STOPPING").equals(Boolean.FALSE);
+							} catch(Exception e) {
+								runlock();
+								break die;
+							}
+						} catch(Exception e) {
+							break die;
+						}
+						try {
+							runlock();
+						} catch(Exception e) {
+							break die;
+						}
+					}
+
+					try {
+						wlock();
+						try {
+							info.add("RUNNING", Boolean.FALSE);
+						} catch(Exception e) {
+							wunlock();
+							break die;
+						}
+					} catch(Exception e) {
+						break die;
+					}
+					try {
+						wunlock();
+					} catch(Exception e) {
+						break die;
+					}
+				} // die
+				// wait for child threads and thread groups to die
+				while(tg.activeCount() + tg.activeGroupCount() != 0) {
+					try {
+						Thread.sleep(1000); //sleep for 1000 ms (One second)
+					} catch(InterruptedException ex) {
+						// nop
+						}
+				}
+				tg.destroy();
+				// Zap reference to the ThreadGroup so the JVM can GC it.
+				tg = null;
+			} catch(Exception e) {
+				break quit;
+			}
+		} // quit
+		socketManager.destroySocketManager();
+		// zero out everything, just incase.
+		try {
+			wlock();
+			try {
+				info.add("STARTING", Boolean.FALSE);
+				info.add("STOPPING", Boolean.FALSE);
+				info.add("RUNNING", Boolean.FALSE);
+			} catch(Exception e) {
+				wunlock();
+				return;
+			}
+			wunlock();
+		} catch(Exception e) {
+			return;
+		}
+	}
+}

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

@@ -0,0 +1,46 @@
+/**
+ *            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.SimpleTimer;
+
+/**
+ * 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
+		SimpleTimer Y = RetransmissionTimer.getInstance();
+		BOB.main(args);
+		Y.removeSimpleTimer();
+	}
+}

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

@@ -0,0 +1,195 @@
+/**
+ *            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

@@ -0,0 +1,102 @@
+/**
+ *            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;
+
+/**
+ * Shove data from one stream to the other.
+ *
+ * @author sponge
+ */
+public class TCPio implements Runnable {
+
+	private InputStream Ain;
+	private OutputStream Aout;
+	private NamedDB info,  database;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Ain
+	 * @param Aout
+	 * @param info
+	 * @param database
+	 */
+	TCPio(InputStream Ain, OutputStream Aout, NamedDB info, NamedDB database) {
+		this.Ain = Ain;
+		this.Aout = Aout;
+		this.info = info;
+		this.database = database;
+	}
+
+	/**
+	 * 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.
+	 *
+	 */
+	public void run() {
+		int b;
+		byte a[] = new byte[1];
+		boolean spin = true;
+		try {
+			while(spin) {
+				database.getReadLock();
+				info.getReadLock();
+				spin = info.get("RUNNING").equals(Boolean.TRUE);
+				info.releaseReadLock();
+				database.releaseReadLock();
+				b = Ain.read(a, 0, 1);
+				// System.out.println(info.get("NICKNAME").toString() + " " + b);
+				if(b > 0) {
+					Aout.write(a, 0, b);
+				} else if(b == 0) {
+					Thread.yield(); // this should act like a mini sleep.
+					if(Ain.available() == 0) {
+						try {
+							// Thread.yield();
+							Thread.sleep(10);
+						} catch(InterruptedException ex) {
+						}
+					}
+				} 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.
+					 *
+					 */
+					return;
+				}
+			}
+		} catch(Exception e) {
+			// Eject!!! Eject!!!
+			return;
+		}
+	}
+}

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

@@ -0,0 +1,147 @@
+/**
+ *            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 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;
+	private int tgwatch;
+	public I2PSocketManager socketManager;
+	public I2PServerSocket serverSocket;
+	private ServerSocket listener;
+
+	/**
+	 * Constructor
+	 * @param S
+	 * @param info
+	 * @param database
+	 * @param _log
+	 */
+	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Log _log) {
+		this.database = database;
+		this.info = info;
+		this._log = _log;
+		this.socketManager = S;
+		this.listener = listener;
+		tgwatch = 1;
+	}
+
+	/**
+	 * Simply listen on TCP port, and thread connections
+	 *
+	 */
+	public void run() {
+		boolean g = false;
+		boolean spin = true;
+		database.getReadLock();
+		info.getReadLock();
+		if(info.exists("OUTPORT")) {
+			tgwatch = 2;
+		}
+		try {
+//			System.out.println("Starting thread count " + Thread.activeCount());
+			Socket server = new Socket();
+			listener.setSoTimeout(1000);
+			info.releaseReadLock();
+			database.releaseReadLock();
+			while(spin) {
+				database.getReadLock();
+				info.getReadLock();
+				spin = info.get("RUNNING").equals(Boolean.TRUE);
+				info.releaseReadLock();
+				database.releaseReadLock();
+//				System.out.println("Thread count " + Thread.activeCount());
+				try {
+					server = listener.accept();
+					g = true;
+				} catch(SocketTimeoutException ste) {
+					g = false;
+				}
+				if(g) {
+					// toss the connection to a new thread.
+					TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database);
+					Thread t = new Thread(conn_c, "BOBTCPtoI2P");
+					t.start();
+					g = false;
+				}
+			}
+			listener.close();
+		} catch(IOException ioe) {
+			// Fatal failure, cause a stop event
+			database.getReadLock();
+			info.getReadLock();
+			spin = info.get("RUNNING").equals(Boolean.TRUE);
+			info.releaseReadLock();
+			database.releaseReadLock();
+			if(spin) {
+				database.getWriteLock();
+				info.getWriteLock();
+				info.add("STOPPING", new Boolean(true));
+				info.add("RUNNING", new Boolean(false));
+				info.releaseWriteLock();
+				database.releaseWriteLock();
+			}
+		}
+
+//System.out.println("STOP!");
+
+		while(Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
+//			System.out.println("STOP Thread count " + Thread.activeCount());
+			try {
+				Thread.sleep(1000); //sleep for 1000 ms (One second)
+			} catch(Exception e) {
+				// nop
+				}
+		}
+//		System.out.println("STOP Thread count " + Thread.activeCount());
+		// need to kill off the socket manager too.
+		I2PSession session = socketManager.getSession();
+		if(session != null) {
+			try {
+				session.destroySession();
+			} catch(I2PSessionException ex) {
+				// nop
+			}
+//			System.out.println("destroySession Thread count " + Thread.activeCount());
+		}
+	}
+}
+
+

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

@@ -0,0 +1,182 @@
+/**
+ *            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 net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+
+/**
+ *
+ * Process TCP->I2P
+ *
+ * @author sponge
+ */
+public class TCPtoI2P implements Runnable {
+
+	private I2PSocket I2P;
+	private NamedDB info,  database;
+	private Socket sock;
+	private I2PSocketManager socketManager;
+
+	/**
+	 * This is a more forgiving readline,
+	 * it works on unbuffered streams
+	 *
+	 * @param in
+	 * @return line of text as a String
+	 * @throws Exception
+	 */
+	private static String lnRead(InputStream in) throws Exception {
+		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;
+	}
+
+	/**
+	 * Constructor
+	 * @param i2p
+	 * @param socket
+	 * @param info
+	 * @param database
+	 */
+	TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database) {
+		this.sock = socket;
+		this.info = info;
+		this.database = database;
+		this.socketManager = i2p;
+	}
+
+	/**
+	 * 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); // cr
+		out.flush();
+	}
+
+	/**
+	 * TCP stream to I2P stream thread starter
+	 */
+	public void run() {
+		String line, input;
+
+		try {
+
+			InputStream in = sock.getInputStream();
+			OutputStream out = sock.getOutputStream();
+			try {
+				line = lnRead(in);
+				input = line.toLowerCase();
+				Destination dest = null;
+
+				if(input.endsWith(".i2p")) {
+					dest = I2PTunnel.destFromName(input);
+					line = dest.toBase64();
+				}
+				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
+					InputStream Iin = I2P.getInputStream();
+					OutputStream Iout = I2P.getOutputStream();
+					// setup to cross the streams
+					TCPio conn_c = new TCPio(in, Iout, info, database); // app -> I2P
+					TCPio conn_a = new TCPio(Iin, out, info, database); // I2P -> app
+					Thread t = new Thread(conn_c, "TCPioA");
+					Thread q = new Thread(conn_a, "TCPioB");
+					// Fire!
+					t.start();
+					q.start();
+					while(t.isAlive() && q.isAlive()) { // AND is used here to kill off the other thread
+						try {
+							Thread.sleep(10); //sleep for 10 ms
+						} catch(InterruptedException e) {
+							// nop
+						}
+					}
+
+				} catch(I2PException e) {
+					Emsg("ERROR " + e.toString(), out);
+				} catch(ConnectException e) {
+					Emsg("ERROR " + e.toString(), out);
+				} catch(NoRouteToHostException e) {
+					Emsg("ERROR " + e.toString(), out);
+				} catch(InterruptedIOException e) {
+					Emsg("ERROR " + e.toString(), out);
+				}
+
+			} catch(Exception e) {
+				Emsg("ERROR " + e.toString(), out);
+			}
+		} catch(IOException ioe) {
+		}
+		try {
+			I2P.close();
+		} catch(Exception e) {
+		}
+
+		try {
+			sock.close();
+		} catch(Exception e) {
+		}
+	}
+}
+

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

@@ -0,0 +1,144 @@
+/**
+ *            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/package.html

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

apps/addressbook/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="addressbook" default="war" basedir=".">
 
-	<property name="src" value="java/src/addressbook"/>
+	<property name="src" value="java/src"/>
 	<property name="build" value="build"/>
 	<property name="dist"  location="dist"/>
 	<property name="jar" value="addressbook.jar"/>
@@ -19,8 +19,24 @@
 
 	<target name="distclean" depends="clean" />
 
-	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.3" target="1.3" 
+        <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" 
                        srcdir="${src}" destdir="${build}">
             <classpath>
                 <pathelement location="../../core/java/build/i2p.jar" />
@@ -37,7 +53,7 @@
 		</jar>
 	</target>
 	
-	<target name="war" depends="compile">
+	<target name="war" depends="compile" unless="war.uptodate">
 		<mkdir dir="${dist}/tmp"/>
 		<mkdir dir="${dist}/tmp/WEB-INF"/>
 		<mkdir dir="${dist}/tmp/WEB-INF/classes"/>
@@ -48,4 +64,8 @@
 		<delete dir="${dist}/tmp"/>
 	</target>
 	
+        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
+            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
+        </uptodate>
+
 </project>

apps/addressbook/java/src/addressbook/AddressBook.java

@@ -21,11 +21,11 @@
 
 package addressbook;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 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;
@@ -57,7 +57,7 @@ public class AddressBook {
         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
      * 
@@ -81,6 +81,7 @@ public class AddressBook {
         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
@@ -89,8 +90,9 @@ public class AddressBook {
      * 
      * @param subscription
      *            A Subscription instance pointing at a remote address book.
+     * @param proxyHost hostname of proxy
+     * @param proxyPort port number of proxy
      */
-    static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts
     public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
         this.location = subscription.getLocation();
         EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
@@ -152,10 +154,14 @@ public class 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()
@@ -181,8 +187,8 @@ public class AddressBook {
                 (! host.endsWith(".router.i2p")) &&
                 (! host.endsWith(".console.i2p")) &&
 
-		dest.length() == 516 &&
-                dest.endsWith("AAAA") &&
+		((dest.length() == MIN_DEST_LENGTH && dest.endsWith("AAAA")) ||
+		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
                 dest.replaceAll("[a-zA-Z0-9~-]", "").length() == 0
                 ;	
     }
@@ -195,6 +201,7 @@ public class AddressBook {
      * 
      * @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.
      */

apps/addressbook/java/src/addressbook/ConfigParser.java

@@ -21,12 +21,19 @@
 
 package addressbook;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
 import java.util.Iterator;
-import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Utility class providing methods to parse and write files in config file
@@ -100,7 +107,11 @@ public class ConfigParser {
         FileInputStream fileStream = new FileInputStream(file);
         BufferedReader input = new BufferedReader(new InputStreamReader(
                 fileStream));
-        return ConfigParser.parse(input);
+        Map rv = ConfigParser.parse(input);
+        try {
+            fileStream.close();
+        } catch (IOException ioe) {}
+        return rv;
     }
 
     /**
@@ -131,7 +142,7 @@ public class ConfigParser {
      *         cannot be read, map.
      */
     public static Map parse(File file, Map map) {
-        Map result = new HashMap();
+        Map result;
         try {
             result = ConfigParser.parse(file);
         } catch (IOException exp) {
@@ -181,7 +192,11 @@ public class ConfigParser {
         FileInputStream fileStream = new FileInputStream(file);
         BufferedReader input = new BufferedReader(new InputStreamReader(
                 fileStream));
-        return ConfigParser.parseSubscriptions(input);
+        List rv = ConfigParser.parseSubscriptions(input);
+        try {
+            fileStream.close();
+        } catch (IOException ioe) {}
+        return rv;
     }
 
     /**
@@ -206,13 +221,12 @@ public class ConfigParser {
      * 
      * @param file
      *            A File to attempt to parse.
-     * @param string
-     *            A List to use as the default, if file fails.
+     * @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 = new LinkedList();
+        List result;
         try {
             result = ConfigParser.parseSubscriptions(file);
         } catch (IOException exp) {

apps/addressbook/java/src/addressbook/Daemon.java

@@ -21,12 +21,12 @@
 
 package addressbook;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.LinkedList;
 import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Main class of addressbook.  Performs updates, and runs the main loop.
@@ -125,7 +125,6 @@ public class Daemon {
     
     public void run(String[] args) {
         String settingsLocation = "config.txt";
-        Map settings = new HashMap();
         String home;
         if (args.length > 0) {
             home = args[0];
@@ -157,10 +156,11 @@ public class Daemon {
         
         File settingsFile = new File(homeFile, settingsLocation);
         
-        settings = ConfigParser.parse(settingsFile, defaultSettings);
+        Map settings = ConfigParser.parse(settingsFile, defaultSettings);
         // wait
         try {
-            Thread.currentThread().sleep(5*60*1000);
+            Thread.sleep(5*60*1000);
+	    // Static method, and redundent Thread.currentThread().sleep(5*60*1000);
         } catch (InterruptedException ie) {}
         
         while (true) {

apps/addressbook/java/src/addressbook/DaemonThread.java

@@ -43,6 +43,7 @@ public class DaemonThread extends Thread {
     /* (non-Javadoc)
      * @see java.lang.Runnable#run()
      */
+    @Override
     public void run() {
         //try {
         //    Thread.sleep(5 * 60 * 1000);

apps/addressbook/java/src/addressbook/Log.java

@@ -54,14 +54,17 @@ public class Log {
      *            A String containing a message to append to the log.
      */
     public void append(String entry) {
+        BufferedWriter bw = null;
         try {
-            BufferedWriter bw = new BufferedWriter(new FileWriter(this.file,
+            bw = new BufferedWriter(new FileWriter(this.file,
                     true));
             String timestamp = new Date().toString();
             bw.write(timestamp + " -- " + entry);
             bw.newLine();
-            bw.close();
         } catch (IOException exp) {
+        } finally {
+            if (bw != null)
+                try { bw.close(); } catch (IOException ioe) {}
         }
     }
 
@@ -73,4 +76,4 @@ public class Log {
     public File getFile() {
         return this.file;
     }
-}
+}

apps/addressbook/java/src/addressbook/Servlet.java

@@ -22,10 +22,10 @@
 package addressbook;
 
 import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 
 /**
  * A wrapper for addressbook to allow it to be started as a web application.
@@ -44,6 +44,7 @@ public class Servlet extends GenericServlet {
     /* (non-Javadoc)
      * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
      */
+    @Override
     public void init(ServletConfig config) {
         try {
             super.init(config);

apps/addressbook/java/src/addressbook/SubscriptionIterator.java

@@ -41,6 +41,8 @@ public class SubscriptionIterator implements Iterator {
      * 
      * @param subscriptions
      *            List of Subscription objects that represent address books.
+     * @param proxyHost proxy hostname
+     * @param proxyPort proxt port number
      */
     public SubscriptionIterator(List subscriptions, String proxyHost, int proxyPort) {
         this.subIterator = subscriptions.iterator();

apps/addressbook/java/src/addressbook/SubscriptionList.java

@@ -21,13 +21,13 @@
 
 package addressbook;
 
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 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.
@@ -60,6 +60,9 @@ public class SubscriptionList {
      * @param lastModifiedFile
      *            A file containg the last-modified headers used for conditional
      *            GET. The file is in the format "url=leastmodified".
+     * @param defaultSubs default subscription file
+     * @param proxyHost proxy hostname
+     * @param proxyPort proxy port number
      */
     public SubscriptionList(File locationsFile, File etagsFile,
             File lastModifiedFile, List defaultSubs, String proxyHost, 

apps/bogobot/Bogobot.java

@@ -10,16 +10,14 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
+import java.util.Properties;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.Properties;
 
 import org.apache.log4j.DailyRollingFileAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-
 import org.jibble.pircbot.IrcException;
 import org.jibble.pircbot.NickAlreadyInUseException;
 import org.jibble.pircbot.PircBot;

apps/i2psnark/java/build.xml

@@ -7,12 +7,30 @@
         <ant dir="../../streaming/java/" target="build" />
 	<!-- streaming will build ministreaming and core -->
     </target>
-    <target name="compile">
+    <condition property="depend.available">
+        <typefound name="depend" />
+    </condition>
+    <target name="depend" if="depend.available">
+        <depend
+            cache="../../../build"
+            srcdir="./src" 
+            destdir="./build/obj" >
+            <!-- Depend on classes instead of jars where available -->
+            <classpath>
+                <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../../router/java/build/obj" />
+                <pathelement location="../../ministreaming/java/build/obj" />
+                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
+                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+            </classpath>
+        </depend>
+    </target>
+    <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.3" target="1.3" 
+            debug="true" deprecation="on" source="1.5" target="1.5" 
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../../router/java/build/router.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" />
     </target>
@@ -36,7 +54,7 @@
         </zip>
     </target>
     <target name="standalone_prep" depends="war">
-        <javac debug="true" deprecation="on" source="1.3" target="1.3" 
+        <javac debug="true" deprecation="on" source="1.5" target="1.5" 
                destdir="./build" srcdir="src/" includes="org/klomp/snark/web/RunStandalone.java" >
             <classpath>
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />

apps/i2psnark/java/src/org/klomp/snark/BitField.java

@@ -20,9 +20,6 @@
 
 package org.klomp.snark;
 
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
 
 /**
  * Container of a byte array representing set and unset bits.

apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java

@@ -20,8 +20,10 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
@@ -118,6 +120,8 @@ public class ConnectionAcceptor implements Runnable
             if (serverSocket == null)
                 try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
         }
+        if(stop)
+            break;
         try
           {
             I2PSocket socket = serverSocket.accept();

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

@@ -1,20 +1,28 @@
 package org.klomp.snark;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.util.EepGet;
 import net.i2p.client.I2PSession;
-import net.i2p.data.*;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
+import net.i2p.util.EepGet;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
 
-import java.io.*;
-import java.util.*;
-
 /**
  * I2P specific helpers for I2PSnark
  */
@@ -177,7 +185,8 @@ public class I2PSnarkUtil {
             out = File.createTempFile("i2psnark", "url", new File("."));
         } catch (IOException ioe) {
             ioe.printStackTrace();
-            out.delete();
+            if (out != null)
+                out.delete();
             return null;
         }
         String fetchURL = url;

apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java

@@ -22,20 +22,22 @@ package org.klomp.snark;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.File;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
 
-import org.klomp.snark.bencode.*;
+import net.i2p.crypto.SHA1;
 import net.i2p.data.Base64;
 import net.i2p.util.Log;
-import net.i2p.crypto.SHA1;
+
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.BEncoder;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 /**
  * Note: this class is buggy, as it doesn't propogate custom meta fields into the bencoded
@@ -406,7 +408,7 @@ public class MetaInfo
     info.put("name", name);
     if (name_utf8 != null)
         info.put("name.utf-8", name_utf8);
-    info.put("piece length", new Integer(piece_length));
+    info.put("piece length", Integer.valueOf(piece_length));
     info.put("pieces", piece_hashes);
     if (files == null)
       info.put("length", new Long(length));
@@ -432,9 +434,10 @@ public class MetaInfo
     Map info = createInfoMap();
     StringBuffer buf = new StringBuffer(128);
     buf.append("info: ");
-    for (Iterator iter = info.keySet().iterator(); iter.hasNext(); ) {
-        String key = (String)iter.next();
-        Object val = info.get(key);
+    for (Iterator iter = info.entrySet().iterator(); iter.hasNext(); ) {
+        Map.Entry entry = (Map.Entry)iter.next();
+        String key = (String)entry.getKey();
+        Object val = entry.getValue();
         buf.append(key).append('=');
         if (val instanceof byte[])
             buf.append(Base64.encode((byte[])val, true));

apps/i2psnark/java/src/org/klomp/snark/Peer.java

@@ -20,15 +20,15 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Arrays;
-import java.util.Map;
-
-import org.klomp.snark.bencode.*;
 
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
 public class Peer implements Comparable
@@ -332,9 +332,9 @@ public class Peer implements Comparable
       {
         // try to save partial piece
         if (this.deregister) {
-          PeerListener p = state.listener;
+          PeerListener p = s.listener;
           if (p != null) {
-            p.savePeerPartial(state);
+            p.savePeerPartial(s);
             p.markUnrequested(this);
           }
         }

apps/i2psnark/java/src/org/klomp/snark/PeerAcceptor.java

@@ -20,8 +20,12 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.SequenceInputStream;
 import java.util.Iterator;
 
 import net.i2p.client.streaming.I2PSocket;

apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java

@@ -20,7 +20,11 @@
 
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.TimerTask;
 
 /**
  * TimerTask that checks for good/bad up/downloader. Works together
@@ -37,6 +41,8 @@ class PeerCheckerTask extends TimerTask
     this.coordinator = coordinator;
   }
 
+  private Random random = new Random();
+
   public void run()
   {
     synchronized(coordinator.peers)
@@ -105,13 +111,19 @@ class PeerCheckerTask extends TimerTask
                         + " C: " + peer.isChoked(),
                         Snark.DEBUG);
 
+            // Choke half of them rather than all so it isn't so drastic...
+            // unless this torrent is over the limit all by itself.
+            boolean overBWLimitChoke = upload > 0 &&
+                                       ((overBWLimit && random.nextBoolean()) ||
+                                        (coordinator.overUpBWLimit(uploaded)));
+
             // If we are at our max uploaders and we have lots of other
             // interested peers try to make some room.
             // (Note use of coordinator.uploaders)
             if (((coordinator.uploaders == uploadLimit
                 && coordinator.interestedAndChoking > 0)
                 || coordinator.uploaders > uploadLimit
-                || overBWLimit)
+                || overBWLimitChoke)
                 && !peer.isChoking())
               {
                 // Check if it still wants pieces from us.
@@ -127,14 +139,18 @@ class PeerCheckerTask extends TimerTask
                     it.remove();
                     removed.add(peer);
                   }
-                else if (overBWLimit)
+                else if (overBWLimitChoke)
                   {
-                    Snark.debug("BW limit, choke peer: " + peer,
+                    Snark.debug("BW limit (" + upload + "/" + uploaded + "), choke peer: " + peer,
                                 Snark.INFO);
                     peer.setChoking(true);
                     uploaders--;
                     coordinator.uploaders--;
                     removedCount++;
+
+                    // Put it at the back of the list for fairness, even though we won't be unchoking this time
+                    it.remove();
+                    removed.add(peer);
                   }
                 else if (peer.isInteresting() && peer.isChoked())
                   {
@@ -220,7 +236,7 @@ class PeerCheckerTask extends TimerTask
           }
         
         // Optimistically unchoke a peer
-        if (!overBWLimit)
+        if ((!overBWLimit) && !coordinator.overUpBWLimit(uploaded))
             coordinator.unchokePeer();
 
         // Put peers back at the end of the list that we removed earlier.

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java

@@ -20,9 +20,8 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import net.i2p.util.Log;
 
@@ -78,9 +77,12 @@ class PeerConnectionIn implements Runnable
         
             // Wait till we hear something...
             // The length of a complete message in bytes.
+            // The biggest is the piece message, for which the length is the
+            // request size (32K) plus 9. (we could also check if Storage.MAX_PIECES / 8
+            // in the bitfield message is bigger but it's currently 5000/8 = 625 so don't bother)
             int i = din.readInt();
             lastRcvd = System.currentTimeMillis();
-            if (i < 0)
+            if (i < 0 || i > PeerState.PARTSIZE + 9)
               throw new IOException("Unexpected length prefix: " + i);
 
             if (i == 0)

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

@@ -20,9 +20,11 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -392,6 +394,23 @@ class PeerConnectionOut implements Runnable
     req.sendTime = System.currentTimeMillis();
   }
 
+  // Used by PeerState to limit pipelined requests
+  int queuedBytes()
+  {
+    int total = 0;
+    synchronized(sendQueue)
+      {
+        Iterator it = sendQueue.iterator();
+        while (it.hasNext())
+          {
+            Message m = (Message)it.next();
+            if (m.type == Message.PIECE)
+                total += m.length;
+          }
+      }
+    return total;
+  }
+
   void sendPiece(int piece, int begin, int length, byte[] bytes)
   {
     Message m = new Message();

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java

@@ -20,8 +20,14 @@
 
 package org.klomp.snark;
 
-import java.util.*;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
 
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -38,8 +44,8 @@ public class PeerCoordinator implements PeerListener
 
   // package local for access by CheckDownLoadersTask
   final static long CHECK_PERIOD = 40*1000; // 40 seconds
-  final static int MAX_CONNECTIONS = 24;
-  final static int MAX_UPLOADERS = 4;
+  final static int MAX_CONNECTIONS = 16;
+  final static int MAX_UPLOADERS = 6;
 
   // Approximation of the number of current uploaders.
   // Resynced by PeerChecker once in a while.
@@ -87,7 +93,10 @@ public class PeerCoordinator implements PeerListener
     setWantedPieces();
 
     // Install a timer to check the uploaders.
-    timer.schedule(new PeerCheckerTask(this), CHECK_PERIOD, CHECK_PERIOD);
+    // Randomize the first start time so multiple tasks are spread out,
+    // this will help the behavior with global limits
+    Random r = new Random();
+    timer.schedule(new PeerCheckerTask(this), (CHECK_PERIOD / 2) + r.nextInt((int) CHECK_PERIOD), CHECK_PERIOD);
   }
   
   // only called externally from Storage after the double-check fails
@@ -192,6 +201,15 @@ public class PeerCoordinator implements PeerListener
     return getRate(uploaded_old);
   }
 
+  public long getCurrentUploadRate()
+  {
+    // no need to synchronize, only one value
+    long r = uploaded_old[0];
+    if (r <= 0)
+        return 0;
+    return (r * 1000) / CHECK_PERIOD;
+  }
+
   private long getRate(long array[])
   {
     long rate = 0;
@@ -274,6 +292,14 @@ public class PeerCoordinator implements PeerListener
             // toDisconnect = peer to get out of synchronized(peers)
             peer.disconnect(false); // Don't deregister this connection/peer.
           }
+        // This is already checked in addPeer() but we could have gone over the limit since then
+        else if (peers.size() >= MAX_CONNECTIONS)
+          {
+            if (_log.shouldLog(Log.WARN))
+              _log.warn("Already at MAX_CONNECTIONS in connected() with peer: " + peer);
+            // toDisconnect = peer to get out of synchronized(peers)
+            peer.disconnect(false);
+          }
         else
           {
             if (_log.shouldLog(Log.INFO))
@@ -295,6 +321,7 @@ public class PeerCoordinator implements PeerListener
     }
   }
 
+  // caller must synchronize on peers
   private static Peer peerIDInList(PeerID pid, List peers)
   {
     Iterator it = peers.iterator();
@@ -316,9 +343,13 @@ public class PeerCoordinator implements PeerListener
       }
 
     boolean need_more;
+    int peersize = 0;
     synchronized(peers)
       {
-        need_more = !peer.isConnected() && peers.size() < MAX_CONNECTIONS;
+        peersize = peers.size();
+        // This isn't a strict limit, as we may have several pending connections;
+        // thus there is an additional check in connected()
+        need_more = (!peer.isConnected()) && peersize < MAX_CONNECTIONS;
         // Check if we already have this peer before we build the connection
         Peer old = peerIDInList(peer.getPeerID(), peers);
         need_more = need_more && ((old == null) || (old.getInactiveTime() > 8*60*1000));
@@ -342,15 +373,14 @@ public class PeerCoordinator implements PeerListener
         new I2PThread(r, threadName).start();
         return true;
       }
-    else
-      if (_log.shouldLog(Log.DEBUG)) {
-        if (peer.isConnected())
-          _log.info("Add peer already connected: " + peer);
-        else
-          _log.info("MAX_CONNECTIONS = " + MAX_CONNECTIONS
-                    + " not accepting extra peer: " + peer);
-      }
-      return false;
+    if (_log.shouldLog(Log.DEBUG)) {
+      if (peer.isConnected())
+        _log.info("Add peer already connected: " + peer);
+      else
+        _log.info("Connections: " + peersize + "/" + MAX_CONNECTIONS
+                  + " not accepting extra peer: " + peer);
+    }
+    return false;
   }
 
 
@@ -830,5 +860,10 @@ public class PeerCoordinator implements PeerListener
   {
     return Snark.overUpBWLimit();
   }
+
+  public boolean overUpBWLimit(long total)
+  {
+    return Snark.overUpBWLimit(total * 1000 / CHECK_PERIOD);
+  }
 }
 

apps/i2psnark/java/src/org/klomp/snark/PeerCoordinatorSet.java

@@ -1,6 +1,9 @@
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Hmm, any guesses as to what this is?  Used by the multitorrent functionality

apps/i2psnark/java/src/org/klomp/snark/PeerID.java

@@ -21,15 +21,15 @@
 package org.klomp.snark;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Map;
 
-import org.klomp.snark.bencode.*;
-
 import net.i2p.data.Base64;
 import net.i2p.data.Destination;
-import net.i2p.data.DataFormatException;
+
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 public class PeerID implements Comparable
 {
@@ -167,7 +167,9 @@ public class PeerID implements Comparable
   }
 
   /**
-   * Returns the String "id@address" where id is the base64 encoded id.
+   * Returns the String "id@address" where id is the base64 encoded id
+   * and address is the base64 dest (was the base64 hash of the dest) which
+   * should match what the bytemonsoon tracker reports on its web pages.
    */
   public String toString()
   {
@@ -178,7 +180,7 @@ public class PeerID implements Comparable
             break;
         }
     }
-    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.calculateHash().toBase64().substring(0,6);
+    return Base64.encode(id, nonZero, id.length-nonZero).substring(0,4) + "@" + address.toBase64().substring(0,6);
   }
 
   /**

apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java

@@ -20,7 +20,8 @@
 
 package org.klomp.snark;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.TimerTask;
 
 /**
  * TimerTask that monitors the peers and total up/download speeds.
@@ -29,7 +30,7 @@ import java.util.*;
 class PeerMonitorTask extends TimerTask
 {
   final static long MONITOR_PERIOD = 10 * 1000; // Ten seconds.
-  private final long KILOPERSECOND = 1024 * (MONITOR_PERIOD / 1000);
+  private static final long KILOPERSECOND = 1024 * (MONITOR_PERIOD / 1000);
 
   private final PeerCoordinator coordinator;
 

apps/i2psnark/java/src/org/klomp/snark/PeerState.java

@@ -23,8 +23,6 @@ package org.klomp.snark;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 
 import net.i2p.util.Log;
 
@@ -62,8 +60,9 @@ class PeerState
   // If we have te resend outstanding requests (true after we got choked).
   private boolean resend = false;
 
-  private final static int MAX_PIPELINE = 2;
-  private final static int PARTSIZE = 32*1024; // Snark was 16K, i2p-bt uses 64KB
+  private final static int MAX_PIPELINE = 2;               // this is for outbound requests
+  private final static int MAX_PIPELINE_BYTES = 128*1024;  // this is for inbound requests
+  public final static int PARTSIZE = 32*1024; // Snark was 16K, i2p-bt uses 64KB
   private final static int MAX_PARTSIZE = 64*1024; // Don't let anybody request more than this
 
   PeerState(Peer peer, PeerListener listener, MetaInfo metainfo,
@@ -185,6 +184,15 @@ class PeerState
         return;
       }
 
+    // Limit total pipelined requests to MAX_PIPELINE bytes
+    // to conserve memory and prevent DOS
+    if (out.queuedBytes() + length > MAX_PIPELINE_BYTES)
+      {
+        if (_log.shouldLog(Log.WARN))
+          _log.warn("Discarding request over pipeline limit from " + peer);
+        return;
+      }
+
     byte[] pieceBytes = listener.gotRequest(peer, piece, begin, length);
     if (pieceBytes == null)
       {

apps/i2psnark/java/src/org/klomp/snark/Piece.java

@@ -1,8 +1,8 @@
 package org.klomp.snark;
 
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Piece implements Comparable {
 

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -20,17 +20,26 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.StringTokenizer;
+import java.util.Timer;
+import java.util.TimerTask;
 
-import org.klomp.snark.bencode.*;
-
-import net.i2p.data.Destination;
-import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.data.Destination;
 import net.i2p.util.I2PThread;
 
+import org.klomp.snark.bencode.BDecoder;
+
 /**
  * Main Snark program startup class.
  *
@@ -246,8 +255,8 @@ public class Snark
     if (slistener == null)
       slistener = this;
 
-    if (clistener == null)
-      clistener = this;
+    //if (clistener == null)
+    //  clistener = this;
 
     this.torrent = torrent;
     this.rootDataDir = rootDir;
@@ -303,9 +312,9 @@ public class Snark
     // Figure out what the torrent argument represents.
     meta = null;
     File f = null;
+    InputStream in = null;
     try
       {
-        InputStream in = null;
         f = new File(torrent);
         if (f.exists())
           in = new FileInputStream(f);
@@ -355,8 +364,11 @@ public class Snark
          */
         else
           fatal("Cannot open '" + torrent + "'", ioe);
-      }
-    
+      } finally {
+          if (in != null)
+              try { in.close(); } catch (IOException ioe) {}
+      }    
+
     debug(meta.toString(), INFO);
     
     // When the metainfo torrent was created from an existing file/dir
@@ -712,7 +724,7 @@ public class Snark
       {
         // Use the MetaInfo from the storage since our own might not
         // yet be setup correctly.
-        MetaInfo meta = storage.getMetaInfo();
+        //MetaInfo meta = storage.getMetaInfo();
         //if (meta != null)
         //  System.out.print("Checking existing "
         //                   + meta.getPieces()
@@ -785,8 +797,14 @@ public class Snark
     for (Iterator iter = coordinators.iterator(); iter.hasNext(); ) {
       PeerCoordinator c = (PeerCoordinator)iter.next();
       if (!c.halted())
-        total += c.getUploadRate();
+        total += c.getCurrentUploadRate();
     }
+    long limit = 1024l * I2PSnarkUtil.instance().getMaxUpBW();
+    Snark.debug("Total up bw: " + total + " Limit: " + limit, Snark.WARNING);
+    return total > limit;
+  }
+
+  public static boolean overUpBWLimit(long total) {
     long limit = 1024l * I2PSnarkUtil.instance().getMaxUpBW();
     return total > limit;
   }

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -1,7 +1,20 @@
 package org.klomp.snark;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
@@ -42,6 +55,8 @@ public class SnarkManager implements Snark.CompleteListener {
     public static final String DEFAULT_USE_OPENTRACKERS = "true";
     public static final String PROP_OPENTRACKERS = "i2psnark.opentrackers";
     public static final String DEFAULT_OPENTRACKERS = "http://tracker.welterde.i2p/a";
+    public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix";
+    public static final String DEFAULT_LINK_PREFIX = "file:///";
     
     public static final int MIN_UP_BW = 2;
     public static final int DEFAULT_MAX_UP_BW = 10;
@@ -58,6 +73,8 @@ public class SnarkManager implements Snark.CompleteListener {
         I2PThread monitor = new I2PThread(new DirMonitor(), "Snark DirMonitor");
         monitor.setDaemon(true);
         monitor.start();
+        if (_context instanceof RouterContext)
+            ((RouterContext)_context).router().addShutdownTask(new SnarkManagerShutdown());
     }
     
     private static final int MAX_MESSAGES = 5;
@@ -84,7 +101,10 @@ public class SnarkManager implements Snark.CompleteListener {
     public boolean shouldUseOpenTrackers() {
         return Boolean.valueOf(_config.getProperty(PROP_USE_OPENTRACKERS, DEFAULT_USE_OPENTRACKERS)).booleanValue();
     }
-    private int getStartupDelayMinutes() { return 1; }
+    public String linkPrefix() {
+        return _config.getProperty(PROP_LINK_PREFIX, DEFAULT_LINK_PREFIX + getDataDir().getAbsolutePath() + File.separatorChar);
+    }
+    private int getStartupDelayMinutes() { return 3; }
     public File getDataDir() { 
         String dir = _config.getProperty(PROP_DIR);
         if ( (dir == null) || (dir.trim().length() <= 0) )
@@ -110,7 +130,7 @@ public class SnarkManager implements Snark.CompleteListener {
         if (!_config.containsKey(PROP_I2CP_PORT))
             _config.setProperty(PROP_I2CP_PORT, "7654");
         if (!_config.containsKey(PROP_I2CP_OPTS))
-            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=1 inbound.lengthVariance=1 outbound.length=1 outbound.lengthVariance=1");
+            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=2 inbound.lengthVariance=0 outbound.length=2 outbound.lengthVariance=0");
         if (!_config.containsKey(PROP_EEP_HOST))
             _config.setProperty(PROP_EEP_HOST, "localhost");
         if (!_config.containsKey(PROP_EEP_PORT))
@@ -118,10 +138,14 @@ public class SnarkManager implements Snark.CompleteListener {
         if (!_config.containsKey(PROP_UPLOADERS_TOTAL))
             _config.setProperty(PROP_UPLOADERS_TOTAL, "" + Snark.MAX_TOTAL_UPLOADERS);
         if (!_config.containsKey(PROP_UPBW_MAX)) {
-            if (_context instanceof RouterContext)
-                _config.setProperty(PROP_UPBW_MAX, "" + (((RouterContext)_context).bandwidthLimiter().getOutboundKBytesPerSecond() / 3));
-            else
+            try {
+                if (_context instanceof RouterContext)
+                    _config.setProperty(PROP_UPBW_MAX, "" + (((RouterContext)_context).bandwidthLimiter().getOutboundKBytesPerSecond() / 2));
+                else
+                    _config.setProperty(PROP_UPBW_MAX, "" + DEFAULT_MAX_UP_BW);
+            } catch (NoClassDefFoundError ncdfe) {
                 _config.setProperty(PROP_UPBW_MAX, "" + DEFAULT_MAX_UP_BW);
+            }
         }
         if (!_config.containsKey(PROP_DIR))
             _config.setProperty(PROP_DIR, "i2psnark");
@@ -508,7 +532,7 @@ public class SnarkManager implements Snark.CompleteListener {
         } else if (info.getPieces() <= 0) {
             return "No pieces in " + info.getName() + "?  deleting it";
         } else if (info.getPieceLength(0) > 1*1024*1024) {
-            return "Pieces are too large in " + info.getName() + " (" + info.getPieceLength(0)/1024 + "KB, deleting it";
+            return "Pieces are too large in " + info.getName() + " (" + info.getPieceLength(0)/1024 + "KB), deleting it";
         } else if (info.getTotalLength() > 10*1024*1024*1024l) {
             System.out.println("torrent info: " + info.toString());
             List lengths = info.getLengths();
@@ -639,13 +663,15 @@ public class SnarkManager implements Snark.CompleteListener {
 
     private static final String DEFAULT_TRACKERS[] = { 
        "Postman", "http://YRgrgTLGnbTq2aZOZDJQ~o6Uk5k6TK-OZtx0St9pb0G-5EGYURZioxqYG8AQt~LgyyI~NCj6aYWpPO-150RcEvsfgXLR~CxkkZcVpgt6pns8SRc3Bi-QSAkXpJtloapRGcQfzTtwllokbdC-aMGpeDOjYLd8b5V9Im8wdCHYy7LRFxhEtGb~RL55DA8aYOgEXcTpr6RPPywbV~Qf3q5UK55el6Kex-6VCxreUnPEe4hmTAbqZNR7Fm0hpCiHKGoToRcygafpFqDw5frLXToYiqs9d4liyVB-BcOb0ihORbo0nS3CLmAwZGvdAP8BZ7cIYE3Z9IU9D1G8JCMxWarfKX1pix~6pIA-sp1gKlL1HhYhPMxwyxvuSqx34o3BqU7vdTYwWiLpGM~zU1~j9rHL7x60pVuYaXcFQDR4-QVy26b6Pt6BlAZoFmHhPcAuWfu-SFhjyZYsqzmEmHeYdAwa~HojSbofg0TMUgESRXMw6YThK1KXWeeJVeztGTz25sL8AAAA.i2p/announce.php=http://tracker.postman.i2p/"
-       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
+//       , "eBook", "http://E71FRom6PZNEqTN2Lr8P-sr23b7HJVC32KoGnVQjaX6zJiXwhJy2HsXob36Qmj81TYFZdewFZa9mSJ533UZgGyQkXo2ahctg82JKYZfDe5uDxAn1E9YPjxZCWJaFJh0S~UwSs~9AZ7UcauSJIoNtpxrtbmRNVFLqnkEDdLZi26TeucfOmiFmIWnVblLniWv3tG1boE9Abd-6j3FmYVrRucYuepAILYt6katmVNOk6sXmno1Eynrp~~MBuFq0Ko6~jsc2E2CRVYXDhGHEMdt-j6JUz5D7S2RIVzDRqQyAZLKJ7OdQDmI31przzmne1vOqqqLC~1xUumZVIvF~yOeJUGNjJ1Vx0J8i2BQIusn1pQJ6UCB~ZtZZLQtEb8EPVCfpeRi2ri1M5CyOuxN0V5ekmPHrYIBNevuTCRC26NP7ZS5VDgx1~NaC3A-CzJAE6f1QXi0wMI9aywNG5KGzOPifcsih8eyGyytvgLtrZtV7ykzYpPCS-rDfITncpn5hliPUAAAA.i2p/pub/bt/announce.php=http://de-ebook-archiv.i2p/pub/bt/"
 //       , "Gaytorrents", "http://uxPWHbK1OIj9HxquaXuhMiIvi21iK0~ZiG9d8G0840ZXIg0r6CbiV71xlsqmdnU6wm0T2LySriM0doW2gUigo-5BNkUquHwOjLROiETnB3ZR0Ml4IGa6QBPn1aAq2d9~g1r1nVjLE~pcFnXB~cNNS7kIhX1d6nLgYVZf0C2cZopEow2iWVUggGGnAA9mHjE86zLEnTvAyhbAMTqDQJhEuLa0ZYSORqzJDMkQt90MV4YMjX1ICY6RfUSFmxEqu0yWTrkHsTtRw48l~dz9wpIgc0a0T9C~eeWvmBFTqlJPtQZwntpNeH~jF7nlYzB58olgV2HHFYpVYD87DYNzTnmNWxCJ5AfDorm6AIUCV2qaE7tZtI1h6fbmGpGlPyW~Kw5GXrRfJwNvr6ajwAVi~bPVnrBwDZezHkfW4slOO8FACPR28EQvaTu9nwhAbqESxV2hCTq6vQSGjuxHeOuzBOEvRWkLKOHWTC09t2DbJ94FSqETmZopTB1ukEmaxRWbKSIaAAAA.i2p/announce.php=http://gaytorrents.i2p/"
-       , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/"
+//       , "NickyB", "http://9On6d3cZ27JjwYCtyJJbowe054d5tFnfMjv4PHsYs-EQn4Y4mk2zRixatvuAyXz2MmRfXG-NAUfhKr0KCxRNZbvHmlckYfT-WBzwwpiMAl0wDFY~Pl8cqXuhfikSG5WrqdPfDNNIBuuznS0dqaczf~OyVaoEOpvuP3qV6wKqbSSLpjOwwAaQPHjlRtNIW8-EtUZp-I0LT45HSoowp~6b7zYmpIyoATvIP~sT0g0MTrczWhbVTUZnEkZeLhOR0Duw1-IRXI2KHPbA24wLO9LdpKKUXed05RTz0QklW5ROgR6TYv7aXFufX8kC0-DaKvQ5JKG~h8lcoHvm1RCzNqVE-2aiZnO2xH08H-iCWoLNJE-Td2kT-Tsc~3QdQcnEUcL5BF-VT~QYRld2--9r0gfGl-yDrJZrlrihHGr5J7ImahelNn9PpkVp6eIyABRmJHf2iicrk3CtjeG1j9OgTSwaNmEpUpn4aN7Kx0zNLdH7z6uTgCGD9Kmh1MFYrsoNlTp4AAAA.i2p/bittorrent/announce.php=http://nickyb.i2p/bittorrent/"
 //       , "Orion", "http://gKik1lMlRmuroXVGTZ~7v4Vez3L3ZSpddrGZBrxVriosCQf7iHu6CIk8t15BKsj~P0JJpxrofeuxtm7SCUAJEr0AIYSYw8XOmp35UfcRPQWyb1LsxUkMT4WqxAT3s1ClIICWlBu5An~q-Mm0VFlrYLIPBWlUFnfPR7jZ9uP5ZMSzTKSMYUWao3ejiykr~mtEmyls6g-ZbgKZawa9II4zjOy-hdxHgP-eXMDseFsrym4Gpxvy~3Fv9TuiSqhpgm~UeTo5YBfxn6~TahKtE~~sdCiSydqmKBhxAQ7uT9lda7xt96SS09OYMsIWxLeQUWhns-C~FjJPp1D~IuTrUpAFcVEGVL-BRMmdWbfOJEcWPZ~CBCQSO~VkuN1ebvIOr9JBerFMZSxZtFl8JwcrjCIBxeKPBmfh~xYh16BJm1BBBmN1fp2DKmZ2jBNkAmnUbjQOqWvUcehrykWk5lZbE7bjJMDFH48v3SXwRuDBiHZmSbsTY6zhGY~GkMQHNGxPMMSIAAAA.i2p/bt/announce.php=http://orion.i2p/bt/"
 //       , "anonymity", "http://8EoJZIKrWgGuDrxA3nRJs1jsPfiGwmFWL91hBrf0HA7oKhEvAna4Ocx47VLUR9retVEYBAyWFK-eZTPcvhnz9XffBEiJQQ~kFSCqb1fV6IfPiV3HySqi9U5Caf6~hC46fRd~vYnxmaBLICT3N160cxBETqH3v2rdxdJpvYt8q4nMk9LUeVXq7zqCTFLLG5ig1uKgNzBGe58iNcsvTEYlnbYcE930ABmrzj8G1qQSgSwJ6wx3tUQNl1z~4wSOUMan~raZQD60lRK70GISjoX0-D0Po9WmPveN3ES3g72TIET3zc3WPdK2~lgmKGIs8GgNLES1cXTolvbPhdZK1gxddRMbJl6Y6IPFyQ9o4-6Rt3Lp-RMRWZ2TG7j2OMcNSiOmATUhKEFBDfv-~SODDyopGBmfeLw16F4NnYednvn4qP10dyMHcUASU6Zag4mfc2-WivrOqeWhD16fVAh8MoDpIIT~0r9XmwdaVFyLcjbXObabJczxCAW3fodQUnvuSkwzAAAA.i2p/anonymityTracker/announce.php=http://anonymityweb.i2p/anonymityTracker/"
 //       , "The freak's tracker", "http://mHKva9x24E5Ygfey2llR1KyQHv5f8hhMpDMwJDg1U-hABpJ2NrQJd6azirdfaR0OKt4jDlmP2o4Qx0H598~AteyD~RJU~xcWYdcOE0dmJ2e9Y8-HY51ie0B1yD9FtIV72ZI-V3TzFDcs6nkdX9b81DwrAwwFzx0EfNvK1GLVWl59Ow85muoRTBA1q8SsZImxdyZ-TApTVlMYIQbdI4iQRwU9OmmtefrCe~ZOf4UBS9-KvNIqUL0XeBSqm0OU1jq-D10Ykg6KfqvuPnBYT1BYHFDQJXW5DdPKwcaQE4MtAdSGmj1epDoaEBUa9btQlFsM2l9Cyn1hzxqNWXELmx8dRlomQLlV4b586dRzW~fLlOPIGC13ntPXogvYvHVyEyptXkv890jC7DZNHyxZd5cyrKC36r9huKvhQAmNABT2Y~pOGwVrb~RpPwT0tBuPZ3lHYhBFYmD8y~AOhhNHKMLzea1rfwTvovBMByDdFps54gMN1mX4MbCGT4w70vIopS9yAAAA.i2p/bytemonsoon/announce.php"
        , "welterde", "http://BGKmlDOoH3RzFbPRfRpZV2FjpVj8~3moFftw5-dZfDf2070TOe8Tf2~DAVeaM6ZRLdmFEt~9wyFL8YMLMoLoiwGEH6IGW6rc45tstN68KsBDWZqkTohV1q9XFgK9JnCwE~Oi89xLBHsLMTHOabowWM6dkC8nI6QqJC2JODqLPIRfOVrDdkjLwtCrsckzLybNdFmgfoqF05UITDyczPsFVaHtpF1sRggOVmdvCM66otyonlzNcJbn59PA-R808vUrCPMGU~O9Wys0i-NoqtIbtWfOKnjCRFMNw5ex4n9m5Sxm9e20UkpKG6qzEuvKZWi8vTLe1NW~CBrj~vG7I3Ok4wybUFflBFOaBabxYJLlx4xTE1zJIVxlsekmAjckB4v-cQwulFeikR4LxPQ6mCQknW2HZ4JQIq6hL9AMabxjOlYnzh7kjOfRGkck8YgeozcyTvcDUcUsOuSTk06L4kdrv8h2Cozjbloi5zl6KTbj5ZTciKCxi73Pn9grICn-HQqEAAAA.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
+//       , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/"
+//       , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/"
     };
     
     /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
@@ -707,4 +733,15 @@ public class SnarkManager implements Snark.CompleteListener {
             return (name != null) && (name.endsWith(".torrent"));
         }
     }
+
+    public class SnarkManagerShutdown extends I2PThread {
+        public void run() {
+            Set names = listTorrentFiles();
+            for (Iterator iter = names.iterator(); iter.hasNext(); ) {
+                Snark snark = getTorrent((String)iter.next());
+                if ( (snark != null) && (!snark.stopped) )
+                    snark.stopTorrent();
+            }
+        }
+    }
 }

apps/i2psnark/java/src/org/klomp/snark/StaticSnark.java

@@ -20,10 +20,6 @@
 
 package org.klomp.snark;
 
-import java.security.Provider;
-import java.security.Security;
-
-import org.klomp.snark.bencode.*;
 
 /**
  * Main snark startup class for staticly linking with gcj.

apps/i2psnark/java/src/org/klomp/snark/Storage.java

@@ -20,10 +20,13 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.util.*;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import net.i2p.crypto.SHA1;
 
@@ -309,7 +312,7 @@ public class Storage
             if (lm <= 0 || lm > savedTime)
                 useSavedBitField = false;
         }
-        if (base.exists() && !base.canWrite())  // hope we can get away with this, if we are only seeding...
+        if (base.exists() && ((useSavedBitField && savedBitField.complete()) || !base.canWrite()))
             rafs[0] = new RandomAccessFile(base, "r");
         else
             rafs[0] = new RandomAccessFile(base, "rw");
@@ -338,7 +341,7 @@ public class Storage
                 if (lm <= 0 || lm > savedTime)
                     useSavedBitField = false;
             }
-            if (f.exists() && !f.canWrite()) // see above re: only seeding
+            if (f.exists() && ((useSavedBitField && savedBitField.complete()) || !f.canWrite()))
                 rafs[i] = new RandomAccessFile(f, "r");
             else
                 rafs[i] = new RandomAccessFile(f, "rw");
@@ -468,9 +471,10 @@ public class Storage
           }
         else if (length == 0)
           allocateFile(i);
-        else
-          throw new IOException("File '" + names[i]
-                                + "' exists, but has wrong length");
+        else {
+          Snark.debug("File '" + names[i] + "' exists, but has wrong length - repairing corruption", Snark.ERROR);
+          rafs[i].setLength(lengths[i]);
+        }
       }
 
     // Check which pieces match and which don't

apps/i2psnark/java/src/org/klomp/snark/StorageListener.java

@@ -59,7 +59,6 @@ public interface StorageListener
   /** Reset the peer's wanted pieces table
    *  Call after the storage double-check fails
    *
-   * @param peer the peer
    */
   void setWantedPieces(Storage storage);
 }

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

@@ -20,11 +20,17 @@
 
 package org.klomp.snark;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
 
-import org.klomp.snark.bencode.*;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 

apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java

@@ -22,14 +22,15 @@ package org.klomp.snark;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigInteger;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 
-import org.klomp.snark.bencode.*;
+import org.klomp.snark.bencode.BDecoder;
+import org.klomp.snark.bencode.BEValue;
+import org.klomp.snark.bencode.InvalidBEncodingException;
 
 public class TrackerInfo
 {
@@ -95,7 +96,14 @@ public class TrackerInfo
     Iterator it = l.iterator();
     while (it.hasNext())
       {
-        PeerID peerID = new PeerID(((BEValue)it.next()).getMap());
+        PeerID peerID;
+        try {
+            peerID = new PeerID(((BEValue)it.next()).getMap());
+        } catch (InvalidBEncodingException ibe) {
+            // don't let one bad entry spoil the whole list
+            Snark.debug("Discarding peer from list: " + ibe, Snark.ERROR);
+            continue;
+        }
         peers.add(new Peer(peerID, my_id, metainfo));
       }
 

apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java

@@ -20,20 +20,16 @@
 
 package org.klomp.snark.bencode;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.EOFException;
-import java.io.UnsupportedEncodingException;
-
 import java.math.BigInteger;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Decodes a bencoded stream to <code>BEValue</code>s.

apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java

@@ -21,7 +21,6 @@
 package org.klomp.snark.bencode;
 
 import java.io.UnsupportedEncodingException;
-
 import java.util.List;
 import java.util.Map;
 

apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java

@@ -20,11 +20,9 @@
 
 package org.klomp.snark.bencode;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -1,12 +1,23 @@
 package org.klomp.snark.web;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServlet;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
@@ -14,7 +25,14 @@ import net.i2p.data.DataHelper;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import org.klomp.snark.*;
+
+import org.klomp.snark.I2PSnarkUtil;
+import org.klomp.snark.MetaInfo;
+import org.klomp.snark.Peer;
+import org.klomp.snark.Snark;
+import org.klomp.snark.SnarkManager;
+import org.klomp.snark.Storage;
+import org.klomp.snark.TrackerClient;
 
 /**
  *
@@ -69,11 +87,13 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("<table border=\"0\" width=\"100%\">\n");
         out.write("<tr><td><a href=\"" + req.getRequestURI() + peerString + "\" class=\"snarkRefresh\">Refresh</a>\n");
         out.write("<td><a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\">Forum</a>\n");
-        int count = 0;
+        out.write("<tr><td><a href=\"http://codevoid.i2p/forums/5\" class=\"snarkRefresh\">Wishlist</a>\n");
+        int count = 1;
         Map trackers = _manager.getTrackers();
-        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            String baseURL = (String)trackers.get(name);
+        for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
+            Map.Entry entry = (Map.Entry)iter.next();
+            String name = (String)entry.getKey();
+            String baseURL = (String)entry.getValue();
             int e = baseURL.indexOf('=');
             if (e < 0)
                 continue;
@@ -468,7 +488,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("<td valign=\"top\" align=\"left\" class=\"snarkTorrentName " + rowClass + "\">");
         
         if (remaining == 0)
-            out.write("<a href=\"file:///" + _manager.getDataDir().getAbsolutePath() + File.separatorChar + snark.meta.getName() 
+            out.write("<a href=\"" + _manager.linkPrefix() + snark.meta.getName() 
                       + "\" title=\"Download the completed file\">");
         out.write(filename);
         if (remaining == 0)
@@ -477,9 +497,10 @@ public class I2PSnarkServlet extends HttpServlet {
         String announce = snark.meta.getAnnounce();
         if (announce.startsWith("http://YRgrgTLG") || announce.startsWith("http://8EoJZIKr")) {
             Map trackers = _manager.getTrackers();
-            for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-                String name = (String)iter.next();
-                String baseURL = (String)trackers.get(name);
+            for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
+                Map.Entry entry = (Map.Entry)iter.next();
+                String name = (String)entry.getKey();
+                String baseURL = (String)entry.getValue();
                 if (!baseURL.startsWith(announce))
                     continue;
                 int e = baseURL.indexOf('=');
@@ -649,9 +670,10 @@ public class I2PSnarkServlet extends HttpServlet {
                   + "\" title=\"File to seed (must be within the specified path)\" /><br />\n");
         out.write("Tracker: <select name=\"announceURL\"><option value=\"\">Select a tracker</option>\n");
         Map trackers = _manager.getTrackers();
-        for (Iterator iter = trackers.keySet().iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
-            String announceURL = (String)trackers.get(name);
+        for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
+            Map.Entry entry = (Map.Entry)iter.next();
+            String name = (String)entry.getKey();
+            String announceURL = (String)entry.getValue();
             int e = announceURL.indexOf('=');
             if (e > 0)
                 announceURL = announceURL.substring(0, e);
@@ -677,7 +699,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
         out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
         out.write("Data directory: <input type=\"text\" size=\"40\" name=\"dataDir\" value=\"" + dataDir + "\" ");
-        out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /><br />\n");
+        out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> <i>(Edit i2psnark.config and restart to change)</i><br />\n");
         out.write("Auto start: <input type=\"checkbox\" name=\"autoStart\" value=\"true\" " 
                   + (autoStart ? "checked " : "") 
                   + "title=\"If true, automatically start torrents that are added\" />");
@@ -703,7 +725,7 @@ public class I2PSnarkServlet extends HttpServlet {
         out.write("Total uploader limit: <input type=\"text\" name=\"upLimit\" value=\""
                   + I2PSnarkUtil.instance().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers<br />\n");
         out.write("Up bandwidth limit: <input type=\"text\" name=\"upBW\" value=\""
-                  + I2PSnarkUtil.instance().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Router Up BW / 3 recommended)</i><br />\n");
+                  + I2PSnarkUtil.instance().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Router Up BW / 2 recommended)</i><br />\n");
         
         out.write("Use open trackers also: <input type=\"checkbox\" name=\"useOpenTrackers\" value=\"true\" " 
                   + (useOpenTrackers ? "checked " : "") 
@@ -722,9 +744,10 @@ public class I2PSnarkServlet extends HttpServlet {
                   + I2PSnarkUtil.instance().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" /> <br />\n");
         StringBuffer opts = new StringBuffer(64);
         Map options = new TreeMap(I2PSnarkUtil.instance().getI2CPOptions());
-        for (Iterator iter = options.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = (String)options.get(key);
+        for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) {
+            Map.Entry entry = (Map.Entry)iter.next();
+            String key = (String)entry.getKey();
+            String val = (String)entry.getValue();
             opts.append(key).append('=').append(val).append(' ');
         }
         out.write("I2CP opts: <input type=\"text\" name=\"i2cpOpts\" size=\"80\" value=\""

apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java

@@ -3,6 +3,7 @@ package org.klomp.snark.web;
 import java.io.File;
 
 import net.i2p.util.FileUtil;
+
 import org.mortbay.jetty.Server;
 
 public class RunStandalone {

apps/i2ptunnel/java/build.xml

@@ -7,12 +7,27 @@
         <ant dir="../../jetty/" target="build" />
 	<!-- ministreaming will build core -->
     </target>
-    <target name="compile">
+    <condition property="depend.available">
+        <typefound name="depend" />
+    </condition>
+    <target name="depend" if="depend.available">
+        <depend
+            cache="../../../build"
+            srcdir="./src" 
+            destdir="./build/obj" >
+            <!-- Depend on classes instead of jars where available -->
+            <classpath>
+                <pathelement location="../../../core/java/build/obj" />
+                <pathelement location="../../ministreaming/java/build/obj" />
+            </classpath>
+        </depend>
+    </target>
+    <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.3" target="1.3" 
+            debug="true" deprecation="on" source="1.5" target="1.5" 
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     </target>
@@ -30,7 +45,7 @@
              basedir="../jsp/" excludes="web.xml, *.java, *.jsp">
         </war>
     </target>
-    <target name="precompilejsp">
+    <target name="precompilejsp" unless="precompilejsp.uptodate">
         <delete dir="../jsp/WEB-INF/" />
         <delete file="../jsp/web-fragment.xml" />
         <delete file="../jsp/web-out.xml" />
@@ -56,7 +71,7 @@
             <arg value="-webapp" />
             <arg value="../jsp/" />
         </java>
-        <javac debug="true" deprecation="on" source="1.3" target="1.3" 
+        <javac debug="true" deprecation="on" source="1.5" target="1.5" 
                destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
@@ -72,6 +87,11 @@
             <replacefilter token="&lt;!-- precompiled servlets --&gt;" value="${jspc.web.fragment}" />
         </replace>
     </target>
+
+    <uptodate property="precompilejsp.uptodate" targetfile="../jsp/web-out.xml">
+        <srcfiles dir= "../jsp" includes="*.jsp, *.html, web.xml"/>
+    </uptodate>
+
     <target name="javadoc">
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
@@ -84,6 +104,9 @@
     </target>
     <target name="clean">
         <delete dir="./build" />
+        <delete dir="../jsp/WEB-INF/" />
+        <delete file="../jsp/web-fragment.xml" />
+        <delete file="../jsp/web-out.xml" />
     </target>
     <target name="cleandep" depends="clean">
 	<!-- ministreaming will clean core -->

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java

@@ -8,11 +8,15 @@ package net.i2p.i2ptunnel;
  *
  */
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.io.ByteArrayOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.util.zip.GZIPInputStream;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.util.ByteCache;
@@ -43,9 +47,9 @@ class HTTPResponseOutputStream extends FilterOutputStream {
     public HTTPResponseOutputStream(OutputStream raw) {
         super(raw);
         _context = I2PAppContext.getGlobalContext();
-        _context.statManager().createRateStat("i2ptunnel.httpCompressionRatio", "ratio of compressed size to decompressed size after transfer", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.httpCompressed", "compressed size transferred", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
-        _context.statManager().createRateStat("i2ptunnel.httpExpanded", "size transferred after expansion", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
+        _context.statManager().createRateStat("i2ptunnel.httpCompressionRatio", "ratio of compressed size to decompressed size after transfer", "I2PTunnel", new long[] { 60*1000, 30*60*1000 });
+        _context.statManager().createRateStat("i2ptunnel.httpCompressed", "compressed size transferred", "I2PTunnel", new long[] { 60*1000, 30*60*1000 });
+        _context.statManager().createRateStat("i2ptunnel.httpExpanded", "size transferred after expansion", "I2PTunnel", new long[] { 60*1000, 30*60*1000 });
         _log = _context.logManager().getLog(getClass());
         _cache = ByteCache.getInstance(8, CACHE_SIZE);
         _headerBuffer = _cache.acquire();
@@ -391,4 +395,4 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                 System.out.println("Properly fails with " + e.getMessage());
         }
     }
-}
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

@@ -284,6 +284,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
         l.log("Command list:");
         l.log("config <i2phost> <i2pport>");
         l.log("listen_on <ip>");
+        l.log("clientoptions[ key=value]*");
         l.log("read_timeout <msecs>");
         l.log("owndest yes|no");
         l.log("ping <args>");
@@ -346,7 +347,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (UnknownHostException uhe) {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -355,7 +356,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -363,19 +364,19 @@ public class I2PTunnel implements Logging, EventDispatcher {
             if (!privKeyFile.canRead()) {
                 l.log("private key file does not exist");
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
             I2PTunnelServer serv = new I2PTunnelServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
             serv.setReadTimeout(readTimeout);
             serv.startRunning();
             addtask(serv);
-            notifyEvent("serverTaskId", new Integer(serv.getId()));
+            notifyEvent("serverTaskId", Integer.valueOf(serv.getId()));
             return;
         } else {
             l.log("server <host> <port> <privkeyfile>");
             l.log("  creates a server that sends all incoming data\n" + "  of its destination to host:port.");
-            notifyEvent("serverTaskId", new Integer(-1));
+            notifyEvent("serverTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -401,7 +402,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (UnknownHostException uhe) {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -410,7 +411,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -420,21 +421,21 @@ public class I2PTunnel implements Logging, EventDispatcher {
             if (!privKeyFile.canRead()) {
                 l.log("private key file does not exist");
                 _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[3]);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
             I2PTunnelHTTPServer serv = new I2PTunnelHTTPServer(serverHost, portNum, privKeyFile, args[3], spoofedHost, l, (EventDispatcher) this, this);
             serv.setReadTimeout(readTimeout);
             serv.startRunning();
             addtask(serv);
-            notifyEvent("serverTaskId", new Integer(serv.getId()));
+            notifyEvent("serverTaskId", Integer.valueOf(serv.getId()));
             return;
         } else {
             l.log("httpserver <host> <port> <spoofedhost> <privkeyfile>");
             l.log("  creates an HTTP server that sends all incoming data\n" 
                   + "  of its destination to host:port., filtering the HTTP\n" 
                   + "  headers so it looks like the request is to the spoofed host.");
-            notifyEvent("serverTaskId", new Integer(-1));
+            notifyEvent("serverTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -458,7 +459,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (UnknownHostException uhe) {
                 l.log("unknown host");
                 _log.error(getPrefix() + "Error resolving " + args[0], uhe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -467,7 +468,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
-                notifyEvent("serverTaskId", new Integer(-1));
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
                 return;
             }
 
@@ -475,11 +476,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
             serv.setReadTimeout(readTimeout);
             serv.startRunning();
             addtask(serv);
-            notifyEvent("serverTaskId", new Integer(serv.getId()));
+            notifyEvent("serverTaskId", Integer.valueOf(serv.getId()));
         } else {
             l.log("textserver <host> <port> <privkey>");
             l.log("  creates a server that sends all incoming data\n" + "  of its destination to host:port.");
-            notifyEvent("textserverTaskId", new Integer(-1));
+            notifyEvent("textserverTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -507,7 +508,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
-                notifyEvent("clientTaskId", new Integer(-1));
+                notifyEvent("clientTaskId", Integer.valueOf(-1));
                 return;
             }
             I2PTunnelTask task;
@@ -515,11 +516,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
             try {
                 task = new I2PTunnelClient(portNum, args[1], l, ownDest, (EventDispatcher) this, this);
                 addtask(task);
-                notifyEvent("clientTaskId", new Integer(task.getId()));
+                notifyEvent("clientTaskId", Integer.valueOf(task.getId()));
             } catch (IllegalArgumentException iae) {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create a client [" + host + ":"+ port + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + port + "]");
-                notifyEvent("clientTaskId", new Integer(-1));
+                notifyEvent("clientTaskId", Integer.valueOf(-1));
             }
         } else {
             l.log("client <port> <pubkey>[,<pubkey>]|file:<pubkeyfile>[ <sharedClient>]");
@@ -528,7 +529,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                   + "  a comma delimited list of pubkeys, it will rotate among them\n"
                   + "  randomlyl. sharedClient indicates if this client shares \n"
                   + "   with other clients (true of false)");
-            notifyEvent("clientTaskId", new Integer(-1));
+            notifyEvent("clientTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -550,7 +551,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
-                notifyEvent("httpclientTaskId", new Integer(-1));
+                notifyEvent("httpclientTaskId", Integer.valueOf(-1));
                 return;
             }
             
@@ -582,11 +583,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
             try {
                 task = new I2PTunnelHTTPClient(port, l, ownDest, proxy, (EventDispatcher) this, this);
                 addtask(task);
-                notifyEvent("httpclientTaskId", new Integer(task.getId()));
+                notifyEvent("httpclientTaskId", Integer.valueOf(task.getId()));
             } catch (IllegalArgumentException iae) {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ port + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + port + "]");
-                notifyEvent("httpclientTaskId", new Integer(-1));
+                notifyEvent("httpclientTaskId", Integer.valueOf(-1));
             }
         } else {
             l.log("httpclient <port> [<sharedClient>] [<proxy>]");
@@ -595,7 +596,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             l.log("  <proxy> (optional) indicates a proxy server to be used");
             l.log("  when trying to access an address out of the .i2p domain");
             l.log("  (the default proxy is squid.i2p).");
-            notifyEvent("httpclientTaskId", new Integer(-1));
+            notifyEvent("httpclientTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -617,7 +618,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
-                notifyEvent("ircclientTaskId", new Integer(-1));
+                notifyEvent("ircclientTaskId", Integer.valueOf(-1));
                 return;
             }
             
@@ -639,17 +640,17 @@ public class I2PTunnel implements Logging, EventDispatcher {
             try {
                 task = new I2PTunnelIRCClient(port, args[1],l, ownDest, (EventDispatcher) this, this);
                 addtask(task);
-                notifyEvent("ircclientTaskId", new Integer(task.getId()));
+                notifyEvent("ircclientTaskId", Integer.valueOf(task.getId()));
             } catch (IllegalArgumentException iae) {
                 _log.error(getPrefix() + "Invalid I2PTunnel config to create an ircclient [" + host + ":"+ port + "]", iae);
                 l.log("Invalid I2PTunnel configuration [" + host + ":" + port + "]");
-                notifyEvent("ircclientTaskId", new Integer(-1));
+                notifyEvent("ircclientTaskId", Integer.valueOf(-1));
             }
         } else {
             l.log("ircclient <port> [<sharedClient>]");
             l.log("  creates a client that filter IRC protocol.");
             l.log("  <sharedClient> (optional) indicates if this client shares tunnels with other clients (true of false)");
-            notifyEvent("ircclientTaskId", new Integer(-1));
+            notifyEvent("ircclientTaskId", Integer.valueOf(-1));
         }
     }
     
@@ -672,18 +673,18 @@ public class I2PTunnel implements Logging, EventDispatcher {
             } catch (NumberFormatException nfe) {
                 l.log("invalid port");
                 _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
-                notifyEvent("sockstunnelTaskId", new Integer(-1));
+                notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
                 return;
             }
 
             I2PTunnelTask task;
             task = new I2PSOCKSTunnel(port, l, ownDest, (EventDispatcher) this, this);
             addtask(task);
-            notifyEvent("sockstunnelTaskId", new Integer(task.getId()));
+            notifyEvent("sockstunnelTaskId", Integer.valueOf(task.getId()));
         } else {
             l.log("sockstunnel <port>");
             l.log("  creates a tunnel that distributes SOCKS requests.");
-            notifyEvent("sockstunnelTaskId", new Integer(-1));
+            notifyEvent("sockstunnelTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -967,7 +968,6 @@ public class I2PTunnel implements Logging, EventDispatcher {
             l.log("   try to resolve the name into a destination key");
             notifyEvent("lookupResult", "invalidUsage");
         } else {
-            String target = args[0];
             try {
                 Destination dest = destFromName(args[0]);
                 if (dest == null) {
@@ -998,13 +998,18 @@ public class I2PTunnel implements Logging, EventDispatcher {
             // pings always use the main destination
             task = new I2Ping(allargs, l, false, (EventDispatcher) this, this);
             addtask(task);
-            notifyEvent("pingTaskId", new Integer(task.getId()));
+            notifyEvent("pingTaskId", Integer.valueOf(task.getId()));
         } else {
             l.log("ping <opts> <dest>");
-            l.log("ping <opts> -h");
-            l.log("ping <opts> -l <destlistfile>");
-            l.log("   Tests communication with peers.\n" + "   opts can be -ns (nosync) or not.");
-            notifyEvent("pingTaskId", new Integer(-1));
+            l.log("ping <opts> -h (pings all hosts in hosts.txt)");
+            l.log("ping <opts> -l <destlistfile> (pings a list of hosts in a file)");
+            l.log("   Options:\n" +
+                  "     -c (require 5 consecutive pings to report success)\n" +
+                  "     -m maxSimultaneousPings (default 10)\n" +
+                  "     -n numberOfPings (default 3)\n" +
+                  "     -t timeout (ms, default 5000)\n");
+            l.log("   Tests communication with peers.\n");
+            notifyEvent("pingTaskId", Integer.valueOf(-1));
         }
     }
 
@@ -1083,7 +1088,6 @@ public class I2PTunnel implements Logging, EventDispatcher {
     public static void makeKey(OutputStream writeTo, OutputStream pubDest, Logging l) {
         try {
             l.log("Generating new keys...");
-            ByteArrayOutputStream priv = new ByteArrayOutputStream(), pub = new ByteArrayOutputStream();
             I2PClient client = I2PClientFactory.createClient();
             Destination d = client.createDestination(writeTo);
             l.log("Secret key saved.");
@@ -1107,7 +1111,6 @@ public class I2PTunnel implements Logging, EventDispatcher {
      */
     public static void showKey(InputStream readFrom, OutputStream pubDest, Logging l) {
         try {
-            I2PClient client = I2PClientFactory.createClient();
             Destination d = new Destination();
             d.readBytes(readFrom);
             l.log("Public key: " + d.toBase64());

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

@@ -16,8 +16,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-import net.i2p.I2PException;
 import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
 import net.i2p.client.I2PSession;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
@@ -26,8 +26,8 @@ import net.i2p.client.streaming.I2PSocketOptions;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PThread;
-import net.i2p.util.SimpleTimer;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
 
 public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {
 
@@ -217,10 +217,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     }
     protected static I2PSocketManager buildSocketManager(I2PTunnel tunnel) {
         Properties props = new Properties();
-        if (tunnel == null)
-            props.putAll(System.getProperties());
-        else
-            props.putAll(tunnel.getClientOptions());
+        props.putAll(tunnel.getClientOptions());
         int portNum = 7654;
         if (tunnel.port != null) {
             try {

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -11,10 +11,10 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.StringTokenizer;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Properties;
+import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
@@ -225,6 +225,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
     }
 
     private static final boolean DEFAULT_GZIP = true;
+    // all default to false
+    public static final String PROP_REFERER = "i2ptunnel.httpclient.sendReferer";
+    public static final String PROP_USER_AGENT = "i2ptunnel.httpclient.sendUserAgent";
+    public static final String PROP_VIA = "i2ptunnel.httpclient.sendVia";
     
     private static long __requestId = 0;
     protected void clientConnectionRun(Socket s) {
@@ -465,8 +469,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         line = "Host: " + host;
                         if (_log.shouldLog(Log.INFO)) 
                             _log.info(getPrefix(requestId) + "Setting host = " + host);
-                    } else if (lowercaseLine.startsWith("user-agent: ")) {
-                        // always stripped, added back at the end
+                    } else if (lowercaseLine.startsWith("user-agent: ") &&
+                               !Boolean.valueOf(getTunnel().getContext().getProperty(PROP_USER_AGENT)).booleanValue()) {
                         line = null;
                         continue;
                     } else if (lowercaseLine.startsWith("accept")) {
@@ -474,12 +478,14 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         // browser to browser
                         line = null;
                         continue;
-                    } else if (lowercaseLine.startsWith("referer: ")) {
+                    } else if (lowercaseLine.startsWith("referer: ") &&
+                               !Boolean.valueOf(getTunnel().getContext().getProperty(PROP_REFERER)).booleanValue()) {
                         // Shouldn't we be more specific, like accepting in-site referers ?
                         //line = "Referer: i2p";
                         line = null;
                         continue; // completely strip the line
-                    } else if (lowercaseLine.startsWith("via: ")) {
+                    } else if (lowercaseLine.startsWith("via: ") &&
+                               !Boolean.valueOf(getTunnel().getContext().getProperty(PROP_VIA)).booleanValue()) {
                         //line = "Via: i2p";
                         line = null;
                         continue; // completely strip the line
@@ -503,7 +509,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                         newRequest.append("Accept-Encoding: \r\n");
                         newRequest.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n");
                     }
-                    newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
+                    if (!Boolean.valueOf(getTunnel().getContext().getProperty(PROP_USER_AGENT)).booleanValue())
+                        newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
                     newRequest.append("Connection: close\r\n\r\n");
                     break;
                 } else {
@@ -649,7 +656,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                                            "http://i2host.i2p/cgi-bin/i2hostjump?",
                                            // "http://orion.i2p/jump/",
                                            "http://stats.i2p/cgi-bin/jump.cgi?a=",
-                                           "http://trevorreznik.i2p/cgi-bin/jump.php?hostname="
+                                           // "http://trevorreznik.i2p/cgi-bin/jump.php?hostname=",
+                                           "http://i2jump.i2p/"
                                           };
     private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
                                           boolean usingWWWProxy, String wwwProxy, boolean showAddrHelper) throws IOException {
@@ -671,6 +679,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 if (showAddrHelper) {
                     out.write("<br><br>Click a link below to look for an address helper by using a \"jump\" service:<br>".getBytes());
                     for (int i = 0; i < jumpServers.length; i++) {
+                        // Skip jump servers we don't know
+                        String jumphost = jumpServers[i].substring(7);  // "http://"
+                        jumphost = jumphost.substring(0, jumphost.indexOf('/'));
+                        try {
+                            Destination dest = I2PTunnel.destFromName(jumphost);
+                            if (dest == null) continue;
+                        } catch (DataFormatException dfe) {
+                            continue;
+                        }
+
                         out.write("<br><a href=\"".getBytes());
                         out.write(jumpServers[i].getBytes());
                         out.write(uri.getBytes());

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java

@@ -3,17 +3,14 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.data.ByteArray;
-import net.i2p.data.DataHelper;
-import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 
 /**

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -3,18 +3,17 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.zip.GZIPOutputStream;
-import java.util.zip.Deflater;
 
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataHelper;
 import net.i2p.util.EventDispatcher;
@@ -33,12 +32,13 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
     private final static Log _log = new Log(I2PTunnelHTTPServer.class);
     /** what Host: should we seem to be to the webserver? */
     private String _spoofHost;
+    private static final String HASH_HEADER = "X-I2P-DestHash";
 
     public I2PTunnelHTTPServer(InetAddress host, int port, String privData, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host, port, privData, l, notifyThis, tunnel);
         _spoofHost = spoofHost;
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
-        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
+        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
+        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel", new long[] { 60*1000, 10*60*1000 });
     }
 
     public I2PTunnelHTTPServer(InetAddress host, int port, File privkey, String privkeyname, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
@@ -72,6 +72,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
 
             StringBuffer command = new StringBuffer(128);
             Properties headers = readHeaders(in, command);
+            headers.setProperty(HASH_HEADER, socket.getPeerDestination().calculateHash().toBase64());
             if ( (_spoofHost != null) && (_spoofHost.trim().length() > 0) )
                 headers.setProperty("Host", _spoofHost);
             headers.setProperty("Connection", "close");
@@ -328,6 +329,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                     name = "Accept-encoding";
                 else if ("X-Accept-encoding".equalsIgnoreCase(name))
                     name = "X-Accept-encoding";
+                else if (HASH_HEADER.equalsIgnoreCase(name))
+                    continue;     // Prevent spoofing
                 headers.setProperty(name, value);
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Read the header [" + name + "] = [" + value + "]");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

@@ -1,16 +1,17 @@
 package net.i2p.i2ptunnel;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.lang.IndexOutOfBoundsException;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataFormatException;
-import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PThread;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

@@ -216,9 +216,7 @@ public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorL
     private void removeRef() {
         if (sockList != null) {
             synchronized (slock) {
-                boolean removed = sockList.remove(i2ps);
-                //System.out.println("Removal of i2psocket " + i2ps + " successful? " 
-                //                   + removed + " remaining: " + sockList.size());
+                sockList.remove(i2ps);
             }
         }
     }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

@@ -8,10 +8,11 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
-import java.net.ConnectException;
+import java.net.SocketTimeoutException;
 import java.util.Iterator;
 import java.util.Properties;
 
@@ -69,11 +70,16 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
             _usePool = "true".equalsIgnoreCase(usePool);
         else
             _usePool = DEFAULT_USE_POOL;
+        FileInputStream fis = null;
         try {
-            init(host, port, new FileInputStream(privkey), privkeyname, l);
+            fis = new FileInputStream(privkey);
+            init(host, port, fis, privkeyname, l);
         } catch (IOException ioe) {
             _log.error("Error starting server", ioe);
             notifyEvent("openServerResult", "error");
+        } finally {
+            if (fis != null)
+                try { fis.close(); } catch (IOException ioe) {}
         }
     }
 
@@ -91,7 +97,6 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         this.l = l;
         this.remoteHost = host;
         this.remotePort = port;
-        I2PClient client = I2PClientFactory.createClient();
         Properties props = new Properties();
         props.putAll(getTunnel().getClientOptions());
         int portNum = 7654;
@@ -219,6 +224,8 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                     if (_log.shouldLog(Log.ERROR))
                         _log.error("Error accepting", ce);
                     // not killing the server..
+                } catch(SocketTimeoutException ste) {
+                    // ignored, we never set the timeout
                 }
             }
         }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java

@@ -20,7 +20,7 @@ import net.i2p.util.Log;
 public class I2Ping extends I2PTunnelTask implements Runnable {
     private final static Log _log = new Log(I2Ping.class);
 
-    private static final int PING_COUNT = 3;
+    private int PING_COUNT = 3;
     private static final int CPING_COUNT = 5;
     private static final int PING_TIMEOUT = 5000;
 
@@ -29,6 +29,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
     private int MAX_SIMUL_PINGS = 10; // not really final...
 
     private boolean countPing = false;
+    private boolean reportTimes = true;
 
     private I2PSocketManager sockMgr;
     private Logging l;
@@ -82,6 +83,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
     }
 
     public void runCommand(String cmd) throws InterruptedException, IOException {
+      while (true) {
         if (cmd.startsWith("-t ")) { // timeout
             cmd = cmd.substring(3);
             int pos = cmd.indexOf(" ");
@@ -92,8 +94,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                 timeout = Long.parseLong(cmd.substring(0, pos));
                 cmd = cmd.substring(pos + 1);
             }
-        }
-        if (cmd.startsWith("-m ")) { // max simultaneous pings
+        } else if (cmd.startsWith("-m ")) { // max simultaneous pings
             cmd = cmd.substring(3);
             int pos = cmd.indexOf(" ");
             if (pos == -1) {
@@ -103,18 +104,26 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                 MAX_SIMUL_PINGS = Integer.parseInt(cmd.substring(0, pos));
                 cmd = cmd.substring(pos + 1);
             }
-        }
-        if (cmd.startsWith("-c ")) { // "count" ping
+        } else if (cmd.startsWith("-n ")) { // number of pings
+            cmd = cmd.substring(3);
+            int pos = cmd.indexOf(" ");
+            if (pos == -1) {
+                l.log("Syntax error");
+                return;
+            } else {
+                PING_COUNT = Integer.parseInt(cmd.substring(0, pos));
+                cmd = cmd.substring(pos + 1);
+            }
+        } else if (cmd.startsWith("-c ")) { // "count" ping
             countPing = true;
             cmd = cmd.substring(3);
-        }
-        if (cmd.equals("-h")) { // ping all hosts
+        } else if (cmd.equals("-h")) { // ping all hosts
             cmd = "-l hosts.txt";
-        }
-        if (cmd.startsWith("-l ")) { // ping a list of hosts
+        } else if (cmd.startsWith("-l ")) { // ping a list of hosts
             BufferedReader br = new BufferedReader(new FileReader(cmd.substring(3)));
             String line;
             List pingHandlers = new ArrayList();
+            int i = 0;
             while ((line = br.readLine()) != null) {
                 if (line.startsWith("#")) continue; // comments
                 if (line.startsWith(";")) continue;
@@ -123,17 +132,21 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                     line = line.substring(0, line.indexOf("="));
                 }
                 pingHandlers.add(new PingHandler(line));
+                if (++i > 1)
+                    reportTimes = false;
             }
             br.close();
             for (Iterator it = pingHandlers.iterator(); it.hasNext();) {
                 Thread t = (Thread) it.next();
                 t.join();
             }
-
+            return;
         } else {
             Thread t = new PingHandler(cmd);
             t.join();
+            return;
         }
+      }
     }
 
     public boolean close(boolean forced) {
@@ -163,7 +176,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                 }
                 lastPingTime = System.currentTimeMillis();
             }
-            boolean sent = sockMgr.ping(dest, PING_TIMEOUT);
+            boolean sent = sockMgr.ping(dest, timeout);
             synchronized (simulLock) {
                 simulPings--;
                 simulLock.notifyAll();
@@ -193,6 +206,9 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                     }
                     return;
                 }
+                int pass = 0;
+                int fail = 0;
+                long totalTime = 0;
                 int cnt = countPing ? CPING_COUNT : PING_COUNT;
                 StringBuffer pingResults = new StringBuffer(2 * cnt + destination.length() + 3);
                 for (int i = 0; i < cnt; i++) {
@@ -206,10 +222,28 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
                             pingResults.append("+ ");
                         }
                     } else {
-                        pingResults.append(sent ? "+ " : "- ");
+                        if (reportTimes) {
+                            if (sent) {
+                                pass++;
+                                long rtt = System.currentTimeMillis() - lastPingTime;
+                                totalTime += rtt;
+                                l.log((i+1) + ": + " + rtt + " ms");
+                            } else {
+                                fail++;
+                                l.log((i+1) + ": -");
+                            }
+                        } else {
+                            pingResults.append(sent ? "+ " : "- ");
+                        }
                     }
                     //		    System.out.println(sent+" -> "+destination);
                 }
+                if (reportTimes) {
+                    pingResults.append("  ").append(pass).append(" received ");
+                    if (pass > 0)
+                        pingResults.append("(average time ").append(totalTime/pass).append(" ms) ");
+                    pingResults.append("and ").append(fail).append(" lost for destination: ");
+                }
                 pingResults.append("  ").append(destination);
                 synchronized (lock) { // Logger is not thread safe
                     l.log(pingResults.toString());
@@ -219,4 +253,4 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
             }
         }
     }
-}
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -1,9 +1,8 @@
 package net.i2p.i2ptunnel;
 
-import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
-
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -13,10 +13,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import net.i2p.I2PAppContext;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
-import net.i2p.util.Log;
 
 /**
  * Ugly little accessor for the edit page
@@ -43,11 +41,11 @@ public class EditBean extends IndexBean {
         if (tun != null)
             return tun.getTargetHost();
         else
-            return "";
+            return "127.0.0.1";
     }
     public String getTargetPort(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getTargetPort() != null)
             return tun.getTargetPort();
         else
             return "";
@@ -61,7 +59,7 @@ public class EditBean extends IndexBean {
     }
     public String getPrivateKeyFile(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getPrivKeyFile() != null)
             return tun.getPrivKeyFile();
         else
             return "";
@@ -268,4 +266,4 @@ public class EditBean extends IndexBean {
         }
         return props;
     }
-}
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -96,6 +96,7 @@ public class IndexBean {
             _curNonce = -1;
         }
     }
+
     public void setPassphrase(String phrase) {
         _passphrase = phrase;
     }
@@ -332,15 +333,15 @@ public class IndexBean {
     
     public String getTunnelName(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getName() != null)
             return tun.getName();
         else
-            return "";
+            return "New Tunnel";
     }
     
     public String getClientPort(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getListenPort() != null)
             return tun.getListenPort();
         else
             return "";
@@ -389,7 +390,7 @@ public class IndexBean {
     
     public String getTunnelDescription(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getDescription() != null)
             return tun.getDescription();
         else
             return "";
@@ -406,7 +407,12 @@ public class IndexBean {
     public String getClientDestination(int tunnel) {
         TunnelController tun = getController(tunnel);
         if (tun == null) return "";
-        if ("client".equals(tun.getType())||"ircclient".equals(tun.getType())) return tun.getTargetDestination();
+        if ("client".equals(tun.getType())||"ircclient".equals(tun.getType())) {
+            if (tun.getTargetDestination() != null)
+                return tun.getTargetDestination();
+            else
+                return "";
+        }
         else return tun.getProxyList();
     }
     
@@ -707,7 +713,11 @@ public class IndexBean {
             }
         } 
         if ("interactive".equals(_profile))
-            config.setProperty("option.i2p.streaming.maxWindowSize", "1");
+            // This was 1 which doesn't make much sense
+            // The real way to make it interactive is to make the streaming lib
+            // MessageInputStream flush faster but there's no option for that yet,
+            // Setting it to 16 instead of the default but not sure what good that is either.
+            config.setProperty("option.i2p.streaming.maxWindowSize", "16");
         else
             config.remove("option.i2p.streaming.maxWindowSize");
     }
@@ -737,4 +747,4 @@ public class IndexBean {
             buf.append((String)msgs.get(i)).append("\n");
         }
     }
-}
+}

apps/i2ptunnel/jsp/editClient.jsp

@@ -80,6 +80,10 @@
             <div id="portField" class="rowItem">
                 <label for="port" accesskey="P">
                     <span class="accessKey">P</span>ort:
+                    <% String value = editBean.getClientPort(curTunnel);
+                       if (value == null || "".equals(value.trim()))
+                           out.write(" <font color=\"red\">(required)</font>");
+                     %>
                 </label>
                 <input type="text" size="6" maxlength="5" id="port" name="port" title="Access Port Number" value="<%=editBean.getClientPort(curTunnel)%>" class="freetext" />               
             </div>
@@ -123,6 +127,10 @@
           %><div id="destinationField" class="rowItem">
                 <label for="targetDestination" accesskey="T">
                     <span class="accessKey">T</span>unnel Destination:
+                    <% String value2 = editBean.getClientDestination(curTunnel);
+                       if (value2 == null || "".equals(value2.trim()))
+                           out.write(" <font color=\"red\">(required)</font>");
+                     %>
                 </label>
                 <input type="text" size="30" id="targetDestination" name="targetDestination" title="Destination of the Tunnel" value="<%=editBean.getClientDestination(curTunnel)%>" class="freetext" />                
                 <span class="comment">(name or destination)</span>

apps/i2ptunnel/jsp/editServer.jsp

@@ -93,6 +93,10 @@
             <div id="portField" class="rowItem">
                 <label for="targetPort" accesskey="P">
                     <span class="accessKey">P</span>ort:
+                    <% String value = editBean.getTargetPort(curTunnel);
+                       if (value == null || "".equals(value.trim()))
+                           out.write(" <font color=\"red\">(required)</font>");
+                     %>
                 </label>
                 <input type="text" size="6" maxlength="5" id="targetPort" name="targetPort" title="Target Port Number" value="<%=editBean.getTargetPort(curTunnel)%>" class="freetext" />               
             </div>
@@ -112,6 +116,10 @@
           %><div id="privKeyField" class="rowItem">
                 <label for="privKeyFile" accesskey="k">
                     Private <span class="accessKey">k</span>ey file:
+                    <% String value2 = editBean.getPrivateKeyFile(curTunnel);
+                       if (value2 == null || "".equals(value2.trim()))
+                           out.write(" <font color=\"red\">(required)</font>");
+                     %>
                 </label>
                 <input type="text" size="30" id="privKeyFile" name="privKeyFile" title="Path to Private Key File" value="<%=editBean.getPrivateKeyFile(curTunnel)%>" class="freetext" />               
             </div>
@@ -129,7 +137,7 @@
                 <label for="localDestination" accesskey="L">
                     <span class="accessKey">L</span>ocal destination:
                 </label>
-                <input type="text" size="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" value="<%=editBean.getDestinationBase64(curTunnel)%>" class="freetext" />               
+                <textarea rows="1" cols="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" wrap="off"><%=editBean.getDestinationBase64(curTunnel)%></textarea>               
                 <span class="comment">(if known)</span>
             </div>
             

apps/jetty/build.xml

@@ -3,8 +3,9 @@
 
     <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
     <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
-    <property name="jetty.url" value="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" />
+    <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
     <property name="jetty.filename" value="jetty-5.1.12.zip" />
+    <property name="verified.filename" value="verified.txt" />
 
     <target name="all" depends="build" />
 
@@ -41,7 +42,9 @@
         <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
     </target>
 
-    <target name="verifyJettylib" >
+    <uptodate property="verified.already" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
+
+    <target name="verifyJettylib" unless="verified.already" >
         <condition property="jetty.zip.verified" >
             <and>
                 <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
@@ -55,6 +58,7 @@
                 </not>
             </condition>
         </fail>
+        <touch file="${verified.filename}" />
     </target>
 
     <target name="extractJettylib" unless="jetty.zip.extracted" >
@@ -80,13 +84,45 @@
         <delete dir="jetty-5.1.12" />
     </target>
 
-    <target name="build" depends="ensureJettylib" />
+    <target name="build" depends="jar" />
     <target name="builddep" />
-    <target name="compile" />
-    <target name="jar" />
-    <target name="clean" />
+    <target name="compile" depends="builddep, ensureJettylib" >
+        <mkdir dir="./build" />
+        <mkdir dir="./build/obj" />
+        <javac 
+            srcdir="./java/src" 
+            debug="true" deprecation="on" source="1.5" target="1.5" 
+            destdir="./build/obj" 
+            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" />
+    </target>
+    <target name="jar" depends="compile">
+        <jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
+        </jar>
+    </target>    
+    <target name="clean" >
+        <delete dir="./build" />
+        <delete file="${verified.filename}" />
+    </target>    
     <target name="cleandep" depends="clean" />
     <target name="distclean" depends="clean">
         <echo message="Not actually deleting the jetty libs (since they're so large)" />
     </target>
+    <target name="javadoc" >
+        <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
+        <available property="jetty.zip.javadocExtracted" file="build/javadoc" type="dir" />
+        <ant target="fetchJettylib" />
+        <ant target="verifyJettylib" />
+        <ant target="extractJavadoc" />
+    </target>
+    <target name="extractJavadoc" unless="jetty.zip.javadocExtracted" >
+        <mkdir dir="./build" />
+        <mkdir dir="./build/javadoc" />
+        <unzip src="${jetty.filename}" dest="./build/javadoc" >
+            <patternset>
+                <include name="jetty-5.1.12/javadoc/" />
+            </patternset>
+            <mapper type="glob" from="jetty-5.1.12/javadoc/*" to="javadoc/*" />
+        </unzip>
+    </target>
+
 </project>

apps/jetty/java/src/org/mortbay/http/I2PRequestLog.java

@@ -0,0 +1,182 @@
+// ========================================================================
+// $Id: NCSARequestLog.java,v 1.35 2005/08/13 00:01:24 gregwilkins Exp $
+// Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 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.
+// ========================================================================
+
+package org.mortbay.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import javax.servlet.http.Cookie;
+
+import org.apache.commons.logging.Log;
+import org.mortbay.log.LogFactory;
+import org.mortbay.util.DateCache;
+import org.mortbay.util.LogSupport;
+import org.mortbay.util.RolloverFileOutputStream;
+import org.mortbay.util.StringUtil;
+
+
+/* ------------------------------------------------------------ */
+/** NCSA HTTP Request Log.
+ *
+ * Override log() to put in the requestor's destination hash,
+ * instead of 127.0.0.1,
+ * which is placed in the X-I2P-DestHash field in the request headers
+ * by I2PTunnelHTTPServer.
+ *
+ * NCSA common or NCSA extended (combined) request log.
+ * @version $Id: NCSARequestLog.java,v 1.35 2005/08/13 00:01:24 gregwilkins Exp $
+ * @author Tony Thompson
+ * @author Greg Wilkins
+ */
+public class I2PRequestLog extends NCSARequestLog
+{
+    /* ------------------------------------------------------------ */
+    /** Constructor.
+     */
+    public I2PRequestLog()
+    {
+        super();
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** Constructor. 
+     * @param filename Filename, which can be in
+     * rolloverFileOutputStream format
+     * @see org.mortbay.util.RolloverFileOutputStream
+     * @exception IOException 
+     */
+    public I2PRequestLog(String filename)
+        throws IOException
+    {
+        super(filename);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Log a request.
+     * @param request The request
+     * @param response The response to this request.
+     * @param responseLength The bytes written to the response.
+     */
+    public void log(HttpRequest request,
+                    HttpResponse response,
+                    int responseLength)
+    {
+        try{
+            // ignore ignorables
+            if (_ignorePathMap != null &&
+                _ignorePathMap.getMatch(request.getPath()) != null)
+                return;
+
+            // log the rest
+            if (_fileOut==null)
+                return;
+
+            StringBuffer buf = new StringBuffer(160);
+            
+            String addr = request.getField("X-I2P-DestHash");
+            if(addr != null)
+                buf.append(addr).append(".i2p");
+            else
+                buf.append(request.getRemoteAddr());
+            
+            buf.append(" - ");
+            String user = request.getAuthUser();
+            buf.append((user==null)?"-":user);
+            buf.append(" [");
+            buf.append(_logDateCache.format(request.getTimeStamp()));
+            buf.append("] \"");
+            buf.append(request.getMethod());
+            buf.append(' ');
+            buf.append(request.getURI());
+            buf.append(' ');
+            buf.append(request.getVersion());
+            buf.append("\" ");
+            int status=response.getStatus();    
+            buf.append((char)('0'+((status/100)%10)));
+            buf.append((char)('0'+((status/10)%10)));
+            buf.append((char)('0'+(status%10)));
+            if (responseLength>=0)
+            {
+                buf.append(' ');
+                if (responseLength>99999)
+                    buf.append(Integer.toString(responseLength));
+                else
+                {
+                    if (responseLength>9999) 
+                        buf.append((char)('0'+((responseLength/10000)%10)));
+                    if (responseLength>999) 
+                        buf.append((char)('0'+((responseLength/1000)%10)));
+                    if (responseLength>99) 
+                        buf.append((char)('0'+((responseLength/100)%10)));
+                    if (responseLength>9) 
+                        buf.append((char)('0'+((responseLength/10)%10)));
+                    buf.append((char)('0'+(responseLength%10)));
+                }
+                buf.append(' ');
+            }
+            else
+                buf.append(" - ");
+
+            String log =buf.toString();
+            synchronized(_writer)
+            {
+                _writer.write(log);
+                if (isExtended())
+                {
+                    logExtended(request,response,_writer);
+                    if (!getLogCookies())
+                        _writer.write(" -");
+                }
+                
+                if (getLogCookies())
+                {
+                    Cookie[] cookies = request.getCookies();
+                    if (cookies==null || cookies.length==0)
+                        _writer.write(" -");
+                    else
+                    {
+                        _writer.write(" \"");
+                        for (int i=0;i<cookies.length;i++)
+                        {
+                            if (i!=0)
+                                _writer.write(';');
+                            _writer.write(cookies[i].getName());
+                            _writer.write('=');
+                            _writer.write(cookies[i].getValue());
+                        }
+                        _writer.write("\"");
+                    }
+                }
+                
+                if (getLogLatency())
+                    _writer.write(" "+(System.currentTimeMillis()-request.getTimeStamp()));
+                
+                _writer.write(StringUtil.__LINE_SEPARATOR);
+                _writer.flush();
+            }
+        }
+        catch(IOException e)
+        {
+            log.warn(LogSupport.EXCEPTION,e);
+        }
+    }
+
+}
+

apps/jetty/java/src/org/mortbay/http/NCSARequestLog.java

@@ -0,0 +1,505 @@
+// ========================================================================
+// $Id: NCSARequestLog.java,v 1.35 2005/08/13 00:01:24 gregwilkins Exp $
+// Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 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.
+// ========================================================================
+
+package org.mortbay.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import javax.servlet.http.Cookie;
+
+import org.apache.commons.logging.Log;
+import org.mortbay.log.LogFactory;
+import org.mortbay.util.DateCache;
+import org.mortbay.util.LogSupport;
+import org.mortbay.util.RolloverFileOutputStream;
+import org.mortbay.util.StringUtil;
+
+
+/* ------------------------------------------------------------ */
+/** NCSA HTTP Request Log.
+ * NCSA common or NCSA extended (combined) request log.
+ *
+ * Taken from 5.1.12 source and modded to change some private vars to protected
+ * so we can extend it for I2P.
+ *
+ * @version $Id: NCSARequestLog.java,v 1.35 2005/08/13 00:01:24 gregwilkins Exp $
+ * @author Tony Thompson
+ * @author Greg Wilkins
+ */
+public class NCSARequestLog implements RequestLog
+{
+    protected static Log log = LogFactory.getLog(NCSARequestLog.class);
+
+    private String _filename;
+    private boolean _extended;
+    private boolean _append;
+    private int _retainDays;
+    private boolean _closeOut;
+    private boolean _preferProxiedForAddress;
+    private String _logDateFormat="dd/MMM/yyyy:HH:mm:ss ZZZ";
+    private Locale _logLocale=Locale.getDefault();
+    private String _logTimeZone=TimeZone.getDefault().getID();
+    private String[] _ignorePaths;
+    private boolean _logLatency=false;
+    private boolean _logCookies=false;
+    
+    protected transient OutputStream _out;
+    protected transient OutputStream _fileOut;
+    protected transient DateCache _logDateCache;
+    protected transient PathMap _ignorePathMap;
+    protected transient Writer _writer;
+    
+    /* ------------------------------------------------------------ */
+    /** Constructor.
+     */
+    public NCSARequestLog()
+    {
+        _extended=true;
+        _append=true;
+        _retainDays=31;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** Constructor. 
+     * @param filename Filename, which can be in
+     * rolloverFileOutputStream format
+     * @see org.mortbay.util.RolloverFileOutputStream
+     * @exception IOException 
+     */
+    public NCSARequestLog(String filename)
+        throws IOException
+    {
+        _extended=true;
+        _append=true;
+        _retainDays=31;
+        setFilename(filename);
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Set the log filename.
+     * @see NCSARequestLog#setRetainDays(int)
+     * @param filename The filename to use. If the filename contains the
+     * string "yyyy_mm_dd", then a RolloverFileOutputStream is used and the
+     * log is rolled over nightly and aged according setRetainDays. If no
+     * filename is set or a null filename
+     * passed, then requests are logged to System.err.
+     */
+    public void setFilename(String filename)
+    {
+        if (filename!=null)
+        {
+            filename=filename.trim();
+            if (filename.length()==0)
+                filename=null;
+        }
+        _filename=filename;        
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get the log filename.
+     * @see NCSARequestLog#getDatedFilename()
+     * @return The log filename without any date expansion.
+     */
+    public String getFilename()
+    {
+        return _filename;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Get the dated log filename.
+     * @see NCSARequestLog#getFilename()
+     * @return The log filename with any date encoding expanded.
+     */
+    public String getDatedFilename()
+    {
+        if (_fileOut instanceof RolloverFileOutputStream)
+            return ((RolloverFileOutputStream)_fileOut).getDatedFilename();
+        return null;
+    }
+    
+    
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param format The date format to use within the log file.
+     */
+    public void setLogDateFormat(String format)
+    {
+        _logDateFormat=format;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @return The date format to use within the log file.
+     */
+    public String getLogDateFormat()
+    {
+        return _logDateFormat;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param tz The date format timezone to use within the log file.
+     */
+    public void setLogTimeZone(String tz)
+    {
+        _logTimeZone=tz;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @return The date format timezone to use within the log file.
+     */
+    public String getLogTimeZone()
+    {
+        return _logTimeZone;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** 
+     * @return The number of days to retain rollovered log files.
+     */
+    public int getRetainDays()
+    {
+        return _retainDays;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param retainDays The number of days to retain rollovered log files.
+     */
+    public void setRetainDays(int retainDays)
+    {
+        _retainDays = retainDays;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @return True if NCSA extended format is to be used.
+     */
+    public boolean isExtended()
+    {
+        return _extended;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param e True if NCSA extended format is to be used.
+     */
+    public void setExtended(boolean e)
+    {
+        _extended=e;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** 
+     * @return True if logs are appended to existing log files.
+     */
+    public boolean isAppend()
+    {
+        return _append;
+    }
+
+    /* ------------------------------------------------------------ */
+    /** 
+     * @param a True if logs are appended to existing log files.
+     */
+    public void setAppend(boolean a)
+    {
+        _append=a;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @deprecated ignored
+     */
+    public void setBuffered(boolean b)
+    {}
+    
+    /* ------------------------------------------------------------ */
+    /** Set which paths to ignore.
+     *
+     * @param ignorePaths Array of path specifications to ignore
+     */
+    public void setIgnorePaths(String[] ignorePaths)
+    {
+        // Contributed by  Martin Vilcans (martin@jadestone.se)
+        _ignorePaths = ignorePaths;
+    }
+
+    /* ------------------------------------------------------------ */
+    public String[] getIgnorePaths()
+    {
+        return _ignorePaths;
+    }
+
+    /* ------------------------------------------------------------ */
+    /**
+     * @return Returns the logCookies.
+     */
+    public boolean getLogCookies()
+    {
+        return _logCookies;
+    }
+    /* ------------------------------------------------------------ */
+    /**
+     * @param logCookies The logCookies to set.
+     */
+    public void setLogCookies(boolean logCookies)
+    {
+        _logCookies = logCookies;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @return Returns true if logging latency
+     */
+    public boolean getLogLatency()
+    {
+        return _logLatency;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+     * @param logLatency If true, latency is logged at the end of the log line
+     */
+    public void setLogLatency(boolean logLatency)
+    {
+        _logLatency = logLatency;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /**
+    * Prefer to log the proxied-for IP address (if present in
+    * the request header) over the native requester IP address.
+    * Useful in reverse-proxy situations when you'd rather see
+    * the IP address of the host before the most recent proxy
+    * server, as opposed to your own proxy server(s) every time.
+    *
+    * jlrobins@socialserve.com, March 2004.
+    **/
+    public void setPreferProxiedForAddress(boolean value)
+    {
+       _preferProxiedForAddress = value;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void start()
+        throws Exception
+    {
+        _logDateCache=new DateCache(_logDateFormat,_logLocale);
+        _logDateCache.setTimeZoneID(_logTimeZone);
+        
+        if (_filename != null)
+        {
+            _fileOut=new RolloverFileOutputStream(_filename,_append,_retainDays);
+            _closeOut=true;
+        }
+        else
+            _fileOut=System.err;
+
+        _out=_fileOut;
+
+        if (_ignorePaths!=null && _ignorePaths.length>0)
+        {
+            _ignorePathMap=new PathMap();
+            for (int i=0;i<_ignorePaths.length;i++)
+                _ignorePathMap.put(_ignorePaths[i],_ignorePaths[i]);
+        }
+        else
+            _ignorePathMap=null;
+
+        _writer=new OutputStreamWriter(_out);
+    }
+
+    /* ------------------------------------------------------------ */
+    public boolean isStarted()
+    {
+        return _fileOut!=null;
+    }
+    
+    /* ------------------------------------------------------------ */
+    public void stop()
+    {
+        try{if (_writer!=null)_writer.flush();} catch (IOException e){LogSupport.ignore(log,e);}
+        if (_out!=null && _closeOut)
+            try{_out.close();}catch(IOException e){LogSupport.ignore(log,e);}
+        _out=null;
+        _fileOut=null;
+        _closeOut=false;
+        _logDateCache=null;
+        _writer=null;
+    }
+    
+    /* ------------------------------------------------------------ */
+    /** Log a request.
+     * @param request The request
+     * @param response The response to this request.
+     * @param responseLength The bytes written to the response.
+     */
+    public void log(HttpRequest request,
+                    HttpResponse response,
+                    int responseLength)
+    {
+        try{
+            // ignore ignorables
+            if (_ignorePathMap != null &&
+                _ignorePathMap.getMatch(request.getPath()) != null)
+                return;
+
+            // log the rest
+            if (_fileOut==null)
+                return;
+
+            StringBuffer buf = new StringBuffer(160);
+            
+            String addr = null;
+            if(_preferProxiedForAddress)
+            {
+                // If header is not present, addr will remain null ...
+                addr = request.getField(HttpFields.__XForwardedFor);
+            }
+            if(addr == null)
+                addr = request.getRemoteAddr();
+            buf.append(addr);
+            
+            buf.append(" - ");
+            String user = request.getAuthUser();
+            buf.append((user==null)?"-":user);
+            buf.append(" [");
+            buf.append(_logDateCache.format(request.getTimeStamp()));
+            buf.append("] \"");
+            buf.append(request.getMethod());
+            buf.append(' ');
+            buf.append(request.getURI());
+            buf.append(' ');
+            buf.append(request.getVersion());
+            buf.append("\" ");
+            int status=response.getStatus();    
+            buf.append((char)('0'+((status/100)%10)));
+            buf.append((char)('0'+((status/10)%10)));
+            buf.append((char)('0'+(status%10)));
+            if (responseLength>=0)
+            {
+                buf.append(' ');
+                if (responseLength>99999)
+                    buf.append(Integer.toString(responseLength));
+                else
+                {
+                    if (responseLength>9999) 
+                        buf.append((char)('0'+((responseLength/10000)%10)));
+                    if (responseLength>999) 
+                        buf.append((char)('0'+((responseLength/1000)%10)));
+                    if (responseLength>99) 
+                        buf.append((char)('0'+((responseLength/100)%10)));
+                    if (responseLength>9) 
+                        buf.append((char)('0'+((responseLength/10)%10)));
+                    buf.append((char)('0'+(responseLength%10)));
+                }
+                buf.append(' ');
+            }
+            else
+                buf.append(" - ");
+
+            String log =buf.toString();
+            synchronized(_writer)
+            {
+                _writer.write(log);
+                if (_extended)
+                {
+                    logExtended(request,response,_writer);
+                    if (!_logCookies)
+                        _writer.write(" -");
+                }
+                
+                if (_logCookies)
+                {
+                    Cookie[] cookies = request.getCookies();
+                    if (cookies==null || cookies.length==0)
+                        _writer.write(" -");
+                    else
+                    {
+                        _writer.write(" \"");
+                        for (int i=0;i<cookies.length;i++)
+                        {
+                            if (i!=0)
+                                _writer.write(';');
+                            _writer.write(cookies[i].getName());
+                            _writer.write('=');
+                            _writer.write(cookies[i].getValue());
+                        }
+                        _writer.write("\"");
+                    }
+                }
+                
+                if (_logLatency)
+                    _writer.write(" "+(System.currentTimeMillis()-request.getTimeStamp()));
+                
+                _writer.write(StringUtil.__LINE_SEPARATOR);
+                _writer.flush();
+            }
+        }
+        catch(IOException e)
+        {
+            log.warn(LogSupport.EXCEPTION,e);
+        }
+    }
+
+    /* ------------------------------------------------------------ */
+    /** Log Extended fields.
+     * This method can be extended by a derived class to add extened fields to
+     * each log entry.  It is called by the log method after all standard
+     * fields have been added, but before the line terminator.
+     * Derived implementations should write extra fields to the Writer
+     * provided.
+     * The default implementation writes the referer and user agent.
+     * @param request The request to log.
+     * @param response The response to log.
+     * @param log The writer to write the extra fields to.
+     * @exception IOException Problem writing log
+     */
+    protected void logExtended(HttpRequest request,
+                               HttpResponse response,
+                               Writer log)
+        throws IOException
+    {
+        String referer = request.getField(HttpFields.__Referer);
+        if(referer==null)
+            log.write("\"-\" ");
+        else
+        {
+            log.write('"');
+            log.write(referer);
+            log.write("\" ");
+        }
+        
+        String agent = request.getField(HttpFields.__UserAgent);
+        if(agent==null)
+            log.write("\"-\"");
+        else
+        {
+            log.write('"');
+            log.write(agent);
+            log.write('"');
+        }
+        
+
+    }
+}
+

apps/ministreaming/java/build.xml

@@ -5,10 +5,24 @@
     <target name="builddep">
         <ant dir="../../../core/java/" target="build" />
     </target>
-    <target name="compile">
+    <condition property="depend.available">
+        <typefound name="depend" />
+    </condition>
+    <target name="depend" if="depend.available">
+        <depend
+            cache="../../../build"
+            srcdir="./src" 
+            destdir="./build/obj" >
+            <!-- Depend on classes instead of jars where available -->
+            <classpath>
+                <pathelement location="../../../core/java/build/obj" />
+            </classpath>
+        </depend>
+    </target>
+    <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
-        <javac srcdir="./src" debug="true" deprecation="on" source="1.3" target="1.3" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" />
+        <javac srcdir="./src" debug="true" deprecation="on" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" />
     </target>
     <target name="jar" depends="compile">
         <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" />